diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..2d00009c5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,90 @@ +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app + +# Created by .ignore support plugin (hsz.mobi) +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +#force mave: ignore everything not maven related +*.iml +*.ipr +*.iws +.idea/ + +#ignore release if present +release/ + +#ignore build if present +build/ + +# User-specific stuff: +.idea/workspace.xml +.idea/tasks.xml +.idea/dictionaries +.idea/vcs.xml +.idea/jsLibraryMappings.xml + +# Sensitive or high-churn files: +.idea/dataSources.ids +.idea/dataSources.xml +.idea/dataSources.local.xml +.idea/sqlDataSources.xml +.idea/dynamic.xml +.idea/uiDesigner.xml + +# Gradle: +.idea/gradle.xml +.idea/libraries + +# Mongo Explorer plugin: +.idea/mongoSettings.xml + +## File-based project format: +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + + diff --git a/.travis/run.sh b/.travis/run.sh index 29bf2eea9..59c0708ee 100644 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -18,6 +18,14 @@ then fi docker exec cpp_tango make -C /home/tango/src/build -j 2 echo "Test log4tango" -docker exec cpp_tango /bin/sh -c 'cd /home/tango/src/build/log4tango; exec ctest -V' +docker exec cpp_tango /bin/sh -c 'cd /home/tango/src/build/test/log4tango; exec ctest -V' +if [ $? -ne "0" ] +then + exit -1 +fi echo "Test cppTango" -docker exec cpp_tango /bin/sh -c 'cd /home/tango/src/build/cpp_test_suite; exec ctest -V' \ No newline at end of file +docker exec cpp_tango /bin/sh -c 'cd /home/tango/src/build/test/cpp_test_suite; exec ctest -V' +if [ $? -ne "0" ] +then + exit -1 +fi \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 45e7cc6a0..80c8088a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8) -project(libtango) +project(tango) include(CTest) enable_testing() @@ -17,28 +17,27 @@ message("System TANGO_HOST=$ENV{TANGO_HOST}") set(TANGO_HOST $ENV{TANGO_HOST}) include(configure/CMakeLists.txt) -include_directories(cppapi/client) -include_directories(cppapi/client/helpers) -include_directories(cppapi/server) -include_directories(cppapi/server/idl) -include_directories(log4tango/include) +include_directories(${PROJECT_BINARY_DIR}/generated) +include_directories(include) #required for generated config.h -include_directories(${CMAKE_CURRENT_BINARY_DIR}/log4tango/include) - +include_directories(${PROJECT_BINARY_DIR}/include) +add_subdirectory(include) +add_subdirectory(doxygen) #source code -add_subdirectory("log4tango") -add_subdirectory("cppapi") -add_subdirectory("cpp_test_suite") +add_subdirectory(generated/idl) +add_subdirectory(src) +add_subdirectory(test) add_library(tango SHARED $ $ $ $ $ - $) + $ + $) target_include_directories(tango PUBLIC ${ZMQ_PKG_INCLUDE_DIRS} ${OMNIORB_PKG_INCLUDE_DIRS} ${OMNIDYN_PKG_INCLUDE_DIRS}) -target_link_libraries(tango PUBLIC ${ZMQ_PKG_LIBRARIES} ${OMNIORB_PKG_LIBRARIES} ${OMNICOS_PKG_LIBRARIES} ${OMNIDYN_PKG_LIBRARIES}) +target_link_libraries(tango PUBLIC ${ZMQ_PKG_LIBRARIES} ${OMNIORB_PKG_LIBRARIES} ${OMNICOS_PKG_LIBRARIES} ${OMNIDYN_PKG_LIBRARIES} ${CMAKE_DL_LIBS}) target_compile_options(tango PUBLIC ${ZMQ_PKG_CFLAGS_OTHER} ${OMNIORB_PKG_CFLAGS_OTHER} ${OMNICOS_PKG_CFLAGS_OTHER} ${OMNIDYN_PKG_CFLAGS_OTHER}) target_compile_options(tango PRIVATE -fPIC) target_compile_definitions(tango PRIVATE OMNI_UNLOADABLE_STUBS _TANGO_LIB) @@ -54,3 +53,14 @@ configure_file(tango.pc.cmake tango.pc @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tango.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") + +#TODO windows +SET(CPACK_GENERATOR "DEB") +set(CPACK_PACKAGE_FILE_NAME libtango_${LIBRARY_VERSION}_amd64) #TODO platform +set(CPACK_DEBIAN_PACKAGE_NAME libtango-dev) +set(CPACK_DEBIAN_PACKAGE_VERSION ${LIBRARY_VERSION}) +set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcos4-dev, libzmq5-dev | libzmq3-dev") +set(CPACK_DEBIAN_PACKAGE_CONFLICTS "libtango7-dev, libtango8-dev, libtango9-dev") +SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "TANGO team ") #required + +include(CPack) diff --git a/README.md b/README.md index 972e9d465..bd4b10ac6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,22 @@ -# cppTango [![Build Status](https://travis-ci.org/tango-controls/cppTango.png)](https://travis-ci.org/tango-controls/cppTango) -This repository is the result of svn2git migration of tango source code. It is combined from api/cppapi, api/log4tango, api/cpp_test_suite anf api/cpp_test_ds +[![logo](http://www.tango-controls.org/static/tango/img/logo_tangocontrols.png)](http://www.tango-controls.org) + +[![Build Status](https://travis-ci.org/tango-controls/cppTango.png)](https://travis-ci.org/tango-controls/cppTango) + +# TANGO distributed control system - shared library + +TANGO is an object-oriented distributed control system. In TANGO all objects are representations of devices, which can be on the same computer or distributed over a network. Communication between devices can be synchronous, asynchronous or event driven. + +The object model in TANGO supports methods, attributes and properties. TANGO provides an API which hides all the details of network access and provides object browsing, discovery, and security features. + +TANGO is being actively developed as a collaborative effort between the ESRF ([www.esrf.eu](http://www.esrf.eu)), Soleil ([synchrotron-soleil.fr](http://synchrotron-soleil.fr)), Alba ([www.cells.es](http://www.cells.es)), and Elettra institutes ([www.elettra.trieste.it](http://www.elettra.trieste.it)). + +For more information please visit [www.tango-controls.org](http://www.tango-controls.org). + +# Documentation + +Generated: [tango-controls.github.io/cppTango-docs](https://tango-controls.github.io/cppTango-docs) + +Manuals: [tango-controls.org/resources/documentation/kernel](http://www.tango-controls.org/resources/documentation/kernel/) # How to build and install using cmake diff --git a/configure/CMakeLists.txt b/configure/CMakeLists.txt index 9bd757da3..10d721059 100644 --- a/configure/CMakeLists.txt +++ b/configure/CMakeLists.txt @@ -1,4 +1,5 @@ include(FindPkgConfig) +include(FindDoxygen) if(NOT CMAKE_BUILD_TYPE) message("No build type specified - default is DEBUG") @@ -70,4 +71,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") add_definitions(-DGNU_CXX) endif() -include(GNUInstallDirs) \ No newline at end of file +include(GNUInstallDirs) + +include(configure/config.cmake) diff --git a/log4tango/config/check_namespace.cpp b/configure/check_namespace.cpp similarity index 100% rename from log4tango/config/check_namespace.cpp rename to configure/check_namespace.cpp diff --git a/log4tango/config/check_snprintf.cpp b/configure/check_snprintf.cpp similarity index 100% rename from log4tango/config/check_snprintf.cpp rename to configure/check_snprintf.cpp diff --git a/log4tango/config/check_sstream.cpp b/configure/check_sstream.cpp similarity index 100% rename from log4tango/config/check_sstream.cpp rename to configure/check_sstream.cpp diff --git a/log4tango/config/config.cmake b/configure/config.cmake similarity index 72% rename from log4tango/config/config.cmake rename to configure/config.cmake index 6fb74c100..2a81e27ac 100644 --- a/log4tango/config/config.cmake +++ b/configure/config.cmake @@ -48,13 +48,13 @@ macro (LOG4TANGO_CHECK_COMPILER_FEATURE source var) endmacro() #sstream -LOG4TANGO_CHECK_COMPILER_FEATURE("config/check_sstream.cpp" SSTREAM) +LOG4TANGO_CHECK_COMPILER_FEATURE("configure/check_sstream.cpp" SSTREAM) #namespace -LOG4TANGO_CHECK_COMPILER_FEATURE("config/check_namespace.cpp" NAMESPACES) +LOG4TANGO_CHECK_COMPILER_FEATURE("configure/check_namespace.cpp" NAMESPACES) #snprintf -LOG4TANGO_CHECK_COMPILER_FEATURE("config/check_snprintf.cpp" SNPRINTF) +LOG4TANGO_CHECK_COMPILER_FEATURE("configure/check_snprintf.cpp" SNPRINTF) #check types check_type_size(int64_t INT64_SIZE) @@ -62,5 +62,14 @@ if(${INT64_SIZE} EQUAL 8) set(LOG4TANGO_HAVE_INT64_T "/**/") endif() +# +# +1 : ? : +1 == new interface that does not break old one +# +1 : ? : 0 == new interface that breaks old one +# ? : ? : 0 == no new interfaces, but breaks apps +# ? :+1 : ? == just some internal changes, nothing breaks but might work +# better +# CURRENT : REVISION : AGE +set (LOG4TANGO_PACKAGE_URL "https://github.com/tango-controls/cppTango/log4tango") +set (LOG4TANGO_PACKAGE_BUGREPORT "https://github.com/tango-controls/cppTango/issues") -configure_file(config/config.h.in ${PROJECT_BINARY_DIR}/log4tango/include/log4tango/config.h) \ No newline at end of file +configure_file(configure/config.h.in ${PROJECT_BINARY_DIR}/include/log4tango/config.h) \ No newline at end of file diff --git a/log4tango/config/config.h.in b/configure/config.h.in similarity index 100% rename from log4tango/config/config.h.in rename to configure/config.h.in diff --git a/cpp_test_suite/Makefile b/cpp_test_suite/Makefile deleted file mode 100644 index 41f4ce9f9..000000000 --- a/cpp_test_suite/Makefile +++ /dev/null @@ -1,187 +0,0 @@ -####################################################################################################################### -# DEFAULT VALUES (do not modify) ###################################################################################### - -# profile file name (the file containing custom settings - properties definitions) -PROFILE = default - -# profile file extension (default *.profile) -PROFILE_EXT = profile - -# directory where the profile files are stored -PROFILE_DIR = makeprofiles - -# cxx test suite executable name -RUNNER_NAME = runner - -# files that will not be compiled (no need to provide the full path, just the filenames are sufficient) -EXCLUDE_FILES = -EXCLUDE_FILES_DEFAULT = $(RUNNER_NAME).cpp compare_test.cpp cxx_template.cpp #conf_devtest.cpp - -# compile only these files (if not set, all files from the TEST_DIRS will be compiled) -COMPILE_FILES = - -# if set (to true) cxx test suite executable (RUNNER_NAME) will always be recompiled -# (useful when you want to add/remove cxx files to/from the RUNNER_NAME without modifying them - otherwise RUNNER_NAME would not recompile) -ALWAYS_RECOMPILE_CXX = - -# has a meaning only when COMPILE_FILES is set; if set to true the cxx_ files will be -# alphabetically sorted within the runner, otherwise the order defined by the user is kept -SORT_ALPHABETICALLY_CXX = - -# these directories will be scanned in search for *.cpp files (test suites to be compiled) -TEST_DIRS = asyn event old_tests new_tests -TEST_DIRS_EXTRA = - -# compiler -CC = c++ - -# compiler flags -CXXFLAGS = -g -Wall -Wextra -DVALGRIND -D_PTHREADS -D_REENTRANT -CXXFLAGS_EXTRA = - -# linker flags -LFLAGS_EXTRA = - -# directory containing Tango header files -TANGO_INCLUDE_DIR = - -# directory containing Tango (shared) library -TANGO_LIB_DIR = - -# name of the Tango (shared) library -LIB_TANGO = -ltango - -# directory where the binaries will be stored -BIN_DIR = bin - -# directory where the object files will be stored -OBJ_DIR = obj - -# END DEFAULT VALUES ################################################################################################## -####################################################################################################################### - - -####################################################################################################################### -# CONFIGURATION ####################################################################################################### - -# command line profile argument takes precedence over Makefile PROFILE variable -PROFILE := $(if $(profile),$(profile),$(PROFILE)) - -# load user defined profile, if not defined load the default profile -$(if $(wildcard $(PROFILE_DIR)/$(PROFILE).$(PROFILE_EXT)),,$(error "File " $(PROFILE_DIR)/$(PROFILE).$(PROFILE_EXT) " does not exist. Make sure to create such a file.")) -include $(PROFILE_DIR)/$(PROFILE).$(PROFILE_EXT) - -# append the defaults to the user settings -EXCLUDE_FILES += $(EXCLUDE_FILES_DEFAULT) -CXXFLAGS += $(CXXFLAGS_EXTRA) - -# detect if linux -ifeq ($(shell uname),Linux) - linux = true -endif - -# check if compiler supports C++11; choose the compiler -ifdef linux - # check that we have at least gcc 4.3 (for c++0x features) - GCC_MAJOR_VERSION_GTEQ4 := $(shell expr `c++ -dumpversion | cut -f1 -d.` \>= 4) - GCC_MINOR_VERSION_GTEQ3 := $(shell expr `c++ -dumpversion | cut -f2 -d.` \>= 3) - ifeq ($(GCC_MAJOR_VERSION_GTEQ4),1) - ifeq ($(GCC_MINOR_VERSION_GTEQ3),1) - CXX11 = -std=c++0x - endif - endif -endif - -# append C++11 support to compiler flags (if set) -CXXFLAGS += $(CXX11) - -# include directories (if TANGO_INCLUDE_DIR not defined, TANGO_BASE/include is taken as default; if any cxx file is to be compiled, cxxtest/include is added to the directory list) -INCLUDE_DIRS = -I$(OMNI_BASE)/include \ - $(if $(TANGO_INCLUDE_DIR), $(foreach path, $(TANGO_INCLUDE_DIR), -I$(path)),-I$(TANGO_BASE)/include) \ - -I$(LOG4TANGO_BASE)/include/tango \ - $(if $(CXX_DIR), -Icxxtest/include) \ - -I$(ZMQ_BASE)/include \ - -I. - -# library directories (if TANGO_LIB_DIR not defined, TANGO_BASE/lib is taken as default) -LIB_DIRS = -L $(OMNI_BASE)/lib \ - $(if $(TANGO_LIB_DIR), -L $(TANGO_LIB_DIR),-L $(TANGO_BASE)/lib) \ - -L $(LOG4TANGO_BASE)/lib \ - -L $(ZMQ_BASE)/lib - -# linker flags -LFLAGS = -g $(LFLAGS_EXTRA) $(LIB_DIRS) $(LIB_TANGO) -llog4tango -lomniORB4 -lomniDynamic4 -lomnithread -lCOS4 -lzmq -lpthread -ldl - -# finds all *.cpp files and filters out $(EXCLUDE_FILES); if $(COMPILE_FILES) defined lists only $(COMPILE_FILES) after filtering out $(EXCLUDE_FILES) -#FILES_ALL = $(sort $(foreach file, $(foreach dir, $(TEST_DIRS), $(foreach filename, $(filter %.cpp, $(shell ls $(dir))), $(dir)/$(filename))), $(if $(filter-out $(notdir $(notdir $(EXCLUDE_FILES))), $(notdir $(file))), $(if $(COMPILE_FILES), $(if $(filter $(notdir $(COMPILE_FILES)), $(notdir $(file))), $(file)), $(file))))) -FILES_ALL := $(strip $(foreach file, $(foreach dir, $(TEST_DIRS), $(foreach filename, $(filter %.cpp, $(shell ls $(dir))), $(dir)/$(filename))), $(if $(filter-out $(notdir $(EXCLUDE_FILES)), $(notdir $(file))), $(file)))) -FILES_ALL := $(strip $(if $(COMPILE_FILES), $(foreach filename, $(COMPILE_FILES), $(foreach file, $(FILES_ALL), $(if $(filter $(notdir $(file)), $(notdir $(filename))), $(file)))), $(FILES_ALL)))#$(filter $(notdir $(FILES_ALL)), $(COMPILE_FILES)), $(FILES_ALL))) -FILES_ALL := $(if $(SORT_ALPHABETICALLY_CXX), $(sort $(FILES_ALL)), $(FILES_ALL)) -FILES_CPP := $(strip $(foreach file, $(FILES_ALL), $(if $(filter-out cxx_%, $(notdir $(file))), $(file)))) -FILES_CXX := $(filter-out $(FILES_CPP), $(FILES_ALL)) - -# detect directory in which the cxx files are stored (if empty, no cxx files are to be compiled) -CXX_DIR := $(dir $(firstword $(FILES_CXX))) - -# END CONFIGURATION ################################################################################################### -####################################################################################################################### - -####################################################################################################################### -# RULES ############################################################################################################### - -# target names (for non cxx files) -TARGETS = $(addprefix $(BIN_DIR)/, $(basename $(notdir $(FILES_CPP)))) - -# these rules do not create any files (functional rules) -.PHONY: all create_dirs clean recompile_cxx print - -# invoke this target to build your test suites -all: print create_dirs $(if $(ALWAYS_RECOMPILE_CXX), recompile_cxx) $(TARGETS) $(if $(CXX_DIR), $(BIN_DIR)/$(RUNNER_NAME)) - @echo "=== all built successfully ===" - -# compile compare_Test.cpp used in come cxx test suites -$(OBJ_DIR)/compare_test.o: $(CXX_DIR)/compare_test.cpp - @echo "---> compiling " $(@F) - $(CC) $(CXXFLAGS) $(INCLUDE_DIRS) -c $< -o $@ - -# cxx test suite executable (RUNNER_NAME) comprising all declared cxx files -$(BIN_DIR)/$(RUNNER_NAME): $(OBJ_DIR)/compare_test.o $(FILES_CXX) - cxxtest/bin/cxxtestgen.py --template=cxxtest/template/tango_template.tpl -o $(CXX_DIR)$(RUNNER_NAME).cpp $(FILES_CXX) - @echo "---> compiling " $(@F) - $(CC) $(CXXFLAGS) $(INCLUDE_DIRS) -c $(CXX_DIR)$(RUNNER_NAME).cpp -o $(OBJ_DIR)/$(RUNNER_NAME).o - @echo "===> linking " $(@F) - $(CC) $(OBJ_DIR)/$(RUNNER_NAME).o $(OBJ_DIR)/compare_test.o -o $(BIN_DIR)/$(RUNNER_NAME) $(LFLAGS) - -# dynamic target generator (macro) -define generate_targets -$(BIN_DIR)/$(basename $(notdir $(1))): $(OBJ_DIR)/$(basename $(notdir $(1))).o - @echo "===> linking " $$< - $(CC) $$< -o $(BIN_DIR)/$(basename $$(@F)) $(LFLAGS) -$(OBJ_DIR)/$(basename $(notdir $(1))).o: $(2) - @echo "---> compiling " $$< - $(CC) $(CXXFLAGS) $(INCLUDE_DIRS) -c $$< -o $$@ -endef - -# generate targets (for non cxx files) -$(foreach dependency, $(FILES_CPP), $(eval $(call generate_targets, $(basename $(notdir $(dependency))), $(dependency)))) - -# creates OBJ_DIR and BIN_DIR if they do not exist -create_dirs: - $(shell mkdir -p $(OBJ_DIR)) - $(shell mkdir -p $(BIN_DIR)) - -# forces the RUNNER_NAME to recompile -recompile_cxx: - $(foreach file, $(FILES_CXX), $(shell touch $(file))) - -# print a variable -print_it = -print: - $(if $(print_it), $(info [print] $(print_it))) - -# clean objects -clean: - rm -f $(OBJ_DIR)/*.o core - -# END RULES ########################################################################################################### -####################################################################################################################### diff --git a/cpp_test_suite/Makefile_old b/cpp_test_suite/Makefile_old deleted file mode 100644 index 217f308da..000000000 --- a/cpp_test_suite/Makefile_old +++ /dev/null @@ -1,312 +0,0 @@ -############################################################## -# -# Makefile to generate Tango test suite -# -############################################################## - - -# -# Get BIN DIR -# - -ifndef ubuntu -OS=$(shell /csadmin/common/scripts/get_os.share) -endif - -ifdef ubuntu -ifdef dev -OS=ubuntu1204 -else -OS=ubuntu1004 -endif -endif - -BIN_DIR = $(OS) - -############################################################################## -# -# Define base directory -# -############################################################################## - -ifdef prefix -TANGO_HOME = $(prefix)/$(BIN_DIR) -LIB_TANGO_DIR = $(TANGO_HOME)/lib -BIN_TANGO_DIR = $(TANGO_HOME)/bin -else -TANGO_HOME = /home/taurel/tango/cppapi_develop -LIB_TANGO_DIR = $(TANGO_HOME)/../install/$(BIN_DIR)/lib/debug -BIN_TANGO_DIR = bin/$(BIN_DIR) -endif - -############################################################################## -# -# OmniORB base directory -# -############################################################################## - -ifdef prefix -OMNI_BASE = /segfs/tango/ORB/omniORB4.1.6/$(BIN_DIR) -else -OMNI_BASE = /segfs/tango/ORB/omniORB4.1.6/$(BIN_DIR) -endif - -############################################################################## -# -# Log4tango base directory -# -############################################################################## - -ifdef prefix -LOG4TANGO_BASE = /segfs/tango/tools/log4tango-release/log4tango4.0.6/$(BIN_DIR) -else -LOG4TANGO_BASE = /segfs/tango/tools/log4tango-release/log4tango4.0.6/$(BIN_DIR) -endif - -############################################################################## -# -# ZMQ base directory -# -############################################################################## - -ifdef prefix -ZMQ_BASE = /segfs/tango/transport/zmq/$(BIN_DIR) -else -ZMQ_BASE = /segfs/tango/transport/zmq/$(BIN_DIR) -endif - -ifdef linux -CC = c++ -endif - - -############################################################################## -# -# Compilation -# -############################################################################## - -OBJS_DIR = objs - -ifdef prefix -INCLUDE_DIRS = -I$(OMNI_BASE)/include \ - -I$(TANGO_HOME)/include \ - -I$(LOG4TANGO_BASE)/include/tango \ - -I$(ZMQ_BASE)/include \ - -I. - -LIB_DIRS = -L $(OMNI_BASE)/lib \ - -L $(LIB_TANGO_DIR)/debug \ - -L $(LOG4TANGO_BASE)/lib \ - -L $(ZMQ_BASE)/lib -else -INCLUDE_DIRS = -I$(OMNI_BASE)/include \ - -I$(TANGO_HOME)/server \ - -I$(TANGO_HOME)/client \ - -I$(LOG4TANGO_BASE)/include/tango \ - -I$(ZMQ_BASE)/include \ - -I. - -LIB_DIRS = -L $(OMNI_BASE)/lib \ - -L $(LIB_TANGO_DIR) \ - -L $(LOG4TANGO_BASE)/lib \ - -L $(ZMQ_BASE)/lib - -endif - - -ifdef linux -#Check that we have at least gcc 4.3 (for c++0x features) -GCC_MAJOR_VERSION_GTEQ4 := $(shell expr `c++ -dumpversion | cut -f1 -d.` \>= 4) -GCC_MINOR_VERSION_GTEQ3 := $(shell expr `c++ -dumpversion | cut -f2 -d.` \>= 3) -ifeq ($(GCC_MAJOR_VERSION_GTEQ4),1) - ifeq ($(GCC_MINOR_VERSION_GTEQ3),1) - CXX11 = -std=c++0x - endif -endif - -CXXFLAGS = -g $(CXX11) -DVALGRIND -D_PTHREADS -D_REENTRANT $(INCLUDE_DIRS) -LIB_TANGO = -ltango -#LIB_TANGO = /home/taurel/tango/install/ubuntu1204/lib/debug/libtango.8.0.5.a -lgcov -LFLAGS = -g $(LIB_DIRS) $(LIB_TANGO) -llog4tango \ - -lomniORB4 -lomniDynamic4 -lomnithread \ - -lCOS4 -lzmq -lpthread -ldl -endif - -#.SUFFIXES: .o .cpp -#.cpp.o: -# $(CC) $(CXXFLAGS) -c $< - -$(OBJS_DIR)/%.o: %.cpp - @./cr_dir $(OBJS_DIR) - $(CC) $(CXXFLAGS) -c $< -o $(OBJS_DIR)/$*.o - - -all: new_devproxy multiple_new reconnect cmd_inout read_attr cmd_types \ - attr_types misc_devdata misc_devattr misc_devproxy write_attr \ - copy_devproxy obj_prop read_hist poll_met poll_except poll_attr print_data \ - print_data_hist size attr_proxy read_hist_ext write_attr_3 \ - ring_depth attr_misc state_attr rds mem_att attr_manip prop_list ds_cache sub_dev \ - locked_device lock restart_device unlock allowed_cmd w_r_attr acc_right \ - ConfEventBugClient att_conf Poll StopPoll poll_pool attr_conf_test - - -run: runtest - ./runtest $(platform) - -on_demand: $(on_demand) - - -new_devproxy: $(OBJS_DIR)/new_devproxy.o - @./cr_dir $(BIN_TANGO_DIR) - $(CC) $(OBJS_DIR)/new_devproxy.o -o $(BIN_TANGO_DIR)/new_devproxy $(LFLAGS) - -multiple_new: $(OBJS_DIR)/multiple_new.o - $(CC) $(OBJS_DIR)/multiple_new.o -o $(BIN_TANGO_DIR)/multiple_new $(LFLAGS) - -reconnect: $(OBJS_DIR)/reconnect.o - $(CC) $(OBJS_DIR)/reconnect.o -o $(BIN_TANGO_DIR)/reconnect $(LFLAGS) - -reconnect_attr: $(OBJS_DIR)/reconnect_attr.o - $(CC) $(OBJS_DIR)/reconnect_attr.o -o $(BIN_TANGO_DIR)/reconnect_attr $(LFLAGS) - -cmd_inout: $(OBJS_DIR)/cmd_inout.o - $(CC) $(OBJS_DIR)/cmd_inout.o -o $(BIN_TANGO_DIR)/cmd_inout $(LFLAGS) - -read_attr: $(OBJS_DIR)/read_attr.o - $(CC) $(OBJS_DIR)/read_attr.o -o $(BIN_TANGO_DIR)/read_attr $(LFLAGS) - -cmd_types: $(OBJS_DIR)/cmd_types.o - $(CC) $(OBJS_DIR)/cmd_types.o -o $(BIN_TANGO_DIR)/cmd_types $(LFLAGS) - -attr_types: $(OBJS_DIR)/attr_types.o - $(CC) $(OBJS_DIR)/attr_types.o -o $(BIN_TANGO_DIR)/attr_types $(LFLAGS) - -misc_devdata: $(OBJS_DIR)/misc_devdata.o - $(CC) $(OBJS_DIR)/misc_devdata.o -o $(BIN_TANGO_DIR)/misc_devdata $(LFLAGS) - -misc_devattr: $(OBJS_DIR)/misc_devattr.o - $(CC) $(OBJS_DIR)/misc_devattr.o -o $(BIN_TANGO_DIR)/misc_devattr $(LFLAGS) - -misc_devproxy: $(OBJS_DIR)/misc_devproxy.o - $(CC) $(OBJS_DIR)/misc_devproxy.o -o $(BIN_TANGO_DIR)/misc_devproxy $(LFLAGS) - -write_attr: $(OBJS_DIR)/write_attr.o - $(CC) $(OBJS_DIR)/write_attr.o -o $(BIN_TANGO_DIR)/write_attr $(LFLAGS) - -copy_devproxy: $(OBJS_DIR)/copy_devproxy.o - $(CC) $(OBJS_DIR)/copy_devproxy.o -o $(BIN_TANGO_DIR)/copy_devproxy $(LFLAGS) - -obj_prop: $(OBJS_DIR)/obj_prop.o - $(CC) $(OBJS_DIR)/obj_prop.o -o $(BIN_TANGO_DIR)/obj_prop $(LFLAGS) - -read_hist: $(OBJS_DIR)/read_hist.o - $(CC) $(OBJS_DIR)/read_hist.o -o $(BIN_TANGO_DIR)/read_hist $(LFLAGS) - -att_conf: $(OBJS_DIR)/att_conf.o - $(CC) $(OBJS_DIR)/att_conf.o -o $(BIN_TANGO_DIR)/att_conf $(LFLAGS) - -poll_met: $(OBJS_DIR)/poll_met.o - $(CC) $(OBJS_DIR)/poll_met.o -o $(BIN_TANGO_DIR)/poll_met $(LFLAGS) - -poll_except: $(OBJS_DIR)/poll_except.o - $(CC) $(OBJS_DIR)/poll_except.o -o $(BIN_TANGO_DIR)/poll_except $(LFLAGS) - -poll_attr: $(OBJS_DIR)/poll_attr.o - $(CC) $(OBJS_DIR)/poll_attr.o -o $(BIN_TANGO_DIR)/poll_attr $(LFLAGS) - -print_data: $(OBJS_DIR)/print_data.o - $(CC) $(OBJS_DIR)/print_data.o -o $(BIN_TANGO_DIR)/print_data $(LFLAGS) - -print_data_hist: $(OBJS_DIR)/print_data_hist.o - $(CC) $(OBJS_DIR)/print_data_hist.o -o $(BIN_TANGO_DIR)/print_data_hist $(LFLAGS) - -size: $(OBJS_DIR)/size.o - $(CC) $(OBJS_DIR)/size.o -o $(BIN_TANGO_DIR)/size $(LFLAGS) - -write_attr_3: $(OBJS_DIR)/write_attr_3.o - $(CC) $(OBJS_DIR)/write_attr_3.o -o $(BIN_TANGO_DIR)/write_attr_3 $(LFLAGS) - -read_hist_ext: $(OBJS_DIR)/read_hist_ext.o - $(CC) $(OBJS_DIR)/read_hist_ext.o -o $(BIN_TANGO_DIR)/read_hist_ext $(LFLAGS) - -attr_proxy: $(OBJS_DIR)/attr_proxy.o - $(CC) $(OBJS_DIR)/attr_proxy.o -o $(BIN_TANGO_DIR)/attr_proxy $(LFLAGS) - -ring_depth: $(OBJS_DIR)/ring_depth.o - $(CC) $(OBJS_DIR)/ring_depth.o -o $(BIN_TANGO_DIR)/ring_depth $(LFLAGS) - -attr_misc: $(OBJS_DIR)/attr_misc.o - $(CC) $(OBJS_DIR)/attr_misc.o -o $(BIN_TANGO_DIR)/attr_misc $(LFLAGS) - -state_attr: $(OBJS_DIR)/state_attr.o - $(CC) $(OBJS_DIR)/state_attr.o -o $(BIN_TANGO_DIR)/state_attr $(LFLAGS) - -attr_conf_test: $(OBJS_DIR)/attr_conf_test.o - $(CC) $(OBJS_DIR)/attr_conf_test.o -o $(BIN_TANGO_DIR)/attr_conf_test $(LFLAGS) - -rds: $(OBJS_DIR)/rds.o - $(CC) $(OBJS_DIR)/rds.o -o $(BIN_TANGO_DIR)/rds $(LFLAGS) - -mem_att: $(OBJS_DIR)/mem_att.o - $(CC) $(OBJS_DIR)/mem_att.o -o $(BIN_TANGO_DIR)/mem_att $(LFLAGS) - -helper: $(OBJS_DIR)/helper.o - $(CC) $(OBJS_DIR)/helper.o -o $(BIN_TANGO_DIR)/helper $(LFLAGS) - -64: $(OBJS_DIR)/64.o - $(CC) $(OBJS_DIR)/64.o -o $(BIN_TANGO_DIR)/64 $(LFLAGS) - -attr_manip: $(OBJS_DIR)/attr_manip.o - $(CC) $(OBJS_DIR)/attr_manip.o -o $(BIN_TANGO_DIR)/attr_manip $(LFLAGS) - -add_rem_attr: $(OBJS_DIR)/add_rem_attr.o - $(CC) $(OBJS_DIR)/add_rem_attr.o -o $(BIN_TANGO_DIR)/add_rem_attr $(LFLAGS) - -add_rem_dev: $(OBJS_DIR)/add_rem_dev.o - $(CC) $(OBJS_DIR)/add_rem_dev.o -o $(BIN_TANGO_DIR)/add_rem_dev $(LFLAGS) - -prop_list: $(OBJS_DIR)/prop_list.o - $(CC) $(OBJS_DIR)/prop_list.o -o $(BIN_TANGO_DIR)/prop_list $(LFLAGS) - -ds_cache: $(OBJS_DIR)/ds_cache.o - $(CC) $(OBJS_DIR)/ds_cache.o -o $(BIN_TANGO_DIR)/ds_cache $(LFLAGS) - -lock: $(OBJS_DIR)/lock.o - $(CC) $(OBJS_DIR)/lock.o -o $(BIN_TANGO_DIR)/lock $(LFLAGS) - -locked_device: $(OBJS_DIR)/locked_device.o - $(CC) $(OBJS_DIR)/locked_device.o -o $(BIN_TANGO_DIR)/locked_device $(LFLAGS) - -restart_device: $(OBJS_DIR)/restart_device.o - $(CC) $(OBJS_DIR)/restart_device.o -o $(BIN_TANGO_DIR)/restart_device $(LFLAGS) - -unlock: $(OBJS_DIR)/unlock.o - $(CC) $(OBJS_DIR)/unlock.o -o $(BIN_TANGO_DIR)/unlock $(LFLAGS) - -allowed_cmd: $(OBJS_DIR)/allowed_cmd.o - $(CC) $(OBJS_DIR)/allowed_cmd.o -o $(BIN_TANGO_DIR)/allowed_cmd $(LFLAGS) - -w_r_attr: $(OBJS_DIR)/w_r_attr.o - $(CC) $(OBJS_DIR)/w_r_attr.o -o $(BIN_TANGO_DIR)/w_r_attr $(LFLAGS) - -acc_right: $(OBJS_DIR)/acc_right.o - $(CC) $(OBJS_DIR)/acc_right.o -o $(BIN_TANGO_DIR)/acc_right $(LFLAGS) - -sub_dev: $(OBJS_DIR)/sub_dev.o - $(CC) $(OBJS_DIR)/sub_dev.o -o $(BIN_TANGO_DIR)/sub_dev $(LFLAGS) - -ConfEventBugClient: $(OBJS_DIR)/ConfEventBugClient.o - $(CC) $(OBJS_DIR)/ConfEventBugClient.o -o $(BIN_TANGO_DIR)/ConfEventBugClient $(LFLAGS) - -Poll: $(OBJS_DIR)/Poll.o - $(CC) $(OBJS_DIR)/Poll.o -o $(BIN_TANGO_DIR)/Poll $(LFLAGS) - -StopPoll: $(OBJS_DIR)/StopPoll.o - $(CC) $(OBJS_DIR)/StopPoll.o -o $(BIN_TANGO_DIR)/StopPoll $(LFLAGS) - -poll_pool: $(OBJS_DIR)/poll_pool.o - $(CC) $(OBJS_DIR)/poll_pool.o -o $(BIN_TANGO_DIR)/poll_pool $(LFLAGS) - -clean: - rm -f $(OBJS_DIR)/*.o core diff --git a/cpp_test_suite/README b/cpp_test_suite/README deleted file mode 100644 index b6aa467a9..000000000 --- a/cpp_test_suite/README +++ /dev/null @@ -1,401 +0,0 @@ -####################################################################################################################### - Tango Test Suite -####################################################################################################################### - -This is a guide to the Tango Test Suite use and development. The guide is split in 2 main sections addressed to the -user and developer respectively. Please acquaint yourself with the contents of this file before the use of the framework. - -Outline: --------- - -1. ======== User -1.1. ~~~~~~ Compilation -1.1.1. ---- Create a profile file -1.1.2. ---- Execute `make profile=myprofile` -1.2. ~~~~~~ Execution -1.2.1. ---- Preconditions -1.2.1. ---- Control System configuration -1.2.2. ---- Test Suites execution - -2. ======== Developer -2.1. ~~~~~~ Create a new test suite -2.2. ~~~~~~ Command line arguments -2.2.1. ---- Argument types -2.2.2. ---- Declaring arguments -2.2.3. ---- Predefined arguments -2.3. ~~~~~~ Create a test case -2.3.1. ---- Assertions -2.3.2. ---- Loops -2.3.3. ---- Restore mechanism -2.4. ~~~~~~ Tango specific files in CxxTest framework - -======================================================================================================================= - 1. User -======================================================================================================================= - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 1.1. Compilation -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The Test Suite currently comprises a set of independent executables examining different Tango features and one -executable utilising CxxTest framework, which consists of test suites conforming to unit test standard. - -The source code of the independent executables is located in the following directories: -- asyn -- event -- old_tests - -The source code of the CxxTest test suites resides in: -- new_tests - -!! -- NB -- !! -The source files are required to have '.cpp' extension and unique names. The files being a part of the CxxTest -framework must have a 'cxx_' prefix. - -!! -- NB -- !! -Store all files prefixed with 'cxx_' in one directory. - -To compile the binaries you need to: -- create a profile file -- execute `make profile=myprofile` - ------------------------------------------------------------------------------------------------------------------------ - 1.1.1. Create a profile file ------------------------------------------------------------------------------------------------------------------------ - -Go to 'makeprofiles' directory, copy the 'default.profile' file and rename it (to e.g. 'myprofile.profile'). -Open 'makeprofiles/myprofile.profile' file and define parameters. In this file you indicate paths to 'include' and 'lib' -directories required to run the test suite. There are two sets of parameters: mandatory and optional. Acquaint yourself -with the comments section in 'makeprofiles/default.profile' file to fully understand the meaning of the parameters. - -Below there is a brief tutorial on how to set the parameters: - -Define TANGO_BASE, OMNI_BASE, LOG4TANGO_BASE, ZMQ_BASE indicating the directories which contain 'include' and 'lib' -folders for Tango, omniORB, log4tango and ZMQ libraries. -If your Tango 'include' or 'lib' directories are different then TANGO_BASE/include or TANGO_BASE/lib define -TANGO_INCLUDE_DIR or TANGO_LIB_DIR which will take precedence over TANGO_BASE/include or TANGO_BASE/lib respectively. -Defining TANGO_INCLUDE_DIR you can provide more than one directory. - -By default all files from the following directories will be compiled: -- asyn -- event -- old_tests -- new_tests - -The '*.o' object files will be stored in 'obj' directory and the binaries in the 'bin' directory. - -If you want to: -- modify the output directories - define OBJ_DIR and BIN_DIR parameters; -- add a directory containing extra files to compile - define TEST_DIRS_EXTRA; -- compile files only from the selected directories - define TEST_DIRS; - -All files prefixed with 'cxx_' will be compiled into one executable named 'runner' in the alphabetical order. - -If you wish to compile only the runner, define TEST_DIRS indicating only the folder containing the 'cxx_' files. - -You can also compile exclusive files of your choice by listing them in COMPILE_FILES parameter (both the independent -ones and the 'cxx_' files). In such case, the 'cxx_' files will be compiled into the 'runner' executable in the -provided order. To bring back the alphabetical order, set 'SORT_ALPHABETICALLY_CXX = true'. - -If there are any files you want to exclude from compilation list them in EXCLUDE_FILES property. - -By default 'c++' compiler is used. To choose a different one, redefine the CC property. - -If you need to add some extra compiler parameters on top of the default ones (-g -Wall -Wextra -DVALGRIND -D_PTHREADS --D_REENTRANT) list them in CXXFLAGS_EXTRA property. To totally redefine the compiler parameters set CXXFLAGS. - -To add extra linker options use LFLAGS_EXTRA. - ------------------------------------------------------------------------------------------------------------------------ - 1.1.2. Execute `make profile=myprofile` ------------------------------------------------------------------------------------------------------------------------ - -After configuring the 'myprofile.profile' file, to compile the test suite binaries it is enough to execute: -- `make profile=myprofile` - -The profile name 'myprofile' is the name of the '.profile' file created in the previous step. -Executing mere `make` will load the 'default.profile' settings. - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 1.2. Execution -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ------------------------------------------------------------------------------------------------------------------------ - 1.2.1. Preconditions ------------------------------------------------------------------------------------------------------------------------ - -Before running the test suite make sure that Tango Starter process is not running. -To check if the process is running type in command line: -- `ps -ef | grep -i starter` - -In your control system there has to be a test device server set up (e.g. 'devTest'), consisting of at least 3 devices -(e.g. 'dev/test/1', 'dev/test/2' and 'dev/test/3') from the 'DevTest' class. - ------------------------------------------------------------------------------------------------------------------------ - 1.2.1. Control System configuration ------------------------------------------------------------------------------------------------------------------------ - -Go to the 'bin' directory and execute 'conf_devtest' which will configure the 'devTest' device server properties in the database. These -properties will then be tested in the test suite. Skipping this step will cause the test suites to fail. - -!! -- NB -- !! -Upon execution of 'conf_devtest' a new pseudo device server is registered in the database, namely: 'DsCache/test'. -Make sure no server of such name exists, otherwise refrain from executing 'conf_devtest'. - ------------------------------------------------------------------------------------------------------------------------ - 1.2.2. Test Suites execution ------------------------------------------------------------------------------------------------------------------------ - -Use 'runtest' script to execute all test suites. -You can also call each executable independently. Remember - the 'cxx' test suites are all embedded in one executable: -'runner'. - -======================================================================================================================= - 2. Developer -======================================================================================================================= - -This part is a guide to test suites development with the use of the CxxTest framework. - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 2.1. Create a new test suite -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -To create a new test suite simply copy and rename the 'cxx_suite_template.cpp' file which can be found in the 'new_tests' -directory. - -Modify the header guard 'TemplateTestSuite_h' (lines 1, 2 and the last one) by providing your test suite name. Follow -the convention: if you name your file 'cxx_my_test.cpp' the header guard should take this form - 'MyTestTestSuite_h'. - -Define the test suite class name replacing 'TemplateTestSuite' (lines 15 and 17). Follow the convention (above example -case: 'MyTestTestSuite'). - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 2.2. Command line arguments -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -In the 'Arguments check' section define what command line arguments should be provided if your test suites are dependent -on user configuration (like device names or loop repetitions). - ------------------------------------------------------------------------------------------------------------------------ - 2.2.1. Argument types ------------------------------------------------------------------------------------------------------------------------ - -Some test suites require arguments which are common for all (e.g. the device on which to execute the test suite or the -database server name), for this reason they have been predefined (just the definition of the argument, not its value); -however some other test suites need custom arguments (which make sense only locally in the test suite); -hence there are 3 types of arguments distinguished: - -- params (predefined parameters) - commonly used in all test suites, like device1, device2 and device3 on which the - test suite will be executed or database server name, full device server name, etc.; - they are provided in the command line as follows: '--' + parameter name + '=' + parameter value, e.g.: - `./runner --device1=dev/test/1 --fulldsname=devTest/myname --dbserver=sys/database/2` - -- params_opt (optional parameters) - same as params but not required by the test suite (like a loop parameter); they - are provided in the command line the same way as params but processed by the test suite in a different (optional) way - `./runner --loop=5` - -- params_loc (local parameters) - these are the test suite custom parameters which are not predefined within the CxxTest - framework as they have a meaning only locally in the test suite; - they are read from the command line the same way as params: - `./runner --my_param_loc=my_param_loc_value` - ------------------------------------------------------------------------------------------------------------------------ - 2.2.2. Declaring arguments ------------------------------------------------------------------------------------------------------------------------ - -To declare an argument and obtain its value use the following methods, e.g.: - -- std::string my_param_value = CxxTest::TangoPrinter::get_param("my_param"); - - this will declare a mandatory, predefined parameter (see the list below); predefined parameters are those which are - common for different test suites and therefore have been defined in the Test Framework itself (namely in TangoPrinter.h); - the params in the code are defined by the 'param_name' and provided by the user in the command line as - '--param_name=param_value'; - - calling: - std::string full_ds_name_value = CxxTest::TangoPrinter::get_param("fulldsname"); - and executing: - `./runner --fulldsname=devTest/myname` - will assign 'full_ds_name_value = "devTest/myname"'; if the user does not provide all mandatory parameters, the 'runner' - will terminate and print out all expected mandatory parameters along with their descriptions; - -- std::string my_param_opt_value = CxxTest::TangoPrinter::get_param_opt("my_param_opt"); - - this will declare an optional parameter; optional parameters have the same definition, meaning and use as the - mandatory parameters apart from that they are not obligatory. If the user does not provide some/any optional - parameters the 'runner' will execute normally. - -- std::string my_param_loc_value = CxxTest::TangoPrinter::get_param_loc("my_param_loc","description of what 'my_param_loc' is"); or - std::string my_param_loc_value = CxxTest::TangoPrinter::get_param_loc("my_param_loc"); - - this will declare a mandatory local parameter named 'my_param_loc' description of which is optional; their use in the - command line is the same as the use of 'params' with the only difference that their definitions (names) are not - registered in the global (Test Framework) scope. - -!! -- NB -- !! -Note that 'params', 'params_opt' and 'params_loc' are order-independent and can be mixed up in the command line. - -!! -- NB -- !! -There are parameters acting as toggles to which you do not assign any value (e.g. verbose: '--v'). To check if -a parameter has been set by the user (provided in the command line) simply add in your code: -'bool param_set = CxxTest::TangoPrinter::is_param_set("param_name");' -e.g.: -'bool verbose_on = CxxTest::TangoPrinter::is_param_set("verbose");'. - -!! -- NB -- !! -Note that 'params' are the commonly recognised and defined parameters like 'device1' - device nr 1 on which the test -suite will be run or 'fulldsname' - Tango fully qualified name of the device server. -On the contrary 'params_loc' are these parameters which have a meaning only locally in the Test Suite therefore they -are not defined on the global (Test Framework) scope thus their description has to be provided, e.g.: -- std::string my_param_loc_value = CxxTest::TangoPrinter::get_param_loc("my_param_loc","description of what 'my_param_loc' is"); - - -All of the following calls are logically equivalent: -`./runner --device1=dev/test/1 --fulldsname=devTest/myname --dbserver=sys/database/2 --loop=5` -`./runner --fulldsname=devTest/myname --dbserver=sys/database/2 --loop=5 --device1=dev/test/1` -`./runner --loop=5 --device1=dev/test/1 --dbserver=sys/database/2 --fulldsname=devTest/myname` - ------------------------------------------------------------------------------------------------------------------------ - 2.2.3. Predefined arguments ------------------------------------------------------------------------------------------------------------------------ - -Below is the list of predefined parameters along with their descriptions: - -DEFINITION COMMAND LINE DESCRIPTION ----------- ------------ ----------- -? --? help, lists all possible parameters --? -? help, lists all possible parameters -help --help help, lists all possible parameters --help -help help, lists all possible parameters -verbose --v verbose mode -loop --loop= execute test cases marked with '__loop' suffix the indicated number of times -suiteloop --suiteloop= execute test suites marked with '__loop' suffix the indicated number of times -device1 --device1= device1 name, e.g. test/device/1 -device2 --device2= device2 name, e.g. test/device/2 -device3 --device3= device3 name, e.g. test/device/3 -fulldsname --fulldsname= full device server name, e.g. devTest/myserver -clienthost --clienthost= client host's fully qualified domain name, e.g. mypc.myinstitute.com (small caps) -serverhost --serverhost= fully qualified domain name of the host on which the server is running, e.g. myserver.myinstitute.com (small caps) -serverversion --serverversion= IDL version, e.g. 4 -dbserver --dbserver= database server name, e.g. sys/database/2 -loglevel --loglevel= default device logging level, e.g. 0 -dsloglevel --dsloglevel= default device server logging level, e.g. 3 -devtype --devtype= device type, e.g. TestDevice -docurl --docurl= current documentation URL, e.g. http://www.tango-controls.org -outpath --outpath= device server logging target directory, e.g. /tmp/ -refpath --refpath= directory where the 'compare test' reference files (*.out) are stored -devicealias --devicealias= device1 alias -attributealias --attributealias= Short_attr alias - -!! -- NB -- !! -To the developers of the test suite. If you find a parameter fequently apparing in different test suites which is not -on the list above, please append it to the list which can be found in the body of 'create_params()' method in the -'TangoPrinter.h' file in 'cxxtest/include/cxxtest' directory. - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 2.3. Create a test case -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -To create your test case write a void function with empty arguments. Add prefix 'test_' to the name of the function, e.g.: -- 'void test_MyTestCase() { /* your code here */ }' - -All functions with the 'test_' prefix are interpreted by the CxxTest framework as test cases. Other functions are -ignored by the framework (but can be called from within the test case code). - -The test cases are executed in the order of their definition in the 'cpp' file. - -!! -- NB -- !! -By convention use CAPITAL letters for each word in the name of your test case as the CxxTest framework will parse the -name truncating the 'test_' prefix (and optionally '__loop' suffix) and print out the words separated by space, e.g.: -'test_MyTestCase' --> 'my test case'. - ------------------------------------------------------------------------------------------------------------------------ - 2.3.1. Assertions ------------------------------------------------------------------------------------------------------------------------ - -To perform assertions in your test cases, use one of the CxxTest macros: -- TS_ASSERT(condition) - verifies the condition, if false - the test case fails -- TS_ASSERT_THROWS_NOTHING(instruction) - fails if instruction throws any exception -- TS_ASSERT_THROWS(instruction, exception) - succeeds if instruction throws the exception, otherwise fails -- TS_ASSERT_THROWS_ASSERT(instruction, exception, TS_ASSERT(exception dependent condition)) - succeeds if instruction - throws the exception and if the condition (which can use the thrown exception) is true, otherwise fails -- TS_FAIL(message) - fails unconditionally printing out the message - -For more information on assertions see: -http://cxxtest.com/cxxtest/doc/guide.html - -!! -- NB -- !! -The 'runner' terminates on the first test case failure. - ------------------------------------------------------------------------------------------------------------------------ - 2.3.2. Loops ------------------------------------------------------------------------------------------------------------------------ - -To execute a test suite in a loop, append '__loop' suffix to the test suite name (lines 15 and 17 in cxx_template.cpp), -e.g. 'MyTestTestSuite__loop'. The test suite will execute in a loop only if the 'suiteloop' parameter is defined. - -If the user executes: -- `./runner --suiteloop=10` -the test suite will be run 10 times. - -To execute a test case in a loop, append '__loop' suffix to the test case name, e.g. 'test_MyTestCase__loop()'. The -test case will execute in a loop only if the 'loop' parameter is defined. - -If the test case fails, there is a piece of information printed out to indicate the test case and test suite iteration -in which it happened. - ------------------------------------------------------------------------------------------------------------------------ - 2.3.3. Restore mechanism ------------------------------------------------------------------------------------------------------------------------ - -If your test case modifies some default (device) configuration, use restore points to ensure the default configuration -will always be recovered. - -Imagine you modify the default configuration in your test case then check if some feature works as expected and it fails -before you bring back the old configuration. Setting restore points guarantees that the default configuration will be -recovered by executing the corresponding code located in the test suite TearDown() method which is called always before -the test suite terminates, even if a test case fails. - -To set the restore point, give it a name. e.g. 'my_restore_point' and use: -- CxxTest::TangoPrinter::restore_set("my_restore_point"); - -To remove the restore point call: -- CxxTest::TangoPrinter::restore_unset("my_restore_point"); - -In the 'Clean up' section write the code recovering the default configuration: -- if(CxxTest::TangoPrinter::is_restore_set("my_restore_point")) { /* restore the defaults here */ } - -Example: - -virtual ~SUITE_NAME() -{ -// Clean up -------------------------------------------------------- - if(CxxTest::TangoPrinter::is_restore_set("my_restore_point")) - { - /* recover the default configuration */ - } -} - -void test_MyTestCase() -{ - /* modify the default configuration */ - CxxTest::TangoPrinter::restore_set("my_restore_point"); - // your code here, e.g. assertion which may fail - - // if it fails, the next line will not be executed, but thanks to the restore mechanism, - // the code from the 'Clean up' section will be called - - /* recover the default configuration */ - CxxTest::TangoPrinter::restore_unset("my_restore_point"); -} - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 2.4. Tango specific files in CxxTest framework -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -To support Tango, the CxxTest framework requires 2 extra files: -- 'cxxtest/template/tango_template.tpl' and -- 'cxxtest/include/cxxtest/TangoPrinter.h'. - -If you wish to add some extra functionality to the testing framework, these are the only files you can modify. They are -not shipped with the CxxTest and have to be manually added in case a new, plain version of CxxTest is downloaded. diff --git a/cpp_test_suite/build_runner.bat b/cpp_test_suite/build_runner.bat deleted file mode 100644 index 6fb0a28d7..000000000 --- a/cpp_test_suite/build_runner.bat +++ /dev/null @@ -1,39 +0,0 @@ -set REL_DIR=..\..\..\..\ -python %REL_DIR%cxxtest\bin\cxxtestgen.py --template=%REL_DIR%cxxtest\template\tango_template.tpl -o runner.cpp ^ -%REL_DIR%new_tests\cxx_syntax.cpp ^ -%REL_DIR%new_tests\cxx_poll.cpp ^ -%REL_DIR%new_tests\cxx_poll_admin.cpp ^ -%REL_DIR%new_tests\cxx_dserver_cmd.cpp ^ -%REL_DIR%new_tests\cxx_dserver_misc.cpp ^ -%REL_DIR%new_tests\cxx_always_hook.cpp ^ -%REL_DIR%new_tests\cxx_blackbox.cpp ^ -%REL_DIR%new_tests\cxx_attr_misc.cpp ^ -%REL_DIR%new_tests\cxx_attrprop.cpp ^ -%REL_DIR%new_tests\cxx_attr_write.cpp ^ -%REL_DIR%new_tests\cxx_attr_conf.cpp ^ -%REL_DIR%new_tests\cxx_attr.cpp ^ -%REL_DIR%new_tests\cxx_misc_util.cpp ^ -%REL_DIR%new_tests\cxx_templ_cmd.cpp ^ -%REL_DIR%new_tests\cxx_exception.cpp ^ -%REL_DIR%new_tests\cxx_cmd_query.cpp ^ -%REL_DIR%new_tests\cxx_seq_vec.cpp ^ -%REL_DIR%new_tests\cxx_test_state_on.cpp ^ -%REL_DIR%new_tests\cxx_misc.cpp ^ -%REL_DIR%new_tests\cxx_cmd_types.cpp ^ -%REL_DIR%new_tests\cxx_group.cpp ^ -%REL_DIR%new_tests\cxx_encoded.cpp ^ -%REL_DIR%new_tests\cxx_database.cpp ^ -%REL_DIR%new_tests\cxx_mem_attr.cpp ^ -%REL_DIR%new_tests\cxx_enum_att.cpp ^ -%REL_DIR%new_tests\cxx_write_attr_hard.cpp ^ -%REL_DIR%new_tests\cxx_fwd_att.cpp ^ -%REL_DIR%new_tests\cxx_pipe_conf.cpp ^ -%REL_DIR%new_tests\cxx_pipe.cpp ^ -%REL_DIR%new_tests\cxx_z00_dyn_cmd.cpp - -rem %REL_DIR%new_tests\cxx_zmcast01_simple.cpp ^ -rem %REL_DIR%new_tests\cxx_zmcast02_local_remote.cpp ^ -rem %REL_DIR%new_tests\cxx_zmcast03_svr_local_remote.cpp - -rem %REL_DIR%new_tests\cxx_signal.cpp -rem %REL_DIR%new_tests\cxx_dserver_cmd.cpp diff --git a/cpp_test_suite/build_scr b/cpp_test_suite/build_scr deleted file mode 100755 index ccbacd857..000000000 --- a/cpp_test_suite/build_scr +++ /dev/null @@ -1,326 +0,0 @@ -#!/bin/bash - -UX_INSTALL_DIR="/segfs/tango/ci/Tango" -WIN_INSTALL_DIR="//unixhome/segfs/tango/ci/Tango" - -DS_NAME=devTest -FWD_DS_NAME=FwdTest - -# -# Is clean required ? -# - -if [ $# = 1 ] -then - if [ $1 = "clean" ] - then - CLEAN="clean" - fi -fi - -# -# Set some variables according to OS -# - -for i in $NODE_LABELS -do - echo $i - - if [ $i = "ubuntu12.04" ] - then - echo "Ubuntu 12.04 OS" - OS_TYPE="Linux" - OS="ubuntu1204" - MAKE_PATH="make" - DS_INST_NAME=ubuntu1204 - DS_INST_NAME_2=ubuntu1204_2 - MCAST_INST_NAME=ubuntu1204_mcast - INSTALL_DIR=$UX_INSTALL_DIR - PROF=jenkins_no_mcast - fi - - if [ $i = "Windows_VC9" ] - then - echo "Windows VC9" - OS_TYPE="Windows" - OS_SPEC="Windows" - MAKE_PATH="devenv" - DS_INST_NAME=win32_vc9 - DS_INST_NAME_2=win32_vc9_2 - MCAST_INST_NAME=win32_vc9_mcast - INSTALL_DIR=$WIN_INSTALL_DIR - BIN_DIR="win32" - OUTFILE="devenv_suite" - fi - - if [ $i = "Windows_VC10" ] - then - echo "Windows VC10 (64 bits)" - OS_TYPE="Windows" - OS_SPEC="Windows_64_VC10" - MAKE_PATH="MSBuild.exe" - DS_INST_NAME=win64_vc10 - DS_INST_NAME_2=win64_vc10_2 - MCAST_INST_NAME=win64_vc10_mcast - INSTALL_DIR=$WIN_INSTALL_DIR - BIN_DIR="win64" - OUTFILE="msbuild_suite" - fi - - if [ $i = "centos5" ] - then - echo "Centos 5 OS" - OS_TYPE="Linux" - OS="centos5" - MAKE_PATH="make" - DS_INST_NAME=centos5 - DS_INST_NAME_2=centos5_2 - MCAST_INST_NAME=centos5_mcast - INSTALL_DIR=$UX_INSTALL_DIR - PROF=jenkins_no_mcast - fi - - if [ $i = "redhate4" ] - then - echo "Red Hat 4 OS" - OS_TYPE="Linux" - OS="redhate4" - MAKE_PATH="make" - DS_INST_NAME=redhate4 - DS_INST_NAME_2=redhate4_2 - MCAST_INST_NAME=redhate4_mcast - INSTALL_DIR=$UX_INSTALL_DIR - PROF=jenkins_no_mcast - fi - - if [ $i = "redhate5" ] - then - echo "Red Hat 5 OS (64 bits)" - OS_TYPE="Linux" - OS="redhate5" - MAKE_PATH="make" - DS_INST_NAME=redhate5 - DS_INST_NAME_2=redhate5_2 - MCAST_INST_NAME=redhate5_mcast - INSTALL_DIR=$UX_INSTALL_DIR - PROF=jenkins_no_mcast - fi - - if [ $i = "debian6" ] - then - echo "Debian 6 OS (64 bits)" - OS_TYPE="Linux" - OS="debian6" - MAKE_PATH="make" - DS_INST_NAME=debian6 - DS_INST_NAME_2=debian6_2 - MCAST_INST_NAME=debian6_mcast - INSTALL_DIR=$UX_INSTALL_DIR - PROF=jenkins_no_mcast - fi - - if [ $i = "debian7_tango" ] - then - echo "Debian 7 OS (64 bits)" - OS_TYPE="Linux" - OS="debian7" - MAKE_PATH="make" - DS_INST_NAME=debian7 - DS_INST_NAME_2=debian7_2 - MCAST_INST_NAME=debian7_mcast - INSTALL_DIR=$UX_INSTALL_DIR - PROF=jenkins_no_mcast - fi - - if [ $i = "debian8_tango" ] - then - echo "Debian 8 OS (64 bits)" - OS_TYPE="Linux" - OS="debian8" - MAKE_PATH="make" - DS_INST_NAME=debian8 - DS_INST_NAME_2=debian8_2 - MCAST_INST_NAME=debian8_mcast - INSTALL_DIR=$UX_INSTALL_DIR - PROF=jenkins_no_mcast - fi -done - -# -# Build make command -# - -if [ $OS_TYPE = "Windows" ] -then - if [ -z $CLEAN ] - then - if [ $OS_SPEC = "Windows_64_VC10" ] - then - BUILD="Build" - else - BUILD="/build" - fi - else - if [ $OS_SPEC = "Windows_64_VC10" ] - then - BUILD="Clean;Build" - else - BUILD="/rebuild" - fi - fi - export PREFIX=$INSTALL_DIR - if [ $OS_SPEC = "Windows_64_VC10" ] - then - MAKE_CMD="$MAKE_PATH test_suite.sln /m /p:Platform=x64 /t:$BUILD /p:Configuration=Release /v:quiet /flp:LogFile=$OUTFILE;Summary;ShowCommandLine;Verbosity=minimal" - export PATH=$PATH:/cygdrive/c/Windows/Microsoft.Net/Framework64/v4.0.30319 - cd cpp_test_suite/win64/vc10/test_suite - else - MAKE_CMD="$MAKE_PATH test_suite.sln $BUILD Release /out $OUTFILE " - export PATH=$PATH:/cygdrive/c/Program\ Files/Microsoft\ Visual\ Studio\ 9.0/Common7/IDE - cd cpp_test_suite/win32/vc9/test_suite - fi - PATH=$PATH:/bin - echo $PATH - rm -f $OUTFILE -else - MAKE_CMD="$MAKE_PATH PROFILE=$PROF OS=$OS $CLEAN all" - cd cpp_test_suite -fi - -# -# Create export_variables script -# (exports all environmental variables necessary to execute particular tests) -# - -if [ $OS_TYPE != "Windows" ] -then - EXPORT_VARIABLES=$INSTALL_DIR/$OS/bin/export_variables - - if [ -f $EXPORT_VARIABLES ] - then - rm -f $EXPORT_VARIABLES - fi - - echo "#!/bin/bash" > $EXPORT_VARIABLES - echo "export LD_LIBRARY_PATH=$INSTALL_DIR/$OS/lib/debug:/segfs/tango/transport/zmq4.0.5/$OS/lib:/segfs/tango/tools/log4tango-release/log4tango5.0.1/$OS/lib:/segfs/tango/ORB/omniORB4.2.1/$OS/lib:$LD_LIBRARY_PATH" >> $EXPORT_VARIABLES - echo "export TANGO_HOST=acudebian7:10000" >> $EXPORT_VARIABLES -fi - - - -# -# Run make -# - -echo $MAKE_CMD -$MAKE_CMD -RET=$? -echo "Compilation done" -echo "OS = $OS" -echo "RET = $RET" - -if [ $OS_TYPE = "Windows" ] -then - cat $OUTFILE - cd ../../.. -fi - -if [ $RET != 0 ] -then - echo "Build fail!!!" - exit -1 -fi - -# -# Now Start the first device server -# - -TANGO_LIB=$INSTALL_DIR/$OS/lib -LOG4TANGO_LIB=/segfs/tango/tools/log4tango-release/log4tango5.0.1/$OS/lib -ORB_LIB=/segfs/tango/ORB/omniORB4.2.1/$OS/lib -ZMQ_LIB=/segfs/tango/transport/zmq4.0.5/$OS/lib - -export LD_LIBRARY_PATH=$TANGO_LIB:$LOG4TANGO_LIB:$ORB_LIB:$ZMQ_LIB:$LD_LIBRARY_PATH -export TANGO_HOST=acudebian7:10000 - -if [ $OS_TYPE = "Windows" ] -then - if [ $OS_SPEC = "Windows_64_VC10" ] - then -# -# Since VMWare has been installed on the Windows 64 bits host, the host addresses -# are first local addresses (192.168.X.Y). Force server to listen and publish -# the real IP address until this problem is analysed. -# -# $WIN_INSTALL_DIR/$BIN_DIR/bin/archive/$DS_NAME $DS_INST_NAME -ORBendPoint giop:tcp:160.103.5.4 1>/dev/null 2>&1 & -# $WIN_INSTALL_DIR/$BIN_DIR/bin/archive/$DS_NAME $DS_INST_NAME_2 -ORBendPoint giop:tcp:160.103.5.4 1>/dev/null 2>&1 & -# $WIN_INSTALL_DIR/$BIN_DIR/bin/archive/$DS_NAME $MCAST_INST_NAME -ORBendPoint giop:tcp:160.103.5.4 1>/dev/null 2>&1 & - $WIN_INSTALL_DIR/$BIN_DIR/bin/archive/$DS_NAME $DS_INST_NAME 1>/dev/null 2>&1 & - $WIN_INSTALL_DIR/$BIN_DIR/bin/archive/$DS_NAME $DS_INST_NAME_2 1>/dev/null 2>&1 & - sleep 2 - $WIN_INSTALL_DIR/$BIN_DIR/bin/archive/$FWD_DS_NAME $DS_INST_NAME 1>/dev/null 2>&1 & - $WIN_INSTALL_DIR/$BIN_DIR/bin/archive/$DS_NAME $MCAST_INST_NAME 1>/dev/null 2>&1 & - else - $WIN_INSTALL_DIR/$BIN_DIR/bin/archive/$DS_NAME $DS_INST_NAME 1>/dev/null 2>&1 & - $WIN_INSTALL_DIR/$BIN_DIR/bin/archive/$DS_NAME $DS_INST_NAME_2 1>/dev/null 2>&1 & - sleep 2 - $WIN_INSTALL_DIR/$BIN_DIR/bin/archive/$FWD_DS_NAME $DS_INST_NAME 1>/dev/null 2>&1 & - $WIN_INSTALL_DIR/$BIN_DIR/bin/archive/$DS_NAME $MCAST_INST_NAME 1>/dev/null 2>&1 & - fi -else - echo "Shared libs used by device server" - ldd $INSTALL_DIR/$OS/bin/shared/$DS_NAME - rm /tmp/main_ds.out - rm /tmp/fwd_ds.out -# $INSTALL_DIR/$OS/bin/shared/$DS_NAME $DS_INST_NAME 1>/dev/null 2>&1 & - $INSTALL_DIR/$OS/bin/shared/$DS_NAME $DS_INST_NAME 1>/tmp/main_ds.out 2>&1 & - $INSTALL_DIR/$OS/bin/shared/$DS_NAME $DS_INST_NAME_2 1>/dev/null 2>&1 & - sleep 5 -# $INSTALL_DIR/$OS/bin/shared/$FWD_DS_NAME $DS_INST_NAME 1>/dev/null 2>&1 & - $INSTALL_DIR/$OS/bin/shared/$FWD_DS_NAME $DS_INST_NAME 1>/tmp/fwd_ds.out 2>&1 & -# nohup $INSTALL_DIR/$OS/bin/shared/$DS_NAME $MCAST_INST_NAME 1>/dev/null 2>&1 & -fi - -# -# Start test -# - -if [ $OS_TYPE = "Windows" ] -then - INSTALL_DIR=$WIN_INSTALL_DIR -fi - -./runtest jenkins $INSTALL_DIR -RET=$? - -# -# kill the servers -# - -PIDS=`ps -e | grep $DS_NAME | grep -v grep | grep -v $MCAST_INST_NAME | awk '{print $1}'` -IND=0 -for pid in $PIDS -do - echo "Killing process with PID $pid" - kill $pid - let IND=IND+1 - if [ $IND == 2 ] - then - break - fi -done - -PIDS=`ps -e | grep $FWD_DS_NAME | grep -v grep | grep -v $MCAST_INST_NAME | awk '{print $1}'` -IND=0 -for pid in $PIDS -do - echo "Killing process with PID $pid" - kill $pid - let IND=IND+1 - if [ $IND == 1 ] - then - break - fi -done - -exit $RET diff --git a/cpp_test_suite/cpp_test_ds/Makefile b/cpp_test_suite/cpp_test_ds/Makefile deleted file mode 100644 index 32b0ce51d..000000000 --- a/cpp_test_suite/cpp_test_ds/Makefile +++ /dev/null @@ -1,217 +0,0 @@ -############################################################## -# -# Makefile to generate the Tango test server -# -############################################################## - -# -# Get BIN DIR -# - -ifndef ubuntu -OS=$(shell /csadmin/common/scripts/get_os.share) -endif - -ifdef ubuntu -ifdef dev -OS=ubuntu1404 -else -OS=ubuntu1204 -endif -endif - -BIN_DIR = $(OS) - - -############################################################################## -# -# Define base directory -# -############################################################################## - -ifdef prefix -TANGO_HOME = $(prefix)/$(BIN_DIR) -LIB_TANGO_DIR = $(TANGO_HOME)/lib -ifdef shared -BIN_TANGO_DIR = $(TANGO_HOME)/bin/shared -else -BIN_TANGO_DIR = $(TANGO_HOME)/bin/archive -endif -else -#TANGO_HOME = /home/taurel/tango/cppapi_develop -TANGO_HOME = /home/taurel/tango/cppapi_900 -LIB_TANGO_DIR = $(TANGO_HOME)/../install/$(BIN_DIR)/lib/debug -BIN_TANGO_DIR = bin/$(BIN_DIR) -endif - -############################################################################## -# -# OmniORB base directory -# -############################################################################## - -ifdef prefix -OMNI_BASE = /segfs/tango/ORB/omniORB4.2.1/$(BIN_DIR) -else -OMNI_BASE = /segfs/tango/ORB/omniORB4.2.1/$(BIN_DIR) -endif - -############################################################################## -# -# Log4tango base directory -# -############################################################################## - -ifdef prefix -LOG4TANGO_BASE = /segfs/tango/tools/log4tango-release/log4tango5.0.1/$(BIN_DIR) -else -LOG4TANGO_BASE = /segfs/tango/tools/log4tango-release/log4tango5.0.1/$(BIN_DIR) -endif - -############################################################################## -# -# ZMQ base directory -# -############################################################################## - - -ifdef prefix -#ZMQ_BASE = /segfs/tango/transport/zmq/$(BIN_DIR) -ZMQ_BASE = /segfs/tango/transport/zmq4.0.5/$(BIN_DIR) -else -#ZMQ_BASE = /segfs/tango/transport/zmq/$(BIN_DIR) -ZMQ_BASE = /segfs/tango/transport/zmq4.0.5/$(BIN_DIR) -#ZMQ_BASE = /segfs/tango/transport/zmq4.1.3/$(BIN_DIR) -endif - -ifdef linux -CC = c++ -#CC = /home/taurel/bin/gcc-5.2/bin/c++5.2 -AR = ar -endif - - -############################################################################## -# -# Compilation -# -############################################################################## - -OBJS_DIR = objs -OBJS_FWD_DIR = fwd_ds/objs - -ifdef prefix -INCLUDE_DIRS = -I$(OMNI_BASE)/include \ - -I$(TANGO_HOME)/include \ - -I$(LOG4TANGO_BASE)/include/tango \ - -I$(ZMQ_BASE)/include \ - -I. \ - -I fwd_ds - -LIB_DIRS = -L $(OMNI_BASE)/lib \ - -L $(LIB_TANGO_DIR)/debug \ - -L $(LOG4TANGO_BASE)/lib \ - -L $(ZMQ_BASE)/lib -else -INCLUDE_DIRS = -I$(OMNI_BASE)/include \ - -I$(TANGO_HOME)/server \ - -I$(TANGO_HOME)/client \ - -I$(LOG4TANGO_BASE)/include/tango \ - -I$(ZMQ_BASE)/include \ - -I. \ - -I fwd_ds - -LIB_DIRS = -L $(OMNI_BASE)/lib \ - -L $(LIB_TANGO_DIR) \ - -L $(LOG4TANGO_BASE)/lib \ - -L $(ZMQ_BASE)/lib -endif - - -ifdef prefix -ifdef shared -LIB_TANGO = -ltango -else -LIB_TANGO = $(LIB_TANGO_DIR)/debug/libtango.a -endif -else -LIB_TANGO = -ltango -#LIB_TANGO = /home/taurel/tango/install/ubuntu1204/lib/debug/libtango.8.0.5.a -lgcov -endif - - -ifdef linux - -#Check that we have at least gcc 4.3 (for c++0x features) - -GCC_MAJOR_VERSION_GTEQ4 := $(shell expr `c++ -dumpversion | cut -f1 -d.` \>= 4) -GCC_MINOR_VERSION_GTEQ3 := $(shell expr `c++ -dumpversion | cut -f2 -d.` \>= 3) -ifeq ($(GCC_MAJOR_VERSION_GTEQ4),1) - ifeq ($(GCC_MINOR_VERSION_GTEQ3),1) - CXX11 = -std=c++0x - endif -endif - -CXXFLAGS = -g $(CXX11) -D_REENTRANT $(INCLUDE_DIRS) -LFLAGS = -g $(LIB_DIRS) $(LIB_TANGO) \ - -llog4tango -lomniORB4 -lomniDynamic4 \ - -lCOS4 -lomnithread -lzmq -lpthread -ldl -endif - - -SVC_OBJS = $(OBJS_DIR)/main.o \ - $(OBJS_DIR)/TypeCmds.o \ - $(OBJS_DIR)/SigThrow.o \ - $(OBJS_DIR)/IOMisc.o \ - $(OBJS_DIR)/IOStr1.o \ - $(OBJS_DIR)/IOStr2.o \ - $(OBJS_DIR)/IOArray1.o \ - $(OBJS_DIR)/IOArray2.o \ - $(OBJS_DIR)/IOStrArray.o \ - $(OBJS_DIR)/IOStruct.o \ - $(OBJS_DIR)/IOSetAttr.o \ - $(OBJS_DIR)/IOAddAttribute.o \ - $(OBJS_DIR)/IOSeqVec.o \ - $(OBJS_DIR)/FileDb.o \ - $(OBJS_DIR)/classfactory.o \ - $(OBJS_DIR)/DevTestClass.o \ - $(OBJS_DIR)/DevTest.o - -SVC_FWD_OBJS = $(OBJS_FWD_DIR)/main.o \ - $(OBJS_FWD_DIR)/ClassFactory.o \ - $(OBJS_FWD_DIR)/FwdTestClass.o \ - $(OBJS_FWD_DIR)/FwdTest.o \ - $(OBJS_FWD_DIR)/FwdTestStateMachine.o - -#.SUFFIXES: .o .cpp -#.cpp.o: -# @./cr_dir $(OBJS_DIR) -# $(CC) $(CXXFLAGS) -c $< -o $(OBJS_DIR)/$*.o - - -$(OBJS_DIR)/%.o: %.cpp - @./cr_dir $(OBJS_DIR) - $(CC) $(CXXFLAGS) -c $< -o $(OBJS_DIR)/$*.o - -$(OBJS_FWD_DIR)/%.o: fwd_ds/%.cpp - @./cr_dir $(OBJS_FWD_DIR) - $(CC) $(CXXFLAGS) -c $< -o $(OBJS_FWD_DIR)/$*.o - -all: DevTest FwdTest - -DevTest: $(SVC_OBJS) - @./cr_dir $(BIN_TANGO_DIR) - $(CC) $(SVC_OBJS) -o $(BIN_TANGO_DIR)/devTest $(LFLAGS) - -FwdTest: $(SVC_FWD_OBJS) - @./cr_dir $(BIN_TANGO_DIR) - $(CC) $(SVC_FWD_OBJS) -o $(BIN_TANGO_DIR)/FwdTest $(LFLAGS) - -clean: - rm -f $(OBJS_DIR)/*.o $(OBJS_FWD_DIR)/*.o core - - - - - - diff --git a/cpp_test_suite/cpp_test_ds/Makefile.compat b/cpp_test_suite/cpp_test_ds/Makefile.compat deleted file mode 100644 index 712874bfa..000000000 --- a/cpp_test_suite/cpp_test_ds/Makefile.compat +++ /dev/null @@ -1,175 +0,0 @@ -# -# Makefile to generate a Tango server -# - -ifdef _solaris -CC = CC -DEST_BIN_DIR = bin/solaris7_CC -BIN_DIR = solaris7_CC -OMNI_BASE = /segfs/tango/ORB/omniORB4.0.5/solaris7_CC -LOG4TANGO_BASE = /segfs/tango/tools/log4tango4.0.2/solaris7_CC -endif - -ifdef _solaris9 -CC = CC -DEST_BIN_DIR = bin/solaris9_CC -BIN_DIR = solaris9_CC -OMNI_BASE = /segfs/tango/ORB/omniORB4.0.5/solaris9_CC -LOG4TANGO_BASE = /segfs/tango/tools/log4tango4.0.2/solaris9_CC -endif - -ifdef _solaris7_gcc -CC = c++ -DEST_BIN_DIR = bin/solaris7 -BIN_DIR = solaris7 -OMNI_BASE = /segfs/tango/ORB/omniORB4.0.5/solaris7 -LOG4TANGO_BASE = /segfs/tango/tools/log4tango4.0.2/solaris7 -endif - -ifdef _solaris9_gcc -CC = c++ -DEST_BIN_DIR = bin/solaris9 -BIN_DIR = solaris9 -OMNI_BASE = /segfs/tango/ORB/omniORB4.0.5/solaris9 -LOG4TANGO_BASE = /segfs/tango/tools/log4tango4.0.2/solaris9 -endif - -ifdef linux -CC = c++ -AR = ar -ifdef suse82 -DEST_BIN_DIR = bin/suse82 -BIN_DIR = suse82 -OMNI_BASE = /segfs/tango/ORB/omniORB4.0.5/suse82 -LOG4TANGO_BASE = /segfs/tango/tools/log4tango4.0.1/suse82 -else -ifdef debian30 -DEST_BIN_DIR = bin/debian30 -BIN_DIR = debian30 -OMNI_BASE = /segfs/tango/ORB/omniORB4.0.5/debian30 -LOG4TANGO_BASE = /segfs/tango/tools/log4tango4.0.2/debian30 -else -ifdef suse72_gcc32 -DEST_BIN_DIR = bin/suse72_gcc32 -BIN_DIR = suse72_gcc32 -OMNI_BASE = /segfs/tango/ORB/omniORB4.0.5/suse72_gcc32 -LOG4TANGO_BASE = /segfs/tango/tools/log4tango4.0.2/suse72_gcc32 -else -ifdef redhat40 -DEST_BIN_DIR = bin/redhat40 -BIN_DIR = redhat40 -OMNI_BASE = /segfs/tango/ORB/omniORB4.0.5/redhat40 -LOG4TANGO_BASE = /segfs/tango/tools/log4tango4.0.2/redhat40 -else -ifdef suse90_64 -DEST_BIN_DIR = bin/suse90_64 -BIN_DIR = suse90_64 -OMNI_BASE = /segfs/tango/ORB/omniORB4.0.5/suse90_64 -LOG4TANGO_BASE = /segfs/tango/tools/log4tango4.0.2/suse90_64 -else -DEST_BIN_DIR = bin/suse72 -BIN_DIR = suse72 -OMNI_BASE = /segfs/tango/ORB/omniORB4.0.5/suse72 -LOG4TANGO_BASE = /segfs/tango/tools/log4tango4.0.0/suse72 -endif -endif -endif -endif -endif -endif - - -TANGO_HOME = /segfs/tango/cppapi - -#INCLUDE_DIRS = -I$(OMNI_BASE)/include \ -# -I$(LOG4TANGO_BASE)/include \ -# -I$(TANGO_HOME)/server \ -# -I$(TANGO_HOME)/client \ -# -I. -INCLUDE_DIRS = -I/segfs/tango/include/suse82 \ - -I. - -LIB_DIRS = -L $(OMNI_BASE)/lib \ - -L /segfs/tango/lib/$(BIN_DIR) -#LIB_DIRS = -L /segfs/tango/ORB/omniORB4.0.5/$(BIN_DIR)/lib \ -# -L $(LOG4TANGO_BASE)/lib \ -# -L $(TANGO_HOME)/server/$(BIN_DIR) - -#LIB_TANGO = $(TANGO_HOME)/server/$(BIN_DIR)/libtango.a -LIB_TANGO = -ltango - -ifdef _solaris -CXXFLAGS = -g -mt $(INCLUDE_DIRS) -LFLAGS = -mt -g $(LIB_DIRS) $(LIB_TANGO) \ - -llog4tango -lomniORB4 -lomniDynamic4 -lomnithread -lpthread \ - -lCOS4 -lposix4 -lsocket -lnsl -endif - -ifdef _solaris9 -CXXFLAGS = -g -mt $(INCLUDE_DIRS) -LFLAGS = -mt -g $(LIB_DIRS) $(LIB_TANGO) \ - -llog4tango -lomniORB4 -lomniDynamic4 -lomnithread -lpthread \ - -lCOS4 -lposix4 -lsocket -lnsl -endif - -ifdef _solaris7_gcc -CXXFLAGS = -g -D_REENTRANT $(INCLUDE_DIRS) -LFLAGS = $(LIB_DIRS) $(LIB_TANGO) \ - -llog4tango -lomniORB4 -lomniDynamic4 \ - -lCOS4 -lomnithread -lposix4 -lsocket -lnsl -endif - -ifdef _solaris9_gcc -CXXFLAGS = -g -D_REENTRANT $(INCLUDE_DIRS) -LFLAGS = $(LIB_DIRS) $(LIB_TANGO) \ - -llog4tango -lomniORB4 -lomniDynamic4 \ - -lCOS4 -lomnithread -lposix4 -lsocket -lnsl -endif - -ifdef linux -CXXFLAGS = -g -D_REENTRANT $(INCLUDE_DIRS) -LFLAGS = $(LIB_DIRS) $(LIB_TANGO) \ - -llog4tango -lomniORB4 -lomniDynamic4 \ - -lCOS4 -lomnithread -lpthread -endif - - -SVC_OBJS = main.o \ - TypeCmds.o \ - SigThrow.o \ - IOMisc.o \ - IOStr1.o \ - IOStr2.o \ - IOArray1.o \ - IOArray2.o \ - IOStrArray.o \ - IOStruct.o \ - IOSetAttr.o \ - IOAddAttribute.o \ - IOSeqVec.o \ - FileDb.o \ - classfactory.o \ - DevTestClass.o \ - DevTest.o - - - -.SUFFIXES: .o .cpp -.cpp.o: - $(CC) $(CXXFLAGS) -c $< - - -all: DevTest - -DevTest: $(SVC_OBJS) - $(CC) $(SVC_OBJS) -o $(DEST_BIN_DIR)/devTest $(LFLAGS) - - -clean: - rm -f *.o core - - - - - - diff --git a/cpp_test_suite/cpp_test_ds/cr_dir b/cpp_test_suite/cpp_test_ds/cr_dir deleted file mode 100644 index 918b40675..000000000 --- a/cpp_test_suite/cpp_test_ds/cr_dir +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ ! -d $1 ] -then - echo "Creating directory $1" - mkdir -p $1 -fi diff --git a/cpp_test_suite/cpp_test_ds/fwd_ds/Makefile b/cpp_test_suite/cpp_test_ds/fwd_ds/Makefile deleted file mode 100644 index 57e647ba3..000000000 --- a/cpp_test_suite/cpp_test_ds/fwd_ds/Makefile +++ /dev/null @@ -1,145 +0,0 @@ -#============================================================================= -# -# file : Makefile -# -# description : Makefile to generate a TANGO device server. -# -# project : FwdTest -# -# $Author: $ -# -# $Revision: $ -# $Date: $ -# -#============================================================================= -# This file is generated by POGO -# (Program Obviously used to Generate tango Object) -#============================================================================= -# -# -#============================================================================= -# MAKE_ENV is the path to find common environment to buil project -# -MAKE_ENV = /segfs/tango/cppserver/env - -#============================================================================= -# PACKAGE_NAME is the name of the library/device/exe you want to build -# -PACKAGE_NAME = FwdTest -MAJOR_VERS = 1 -MINOR_VERS = 0 -RELEASE = Release_$(MAJOR_VERS)_$(MINOR_VERS) - -# #============================================================================= -# # RELEASE_TYPE -# # - DEBUG : debug symbols - no optimization -# # - OPTIMIZED : no debug symbols - optimization level set to O2 -# #----------------------------------------------------------------------------- -RELEASE_TYPE = DEBUG - -#============================================================================= -# OUTPUT_TYPE can be one of the following : -# - 'STATIC_LIB' for a static library (.a) -# - 'SHARED_LIB' for a dynamic library (.so) -# - 'DEVICE' for a device server (will automatically include and link -# with Tango dependencies) -# - 'SIMPLE_EXE' for an executable with no dependency (for exemple the test tool -# of a library with no Tango dependencies) -# -OUTPUT_TYPE = DEVICE - -#============================================================================= -# OUTPUT_DIR is the directory which contains the build result. -# if not set, the standard location is : -# - $HOME/DeviceServers if OUTPUT_TYPE is DEVICE -# - ../bin for others -# -OUTPUT_DIR = ./bin/$(BIN_DIR) - - -#============================================================================= -# INC_DIR_USER is the list of all include path needed by your sources -# - for a device server, tango dependencies are automatically appended -# - '-I ../include' and '-I .' are automatically appended in all cases -# -INC_DIR_USER= -I . \ - -I /home/taurel/tango/cppapi_900/client \ - -I /home/taurel/tango/cppapi_900/server - -#============================================================================= -# LIB_DIR_USER is the list of user library directories -# - for a device server, tango libraries directories are automatically appended -# - '-L ../lib' is automatically appended in all cases -# -LIB_DIR_USER= -L/home/taurel/tango/install/ubuntu1204/lib/debug - -#============================================================================= -# LFLAGS_USR is the list of user link flags -# - for a device server, tango libraries directories are automatically appended -# - '-ldl -lpthread' is automatically appended in all cases -# -# !!! ATTENTION !!! -# Be aware that the order matters. -# For example if you must link with libA, and if libA depends itself on libB -# you must use '-lA -lB' in this order as link flags, otherwise you will get -# 'undefined reference' errors -# -#LFLAGS_USR+= - - -#============================================================================= -# CXXFLAGS_USR lists the compilation flags specific for your library/device/exe -# This is the place where to put your compile-time macros using '-Dmy_macro' -# -# -DACE_HAS_EXCEPTIONS -D__ACE_INLINE__ for ACE -# -#CXXFLAGS_USR+= -Wall - - -#============================================================================= -# TANGO_REQUIRED -# - TRUE : your project depends on TANGO -# - FALSE : your project does not depend on TANGO -#----------------------------------------------------------------------------- -# - NOTE : if PROJECT_TYPE is set to DEVICE, TANGO will be auto. added -#----------------------------------------------------------------------------- -TANGO_REQUIRED = TRUE - - - -#============================================================================= -# include Standard TANGO compilation options -# -#include $(MAKE_ENV)/tango.opt -include ../../tmp/tango.opt - -#============================================================================= -# POST_PROCESSING: action to be done after normal make. -# e.g.: change executable file name, ..... -#POST_PROCESSING = \ -# mv bin/$(BIN_DIR)/$(PACKAGE_NAME) bin/$(BIN_DIR)/$(PACKAGE_NAME)_DS - -#============================================================================= -# SVC_OBJS is the list of all objects needed to make the output -# -SVC_INCL = $(PACKAGE_NAME).h $(PACKAGE_NAME)Class.h - - -SVC_OBJS = \ - $(OBJDIR)/$(PACKAGE_NAME).o \ - $(OBJDIR)/$(PACKAGE_NAME)Class.o \ - $(OBJDIR)/$(PACKAGE_NAME)StateMachine.o \ - $(OBJDIR)/ClassFactory.o \ - $(OBJDIR)/main.o \ - $(ADDITIONAL_OBJS) - -SVC_INHERITANCE_OBJ = \ - - -#============================================================================= -# include common targets -# -include $(MAKE_ENV)/common_target.opt - - - diff --git a/cpp_test_suite/cpp_test_ds/win32_ds/WIN32_DS.DSW b/cpp_test_suite/cpp_test_ds/win32_ds/WIN32_DS.DSW deleted file mode 100644 index d61d17e11..000000000 --- a/cpp_test_suite/cpp_test_ds/win32_ds/WIN32_DS.DSW +++ /dev/null @@ -1,53 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "win32_ds"=.\win32_ds.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "win32_ds_dll"=.\win32_ds_dll\win32_ds_dll.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "win32_ds_win"=.\win32_ds_win\win32_ds_win.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/cpp_test_suite/cpp_test_ds/win32_ds/WIN32_DS.OPT b/cpp_test_suite/cpp_test_ds/win32_ds/WIN32_DS.OPT deleted file mode 100644 index 5c499be61..000000000 Binary files a/cpp_test_suite/cpp_test_ds/win32_ds/WIN32_DS.OPT and /dev/null differ diff --git a/cpp_test_suite/cpp_test_ds/win32_ds/WIN32_DS.ncb b/cpp_test_suite/cpp_test_ds/win32_ds/WIN32_DS.ncb deleted file mode 100644 index 1bd1e5a49..000000000 Binary files a/cpp_test_suite/cpp_test_ds/win32_ds/WIN32_DS.ncb and /dev/null differ diff --git a/cpp_test_suite/cpp_test_ds/win32_ds/w32_ds_win/w32_ds_win.dsp b/cpp_test_suite/cpp_test_ds/win32_ds/w32_ds_win/w32_ds_win.dsp deleted file mode 100644 index be3f1b85e..000000000 --- a/cpp_test_suite/cpp_test_ds/win32_ds/w32_ds_win/w32_ds_win.dsp +++ /dev/null @@ -1,92 +0,0 @@ -# Microsoft Developer Studio Project File - Name="w32_ds_win" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=w32_ds_win - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "w32_ds_win.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "w32_ds_win.mak" CFG="w32_ds_win - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "w32_ds_win - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "w32_ds_win - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "w32_ds_win - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "w32_ds_win - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "w32_ds_win - Win32 Release" -# Name "w32_ds_win - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# End Target -# End Project diff --git a/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds.dsp b/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds.dsp deleted file mode 100644 index fda88ebeb..000000000 --- a/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds.dsp +++ /dev/null @@ -1,222 +0,0 @@ -# Microsoft Developer Studio Project File - Name="win32_ds" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=win32_ds - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "win32_ds.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "win32_ds.mak" CFG="win32_ds - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "win32_ds - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "win32_ds - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "win32_ds - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "C:\cppapi\server" /I "C:\cppapi\client" /I "$(OMNI_BASE)\win32\include" /I "$(LOG4TANGO_BASE)\win32\include" /I "F:\tango\tools\test_system\ref\device" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINSTATIC" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 tango.lib log4tango.lib omniORB4.lib omniDynamic4.lib omnithread.lib COS4.lib comctl32.lib ws2_32.lib mswsock.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"Release/devTest.exe" /libpath:"C:\cppapi\server\winnt_lib\tango_static\release" /libpath:"$(OMNI_BASE)\win32\lib" /libpath:"$(LOG4TANGO_BASE)\win32\lib" - -!ELSEIF "$(CFG)" == "win32_ds - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /ZI /Od /I "C:\cppapi_5_2\server" /I "C:\cppapi_5_2\client" /I "$(OMNI_BASE)\win32\include" /I "$(LOG4TANGO_BASE)\win32\include" /I "F:\tango\tools\test_system\ref\device" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINSTATIC" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 tangod.lib log4tangod.lib omniORB4d.lib omniDynamic4d.lib omnithreadd.lib COS4d.lib comctl32.lib ws2_32.lib mswsock.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/devTest.exe" /pdbtype:sept /libpath:"C:\cppapi\server\winnt_lib\tango_static\debug" /libpath:"$(OMNI_BASE)\win32\lib" /libpath:"$(LOG4TANGO_BASE)\win32\lib" - -!ENDIF - -# Begin Target - -# Name "win32_ds - Win32 Release" -# Name "win32_ds - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\classfactory.cpp -# End Source File -# Begin Source File - -SOURCE=..\DevTest.cpp -# End Source File -# Begin Source File - -SOURCE=..\DevTestClass.cpp -# End Source File -# Begin Source File - -SOURCE=..\FileDb.cpp -# End Source File -# Begin Source File - -SOURCE=..\IOAddAttribute.cpp -# End Source File -# Begin Source File - -SOURCE=..\IOArray1.cpp -# End Source File -# Begin Source File - -SOURCE=..\IOArray2.cpp -# End Source File -# Begin Source File - -SOURCE=..\IOMisc.cpp -# End Source File -# Begin Source File - -SOURCE=..\IOSeqVec.cpp -# End Source File -# Begin Source File - -SOURCE=..\IOSetAttr.cpp -# End Source File -# Begin Source File - -SOURCE=..\IOStr1.cpp -# End Source File -# Begin Source File - -SOURCE=..\IOStr2.cpp -# End Source File -# Begin Source File - -SOURCE=..\IOStrArray.cpp -# End Source File -# Begin Source File - -SOURCE=..\IOStruct.cpp -# End Source File -# Begin Source File - -SOURCE=..\main.cpp -# End Source File -# Begin Source File - -SOURCE=..\SigThrow.cpp -# End Source File -# Begin Source File - -SOURCE=..\TypeCmds.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\DevTest.h -# End Source File -# Begin Source File - -SOURCE=..\DevTestClass.h -# End Source File -# Begin Source File - -SOURCE=..\IOAddAttribute.h -# End Source File -# Begin Source File - -SOURCE=..\IOArray1.h -# End Source File -# Begin Source File - -SOURCE=..\IOArray2.h -# End Source File -# Begin Source File - -SOURCE=..\IOMisc.h -# End Source File -# Begin Source File - -SOURCE=..\IOSeqVec.h -# End Source File -# Begin Source File - -SOURCE=..\IOSetAttr.h -# End Source File -# Begin Source File - -SOURCE=..\IOStr1.h -# End Source File -# Begin Source File - -SOURCE=..\IOStr2.h -# End Source File -# Begin Source File - -SOURCE=..\IOStrArray.h -# End Source File -# Begin Source File - -SOURCE=..\IOStruct.h -# End Source File -# Begin Source File - -SOURCE=..\SigThrow.h -# End Source File -# Begin Source File - -SOURCE=..\TypeCmds.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds.plg b/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds.plg deleted file mode 100644 index da30b94f3..000000000 --- a/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds.plg +++ /dev/null @@ -1,40 +0,0 @@ - - -
-
Build Log

-

---------------------Configuration: win32_ds - Win32 Release--------------------
-

-
Command Lines

-Creating temporary file "C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP1DC.tmp" with contents
-[
-tango.lib log4tango.lib omniORB4.lib omniDynamic4.lib omnithread.lib COS4.lib comctl32.lib ws2_32.lib mswsock.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"Release/devTest.pdb" /machine:I386 /out:"Release/devTest.exe" /libpath:"C:\cppapi\server\winnt_lib\tango_static\release" /libpath:"F:\tango\ORB\omniORB4.0.5\win32\lib" /libpath:"F:\tango\tools\log4tango4.0.2\win32\lib" 
-.\Release\classfactory.obj
-.\Release\DevTest.obj
-.\Release\DevTestClass.obj
-.\Release\FileDb.obj
-.\Release\IOAddAttribute.obj
-.\Release\IOArray1.obj
-.\Release\IOArray2.obj
-.\Release\IOMisc.obj
-.\Release\IOSeqVec.obj
-.\Release\IOSetAttr.obj
-.\Release\IOStr1.obj
-.\Release\IOStr2.obj
-.\Release\IOStrArray.obj
-.\Release\IOStruct.obj
-.\Release\main.obj
-.\Release\SigThrow.obj
-.\Release\TypeCmds.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP1DC.tmp"
-
Output Window

-Linking...
-
-
-
-
Results

-devTest.exe - 0 error(s), 0 warning(s)
-
- - diff --git a/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds_dll/win32_ds_dll.dsp b/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds_dll/win32_ds_dll.dsp deleted file mode 100644 index 1e7f650bd..000000000 --- a/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds_dll/win32_ds_dll.dsp +++ /dev/null @@ -1,222 +0,0 @@ -# Microsoft Developer Studio Project File - Name="win32_ds_dll" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=win32_ds_dll - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "win32_ds_dll.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "win32_ds_dll.mak" CFG="win32_ds_dll - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "win32_ds_dll - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "win32_ds_dll - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "win32_ds_dll - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "C:\cppapi_5_2\server" /I "C:\cppapi_5_2\client" /I "$(OMNI_BASE)\win32_dll\include" /I "$(LOG4TANGO_BASE)\win32_dll\include" /I "F:\tango\tools\test_system\ref\device" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "LOG4TANGO_HAS_DLL" /D "TANGO_HAS_DLL" /YX /FD /c -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 tango.lib log4tango.lib omniORB405_rt.lib omniDynamic405_rt.lib omnithread30_rt.lib COS405_rt.lib comctl32.lib ws2_32.lib mswsock.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"Release/devTest.exe" /libpath:"C:\cppapi\server\winnt_lib\tango_dll\release" /libpath:"$(OMNI_BASE)\win32_dll\lib" /libpath:"$(LOG4TANGO_BASE)\win32_dll\lib" - -!ELSEIF "$(CFG)" == "win32_ds_dll - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "C:\cppapi_5_2\server" /I "C:\cppapi_5_2\client" /I "$(OMNI_BASE)\win32_dll\include" /I "$(LOG4TANGO_BASE)\win32_dll\include" /I "F:\tango\tools\test_system\ref\device" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "LOG4TANGO_HAS_DLL" /D "TANGO_HAS_DLL" /YX /FD /GZ /c -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 tangod.lib log4tangod.lib omniORB405_rtd.lib omniDynamic405_rtd.lib omnithread30_rtd.lib COS405_rtd.lib comctl32.lib ws2_32.lib mswsock.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/devTest.exe" /pdbtype:sept /libpath:"C:\cppapi\server\winnt_lib\tango_dll\debug" /libpath:"$(OMNI_BASE)\win32_dll\lib" /libpath:"$(LOG4TANGO_BASE)\win32_dll\lib" - -!ENDIF - -# Begin Target - -# Name "win32_ds_dll - Win32 Release" -# Name "win32_ds_dll - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\classfactory.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\DevTest.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\DevTestClass.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\FileDb.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOAddAttribute.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOArray1.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOArray2.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOMisc.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOSeqVec.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOSetAttr.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOStr1.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOStr2.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOStrArray.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOStruct.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\main.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\SigThrow.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\TypeCmds.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\DevTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\DevTestClass.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOAddAttribute.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOArray1.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOArray2.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOMisc.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOSeqVec.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOSetAttr.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOStr1.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOStr2.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOStrArray.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOStruct.h -# End Source File -# Begin Source File - -SOURCE=..\..\SigThrow.h -# End Source File -# Begin Source File - -SOURCE=..\..\TypeCmds.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds_dll/win32_ds_dll.plg b/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds_dll/win32_ds_dll.plg deleted file mode 100644 index 222bfbb41..000000000 --- a/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds_dll/win32_ds_dll.plg +++ /dev/null @@ -1,82 +0,0 @@ - - -
-
Build Log

-

---------------------Configuration: win32_ds_dll - Win32 Debug--------------------
-

-
Command Lines

-Creating temporary file "C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP1F1.tmp" with contents
-[
-/nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "C:\cppapi\server" /I "C:\cppapi\client" /I "F:\tango\ORB\omniORB4.0.5\win32_dll\include" /I "F:\tango\tools\log4tango4.0.2\win32_dll\include" /I "F:\tango\tools\test_system\ref\device" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "LOG4TANGO_HAS_DLL" /D "TANGO_HAS_DLL" /Fp"Debug/win32_ds_dll.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"F:\tango\tools\test_system\ref\device\DevTest.cpp"
-"F:\tango\tools\test_system\ref\device\DevTestClass.cpp"
-"F:\tango\tools\test_system\ref\device\FileDb.cpp"
-"F:\tango\tools\test_system\ref\device\IOAddAttribute.cpp"
-"F:\tango\tools\test_system\ref\device\IOArray1.cpp"
-"F:\tango\tools\test_system\ref\device\IOArray2.cpp"
-"F:\tango\tools\test_system\ref\device\IOMisc.cpp"
-"F:\tango\tools\test_system\ref\device\IOSeqVec.cpp"
-"F:\tango\tools\test_system\ref\device\IOSetAttr.cpp"
-"F:\tango\tools\test_system\ref\device\IOStr1.cpp"
-"F:\tango\tools\test_system\ref\device\IOStr2.cpp"
-"F:\tango\tools\test_system\ref\device\IOStrArray.cpp"
-"F:\tango\tools\test_system\ref\device\IOStruct.cpp"
-"F:\tango\tools\test_system\ref\device\main.cpp"
-"F:\tango\tools\test_system\ref\device\SigThrow.cpp"
-"F:\tango\tools\test_system\ref\device\TypeCmds.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP1F1.tmp" 
-Creating temporary file "C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP1F2.tmp" with contents
-[
-tangod.lib log4tangod.lib omniORB405_rtd.lib omniDynamic405_rtd.lib omnithread30_rtd.lib COS405_rtd.lib comctl32.lib ws2_32.lib mswsock.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/devTest.pdb" /debug /machine:I386 /out:"Debug/devTest.exe" /pdbtype:sept /libpath:"C:\cppapi\server\winnt_lib\tango_dll\debug" /libpath:"F:\tango\ORB\omniORB4.0.5\win32_dll\lib" /libpath:"F:\tango\tools\log4tango4.0.2\win32_dll\lib" 
-.\Debug\classfactory.obj
-.\Debug\DevTest.obj
-.\Debug\DevTestClass.obj
-.\Debug\FileDb.obj
-.\Debug\IOAddAttribute.obj
-.\Debug\IOArray1.obj
-.\Debug\IOArray2.obj
-.\Debug\IOMisc.obj
-.\Debug\IOSeqVec.obj
-.\Debug\IOSetAttr.obj
-.\Debug\IOStr1.obj
-.\Debug\IOStr2.obj
-.\Debug\IOStrArray.obj
-.\Debug\IOStruct.obj
-.\Debug\main.obj
-.\Debug\SigThrow.obj
-.\Debug\TypeCmds.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP1F2.tmp"
-
Output Window

-Compiling...
-DevTest.cpp
-DevTestClass.cpp
-FileDb.cpp
-IOAddAttribute.cpp
-IOArray1.cpp
-IOArray2.cpp
-IOMisc.cpp
-IOSeqVec.cpp
-IOSetAttr.cpp
-IOStr1.cpp
-IOStr2.cpp
-IOStrArray.cpp
-IOStruct.cpp
-main.cpp
-SigThrow.cpp
-TypeCmds.cpp
-F:\tango\tools\test_system\ref\device\SigThrow.cpp(55) : warning C4700: local variable 'out' used without having been initialized
-F:\tango\tools\test_system\ref\device\SigThrow.cpp(106) : warning C4700: local variable 'out' used without having been initialized
-F:\tango\tools\test_system\ref\device\SigThrow.cpp(193) : warning C4700: local variable 'out' used without having been initialized
-Linking...
-   Creating library Debug/devTest.lib and object Debug/devTest.exp
-
-
-
-
Results

-devTest.exe - 0 error(s), 3 warning(s)
-
- - diff --git a/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds_win/win32_ds_win.dsp b/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds_win/win32_ds_win.dsp deleted file mode 100644 index be4360b44..000000000 --- a/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds_win/win32_ds_win.dsp +++ /dev/null @@ -1,226 +0,0 @@ -# Microsoft Developer Studio Project File - Name="win32_ds_win" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=win32_ds_win - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "win32_ds_win.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "win32_ds_win.mak" CFG="win32_ds_win - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "win32_ds_win - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "win32_ds_win - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "win32_ds_win - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "win32_ds_win - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /ZI /Od /I "C:\cppapi_5_2\server" /I "C:\cppapi_5_2\client" /I "$(OMNI_BASE)\win32\include" /I "$(LOG4TANGO_BASE)\win32\include" /I "F:\tango\tools\test_system\ref\device" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_WINSTATIC" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 tangod.lib log4tangod.lib omniorb4d.lib omnidynamic4d.lib omnithreadd.lib COS4d.lib ws2_32.lib tango_static.res mswsock.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /out:"Debug/devTest.exe" /pdbtype:sept /libpath:"C:\cppapi\server\winnt_lib\tango_static\debug" /libpath:"$(OMNI_BASE)\win32\lib" /libpath:"$(LOG4TANGO_BASE)\win32\lib" - -!ENDIF - -# Begin Target - -# Name "win32_ds_win - Win32 Release" -# Name "win32_ds_win - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\classfactory.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\DevTest.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\DevTestClass.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\FileDb.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOAddAttribute.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOArray1.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOArray2.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOMisc.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOSeqVec.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOSetAttr.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOStr1.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOStr2.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOStrArray.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\IOStruct.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\main_win.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\SigThrow.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\TypeCmds.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\DevTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\DevTestClass.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOAddAttribute.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOArray1.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOArray2.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOMisc.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOSeqVec.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOSetAttr.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOStr1.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOStr2.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOStrArray.h -# End Source File -# Begin Source File - -SOURCE=..\..\IOStruct.h -# End Source File -# Begin Source File - -SOURCE=..\..\SigThrow.h -# End Source File -# Begin Source File - -SOURCE=..\..\TypeCmds.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds_win/win32_ds_win.plg b/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds_win/win32_ds_win.plg deleted file mode 100644 index a5dae26bf..000000000 --- a/cpp_test_suite/cpp_test_ds/win32_ds/win32_ds_win/win32_ds_win.plg +++ /dev/null @@ -1,387 +0,0 @@ - - -
-
Build Log

-

---------------------Configuration: win32_ds - Win32 Release--------------------
-

-
Command Lines

-Creating temporary file "C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2E3.tmp" with contents
-[
-/nologo /MT /W3 /GR /GX /O2 /I "C:\cppapi\server" /I "C:\cppapi\client" /I "C:\omniORB-4.0.5\win32\include" /I "C:\log4tango\win32\include" /I "F:\tango\tools\test_system\ref\device" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINSTATIC" /Fp"Release/win32_ds.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c 
-"F:\tango\tools\test_system\ref\device\classfactory.cpp"
-"F:\tango\tools\test_system\ref\device\DevTest.cpp"
-"F:\tango\tools\test_system\ref\device\DevTestClass.cpp"
-"F:\tango\tools\test_system\ref\device\FileDb.cpp"
-"F:\tango\tools\test_system\ref\device\IOAddAttribute.cpp"
-"F:\tango\tools\test_system\ref\device\IOArray1.cpp"
-"F:\tango\tools\test_system\ref\device\IOArray2.cpp"
-"F:\tango\tools\test_system\ref\device\IOMisc.cpp"
-"F:\tango\tools\test_system\ref\device\IOSeqVec.cpp"
-"F:\tango\tools\test_system\ref\device\IOSetAttr.cpp"
-"F:\tango\tools\test_system\ref\device\IOStr1.cpp"
-"F:\tango\tools\test_system\ref\device\IOStr2.cpp"
-"F:\tango\tools\test_system\ref\device\IOStrArray.cpp"
-"F:\tango\tools\test_system\ref\device\IOStruct.cpp"
-"F:\tango\tools\test_system\ref\device\main.cpp"
-"F:\tango\tools\test_system\ref\device\SigThrow.cpp"
-"F:\tango\tools\test_system\ref\device\TypeCmds.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2E3.tmp" 
-Creating temporary file "C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2E4.tmp" with contents
-[
-tango.lib log4tango.lib omniORB4.lib omniDynamic4.lib omnithread.lib COS4.lib comctl32.lib ws2_32.lib mswsock.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"Release/devTest.pdb" /machine:I386 /out:"Release/devTest.exe" /libpath:"C:\cppapi\server\winnt_lib\tango_static\release" /libpath:"C:\omniORB-4.0.5\win32\lib" /libpath:"C:\log4tango\win32\lib" 
-.\Release\classfactory.obj
-.\Release\DevTest.obj
-.\Release\DevTestClass.obj
-.\Release\FileDb.obj
-.\Release\IOAddAttribute.obj
-.\Release\IOArray1.obj
-.\Release\IOArray2.obj
-.\Release\IOMisc.obj
-.\Release\IOSeqVec.obj
-.\Release\IOSetAttr.obj
-.\Release\IOStr1.obj
-.\Release\IOStr2.obj
-.\Release\IOStrArray.obj
-.\Release\IOStruct.obj
-.\Release\main.obj
-.\Release\SigThrow.obj
-.\Release\TypeCmds.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2E4.tmp"
-
Output Window

-Compiling...
-classfactory.cpp
-DevTest.cpp
-DevTestClass.cpp
-FileDb.cpp
-IOAddAttribute.cpp
-IOArray1.cpp
-IOArray2.cpp
-IOMisc.cpp
-IOSeqVec.cpp
-IOSetAttr.cpp
-IOStr1.cpp
-IOStr2.cpp
-IOStrArray.cpp
-IOStruct.cpp
-main.cpp
-SigThrow.cpp
-TypeCmds.cpp
-F:\tango\tools\test_system\ref\device\SigThrow.cpp(106) : warning C4700: local variable 'out' used without having been initialized
-F:\tango\tools\test_system\ref\device\SigThrow.cpp(193) : warning C4700: local variable 'out' used without having been initialized
-Linking...
-
-
-
-
Results

-devTest.exe - 0 error(s), 2 warning(s)
-

---------------------Configuration: win32_ds - Win32 Debug--------------------
-

-
Command Lines

-Creating temporary file "C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2E6.tmp" with contents
-[
-/nologo /MTd /W3 /Gm /GR /GX /ZI /Od /I "C:\cppapi_5_2\server" /I "C:\cppapi_5_2\client" /I "C:\omniORB-4.0.5\win32\include" /I "C:\log4tango\win32\include" /I "F:\tango\tools\test_system\ref\device" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINSTATIC" /Fp"Debug/win32_ds.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"F:\tango\tools\test_system\ref\device\classfactory.cpp"
-"F:\tango\tools\test_system\ref\device\DevTest.cpp"
-"F:\tango\tools\test_system\ref\device\DevTestClass.cpp"
-"F:\tango\tools\test_system\ref\device\FileDb.cpp"
-"F:\tango\tools\test_system\ref\device\IOAddAttribute.cpp"
-"F:\tango\tools\test_system\ref\device\IOArray1.cpp"
-"F:\tango\tools\test_system\ref\device\IOArray2.cpp"
-"F:\tango\tools\test_system\ref\device\IOMisc.cpp"
-"F:\tango\tools\test_system\ref\device\IOSeqVec.cpp"
-"F:\tango\tools\test_system\ref\device\IOSetAttr.cpp"
-"F:\tango\tools\test_system\ref\device\IOStr1.cpp"
-"F:\tango\tools\test_system\ref\device\IOStr2.cpp"
-"F:\tango\tools\test_system\ref\device\IOStrArray.cpp"
-"F:\tango\tools\test_system\ref\device\IOStruct.cpp"
-"F:\tango\tools\test_system\ref\device\main.cpp"
-"F:\tango\tools\test_system\ref\device\SigThrow.cpp"
-"F:\tango\tools\test_system\ref\device\TypeCmds.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2E6.tmp" 
-Creating temporary file "C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2E7.tmp" with contents
-[
-tangod.lib log4tangod.lib omniORB4d.lib omniDynamic4d.lib omnithreadd.lib COS4d.lib comctl32.lib ws2_32.lib mswsock.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/devTest.pdb" /debug /machine:I386 /out:"Debug/devTest.exe" /pdbtype:sept /libpath:"C:\cppapi\server\winnt_lib\tango_static\debug" /libpath:"C:\omniORB-4.0.5\win32\lib" /libpath:"C:\log4tango\win32\lib" 
-.\Debug\classfactory.obj
-.\Debug\DevTest.obj
-.\Debug\DevTestClass.obj
-.\Debug\FileDb.obj
-.\Debug\IOAddAttribute.obj
-.\Debug\IOArray1.obj
-.\Debug\IOArray2.obj
-.\Debug\IOMisc.obj
-.\Debug\IOSeqVec.obj
-.\Debug\IOSetAttr.obj
-.\Debug\IOStr1.obj
-.\Debug\IOStr2.obj
-.\Debug\IOStrArray.obj
-.\Debug\IOStruct.obj
-.\Debug\main.obj
-.\Debug\SigThrow.obj
-.\Debug\TypeCmds.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2E7.tmp"
-
Output Window

-Compiling...
-classfactory.cpp
-DevTest.cpp
-DevTestClass.cpp
-FileDb.cpp
-IOAddAttribute.cpp
-IOArray1.cpp
-IOArray2.cpp
-IOMisc.cpp
-IOSeqVec.cpp
-IOSetAttr.cpp
-IOStr1.cpp
-IOStr2.cpp
-IOStrArray.cpp
-IOStruct.cpp
-main.cpp
-SigThrow.cpp
-TypeCmds.cpp
-F:\tango\tools\test_system\ref\device\SigThrow.cpp(55) : warning C4700: local variable 'out' used without having been initialized
-F:\tango\tools\test_system\ref\device\SigThrow.cpp(106) : warning C4700: local variable 'out' used without having been initialized
-F:\tango\tools\test_system\ref\device\SigThrow.cpp(193) : warning C4700: local variable 'out' used without having been initialized
-Linking...
-
-
-
-
Results

-devTest.exe - 0 error(s), 3 warning(s)
-

---------------------Configuration: win32_ds_dll - Win32 Release--------------------
-

-
Command Lines

-Creating temporary file "C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2E9.tmp" with contents
-[
-/nologo /MD /W3 /GR /GX /O2 /I "C:\cppapi_5_2\server" /I "C:\cppapi_5_2\client" /I "C:\omniORB-4.0.5\win32_dll\include" /I "C:\log4tango\win32_dll\include" /I "F:\tango\tools\test_system\ref\device" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "LOG4TANGO_HAS_DLL" /D "TANGO_HAS_DLL" /Fp"Release/win32_ds_dll.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c 
-"F:\tango\tools\test_system\ref\device\classfactory.cpp"
-"F:\tango\tools\test_system\ref\device\DevTest.cpp"
-"F:\tango\tools\test_system\ref\device\DevTestClass.cpp"
-"F:\tango\tools\test_system\ref\device\FileDb.cpp"
-"F:\tango\tools\test_system\ref\device\IOAddAttribute.cpp"
-"F:\tango\tools\test_system\ref\device\IOArray1.cpp"
-"F:\tango\tools\test_system\ref\device\IOArray2.cpp"
-"F:\tango\tools\test_system\ref\device\IOMisc.cpp"
-"F:\tango\tools\test_system\ref\device\IOSeqVec.cpp"
-"F:\tango\tools\test_system\ref\device\IOSetAttr.cpp"
-"F:\tango\tools\test_system\ref\device\IOStr1.cpp"
-"F:\tango\tools\test_system\ref\device\IOStr2.cpp"
-"F:\tango\tools\test_system\ref\device\IOStrArray.cpp"
-"F:\tango\tools\test_system\ref\device\IOStruct.cpp"
-"F:\tango\tools\test_system\ref\device\main.cpp"
-"F:\tango\tools\test_system\ref\device\SigThrow.cpp"
-"F:\tango\tools\test_system\ref\device\TypeCmds.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2E9.tmp" 
-Creating temporary file "C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2EA.tmp" with contents
-[
-tango.lib log4tango.lib omniORB405_rt.lib omniDynamic405_rt.lib omnithread30_rt.lib COS405_rt.lib comctl32.lib ws2_32.lib mswsock.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"Release/devTest.pdb" /machine:I386 /out:"Release/devTest.exe" /libpath:"C:\cppapi\server\winnt_lib\tango_dll\release" /libpath:"C:\omniORB-4.0.5\win32_dll\lib" /libpath:"C:\log4tango\win32_dll\lib" 
-.\Release\classfactory.obj
-.\Release\DevTest.obj
-.\Release\DevTestClass.obj
-.\Release\FileDb.obj
-.\Release\IOAddAttribute.obj
-.\Release\IOArray1.obj
-.\Release\IOArray2.obj
-.\Release\IOMisc.obj
-.\Release\IOSeqVec.obj
-.\Release\IOSetAttr.obj
-.\Release\IOStr1.obj
-.\Release\IOStr2.obj
-.\Release\IOStrArray.obj
-.\Release\IOStruct.obj
-.\Release\main.obj
-.\Release\SigThrow.obj
-.\Release\TypeCmds.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2EA.tmp"
-
Output Window

-Compiling...
-classfactory.cpp
-DevTest.cpp
-DevTestClass.cpp
-FileDb.cpp
-IOAddAttribute.cpp
-IOArray1.cpp
-IOArray2.cpp
-IOMisc.cpp
-IOSeqVec.cpp
-IOSetAttr.cpp
-IOStr1.cpp
-IOStr2.cpp
-IOStrArray.cpp
-IOStruct.cpp
-main.cpp
-SigThrow.cpp
-TypeCmds.cpp
-F:\tango\tools\test_system\ref\device\SigThrow.cpp(106) : warning C4700: local variable 'out' used without having been initialized
-F:\tango\tools\test_system\ref\device\SigThrow.cpp(193) : warning C4700: local variable 'out' used without having been initialized
-Linking...
-   Creating library Release/devTest.lib and object Release/devTest.exp
-
-
-
-
Results

-devTest.exe - 0 error(s), 2 warning(s)
-

---------------------Configuration: win32_ds_dll - Win32 Debug--------------------
-

-
Command Lines

-Creating temporary file "C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2EE.tmp" with contents
-[
-/nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "C:\cppapi_5_2\server" /I "C:\cppapi_5_2\client" /I "C:\omniORB-4.0.5\win32_dll\include" /I "C:\log4tango\win32_dll\include" /I "F:\tango\tools\test_system\ref\device" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "LOG4TANGO_HAS_DLL" /D "TANGO_HAS_DLL" /Fp"Debug/win32_ds_dll.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"F:\tango\tools\test_system\ref\device\classfactory.cpp"
-"F:\tango\tools\test_system\ref\device\DevTest.cpp"
-"F:\tango\tools\test_system\ref\device\DevTestClass.cpp"
-"F:\tango\tools\test_system\ref\device\FileDb.cpp"
-"F:\tango\tools\test_system\ref\device\IOAddAttribute.cpp"
-"F:\tango\tools\test_system\ref\device\IOArray1.cpp"
-"F:\tango\tools\test_system\ref\device\IOArray2.cpp"
-"F:\tango\tools\test_system\ref\device\IOMisc.cpp"
-"F:\tango\tools\test_system\ref\device\IOSeqVec.cpp"
-"F:\tango\tools\test_system\ref\device\IOSetAttr.cpp"
-"F:\tango\tools\test_system\ref\device\IOStr1.cpp"
-"F:\tango\tools\test_system\ref\device\IOStr2.cpp"
-"F:\tango\tools\test_system\ref\device\IOStrArray.cpp"
-"F:\tango\tools\test_system\ref\device\IOStruct.cpp"
-"F:\tango\tools\test_system\ref\device\main.cpp"
-"F:\tango\tools\test_system\ref\device\SigThrow.cpp"
-"F:\tango\tools\test_system\ref\device\TypeCmds.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2EE.tmp" 
-Creating temporary file "C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2EF.tmp" with contents
-[
-tangod.lib log4tangod.lib omniORB405_rtd.lib omniDynamic405_rtd.lib omnithread30_rtd.lib COS405_rtd.lib comctl32.lib ws2_32.lib mswsock.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/devTest.pdb" /debug /machine:I386 /out:"Debug/devTest.exe" /pdbtype:sept /libpath:"C:\cppapi\server\winnt_lib\tango_dll\debug" /libpath:"C:\omniORB-4.0.5\win32_dll\lib" /libpath:"C:\log4tango\win32_dll\lib" 
-.\Debug\classfactory.obj
-.\Debug\DevTest.obj
-.\Debug\DevTestClass.obj
-.\Debug\FileDb.obj
-.\Debug\IOAddAttribute.obj
-.\Debug\IOArray1.obj
-.\Debug\IOArray2.obj
-.\Debug\IOMisc.obj
-.\Debug\IOSeqVec.obj
-.\Debug\IOSetAttr.obj
-.\Debug\IOStr1.obj
-.\Debug\IOStr2.obj
-.\Debug\IOStrArray.obj
-.\Debug\IOStruct.obj
-.\Debug\main.obj
-.\Debug\SigThrow.obj
-.\Debug\TypeCmds.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2EF.tmp"
-
Output Window

-Compiling...
-classfactory.cpp
-DevTest.cpp
-DevTestClass.cpp
-FileDb.cpp
-IOAddAttribute.cpp
-IOArray1.cpp
-IOArray2.cpp
-IOMisc.cpp
-IOSeqVec.cpp
-IOSetAttr.cpp
-IOStr1.cpp
-IOStr2.cpp
-IOStrArray.cpp
-IOStruct.cpp
-main.cpp
-SigThrow.cpp
-TypeCmds.cpp
-F:\tango\tools\test_system\ref\device\SigThrow.cpp(55) : warning C4700: local variable 'out' used without having been initialized
-F:\tango\tools\test_system\ref\device\SigThrow.cpp(106) : warning C4700: local variable 'out' used without having been initialized
-F:\tango\tools\test_system\ref\device\SigThrow.cpp(193) : warning C4700: local variable 'out' used without having been initialized
-Linking...
-   Creating library Debug/devTest.lib and object Debug/devTest.exp
-
-
-
-
Results

-devTest.exe - 0 error(s), 3 warning(s)
-

---------------------Configuration: win32_ds_win - Win32 Debug--------------------
-

-
Command Lines

-Creating temporary file "C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2F3.tmp" with contents
-[
-/nologo /MTd /W3 /Gm /GR /GX /ZI /Od /I "C:\cppapi_5_2\server" /I "C:\cppapi_5_2\client" /I "C:\omniORB-4.0.5\win32\include" /I "C:\log4tango\win32\include" /I "F:\tango\tools\test_system\ref\device" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_WINSTATIC" /Fp"Debug/win32_ds_win.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"F:\tango\tools\test_system\ref\device\classfactory.cpp"
-"F:\tango\tools\test_system\ref\device\DevTest.cpp"
-"F:\tango\tools\test_system\ref\device\DevTestClass.cpp"
-"F:\tango\tools\test_system\ref\device\FileDb.cpp"
-"F:\tango\tools\test_system\ref\device\IOAddAttribute.cpp"
-"F:\tango\tools\test_system\ref\device\IOArray1.cpp"
-"F:\tango\tools\test_system\ref\device\IOArray2.cpp"
-"F:\tango\tools\test_system\ref\device\IOMisc.cpp"
-"F:\tango\tools\test_system\ref\device\IOSeqVec.cpp"
-"F:\tango\tools\test_system\ref\device\IOSetAttr.cpp"
-"F:\tango\tools\test_system\ref\device\IOStr1.cpp"
-"F:\tango\tools\test_system\ref\device\IOStr2.cpp"
-"F:\tango\tools\test_system\ref\device\IOStrArray.cpp"
-"F:\tango\tools\test_system\ref\device\IOStruct.cpp"
-"F:\tango\tools\test_system\ref\device\main_win.cpp"
-"F:\tango\tools\test_system\ref\device\SigThrow.cpp"
-"F:\tango\tools\test_system\ref\device\TypeCmds.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2F3.tmp" 
-Creating temporary file "C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2F4.tmp" with contents
-[
-tangod.lib log4tangod.lib omniorb4d.lib omnidynamic4d.lib omnithreadd.lib COS4d.lib ws2_32.lib tango_static.res mswsock.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/devTest.pdb" /debug /machine:I386 /out:"Debug/devTest.exe" /pdbtype:sept /libpath:"C:\cppapi\server\winnt_lib\tango_static\debug" /libpath:"C:\omniORB-4.0.5\win32\lib" /libpath:"C:\log4tango\win32\lib" 
-.\Debug\classfactory.obj
-.\Debug\DevTest.obj
-.\Debug\DevTestClass.obj
-.\Debug\FileDb.obj
-.\Debug\IOAddAttribute.obj
-.\Debug\IOArray1.obj
-.\Debug\IOArray2.obj
-.\Debug\IOMisc.obj
-.\Debug\IOSeqVec.obj
-.\Debug\IOSetAttr.obj
-.\Debug\IOStr1.obj
-.\Debug\IOStr2.obj
-.\Debug\IOStrArray.obj
-.\Debug\IOStruct.obj
-.\Debug\main_win.obj
-.\Debug\SigThrow.obj
-.\Debug\TypeCmds.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\taurel.GEN\LOCALS~1\Temp\RSP2F4.tmp"
-
Output Window

-Compiling...
-classfactory.cpp
-DevTest.cpp
-DevTestClass.cpp
-FileDb.cpp
-IOAddAttribute.cpp
-IOArray1.cpp
-IOArray2.cpp
-IOMisc.cpp
-IOSeqVec.cpp
-IOSetAttr.cpp
-IOStr1.cpp
-IOStr2.cpp
-IOStrArray.cpp
-IOStruct.cpp
-main_win.cpp
-SigThrow.cpp
-TypeCmds.cpp
-F:\tango\tools\test_system\ref\device\SigThrow.cpp(55) : warning C4700: local variable 'out' used without having been initialized
-F:\tango\tools\test_system\ref\device\SigThrow.cpp(106) : warning C4700: local variable 'out' used without having been initialized
-F:\tango\tools\test_system\ref\device\SigThrow.cpp(193) : warning C4700: local variable 'out' used without having been initialized
-Linking...
-
-
-
-
Results

-devTest.exe - 0 error(s), 3 warning(s)
-
- - diff --git a/cpp_test_suite/cpp_test_ds/win32_ds_vs9/WIN32_DS.sln b/cpp_test_suite/cpp_test_ds/win32_ds_vs9/WIN32_DS.sln deleted file mode 100644 index 2c51ac7b5..000000000 --- a/cpp_test_suite/cpp_test_ds/win32_ds_vs9/WIN32_DS.sln +++ /dev/null @@ -1,44 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32_ds_static", "win32_ds.vcproj", "{19FA8AFF-C805-4D18-8A62-DD623D383C51}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32_ds_dll", "win32_ds_dll\win32_ds_dll.vcproj", "{A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32_ds_win", "win32_ds_win\win32_ds_win.vcproj", "{B5E926E7-E990-427A-BBCC-E5F37687BEC6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fwd_ds_static", "fwd_ds_static\fwd_ds_static.vcproj", "{BF76C646-4ED6-4043-B0C4-1F9E3A83439F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fwd_ds_dll", "fwd_ds_dll\fwd_ds_dll.vcproj", "{E4BBDB3D-BBF8-448E-96F5-21FCFA0EE52B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Debug|Win32.ActiveCfg = Debug|Win32 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Debug|Win32.Build.0 = Debug|Win32 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Release|Win32.ActiveCfg = Release|Win32 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Release|Win32.Build.0 = Release|Win32 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Debug|Win32.ActiveCfg = Debug|Win32 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Debug|Win32.Build.0 = Debug|Win32 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Release|Win32.ActiveCfg = Release|Win32 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Release|Win32.Build.0 = Release|Win32 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Debug|Win32.ActiveCfg = Debug|Win32 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Debug|Win32.Build.0 = Debug|Win32 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Release|Win32.ActiveCfg = Release|Win32 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Release|Win32.Build.0 = Release|Win32 - {BF76C646-4ED6-4043-B0C4-1F9E3A83439F}.Debug|Win32.ActiveCfg = Debug|Win32 - {BF76C646-4ED6-4043-B0C4-1F9E3A83439F}.Debug|Win32.Build.0 = Debug|Win32 - {BF76C646-4ED6-4043-B0C4-1F9E3A83439F}.Release|Win32.ActiveCfg = Release|Win32 - {BF76C646-4ED6-4043-B0C4-1F9E3A83439F}.Release|Win32.Build.0 = Release|Win32 - {E4BBDB3D-BBF8-448E-96F5-21FCFA0EE52B}.Debug|Win32.ActiveCfg = Debug|Win32 - {E4BBDB3D-BBF8-448E-96F5-21FCFA0EE52B}.Debug|Win32.Build.0 = Debug|Win32 - {E4BBDB3D-BBF8-448E-96F5-21FCFA0EE52B}.Release|Win32.ActiveCfg = Release|Win32 - {E4BBDB3D-BBF8-448E-96F5-21FCFA0EE52B}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/cpp_test_suite/cpp_test_ds/win32_ds_vs9/fwd_ds_dll/fwd_ds_dll.vcproj b/cpp_test_suite/cpp_test_ds/win32_ds_vs9/fwd_ds_dll/fwd_ds_dll.vcproj deleted file mode 100644 index ebf3de92f..000000000 --- a/cpp_test_suite/cpp_test_ds/win32_ds_vs9/fwd_ds_dll/fwd_ds_dll.vcproj +++ /dev/null @@ -1,222 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/cpp_test_ds/win32_ds_vs9/fwd_ds_static/fwd_ds_static.vcproj b/cpp_test_suite/cpp_test_ds/win32_ds_vs9/fwd_ds_static/fwd_ds_static.vcproj deleted file mode 100644 index 496120c43..000000000 --- a/cpp_test_suite/cpp_test_ds/win32_ds_vs9/fwd_ds_static/fwd_ds_static.vcproj +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/cpp_test_ds/win32_ds_vs9/win32_ds.vcproj b/cpp_test_suite/cpp_test_ds/win32_ds_vs9/win32_ds.vcproj deleted file mode 100644 index 04c04a1d1..000000000 --- a/cpp_test_suite/cpp_test_ds/win32_ds_vs9/win32_ds.vcproj +++ /dev/null @@ -1,657 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/cpp_test_ds/win32_ds_vs9/win32_ds_dll/win32_ds_dll.vcproj b/cpp_test_suite/cpp_test_ds/win32_ds_vs9/win32_ds_dll/win32_ds_dll.vcproj deleted file mode 100644 index 968250f1b..000000000 --- a/cpp_test_suite/cpp_test_ds/win32_ds_vs9/win32_ds_dll/win32_ds_dll.vcproj +++ /dev/null @@ -1,654 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/cpp_test_ds/win32_ds_vs9/win32_ds_win/win32_ds_win.vcproj b/cpp_test_suite/cpp_test_ds/win32_ds_vs9/win32_ds_win/win32_ds_win.vcproj deleted file mode 100644 index 2317327f7..000000000 --- a/cpp_test_suite/cpp_test_ds/win32_ds_vs9/win32_ds_win/win32_ds_win.vcproj +++ /dev/null @@ -1,644 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/cpp_test_ds/win64_ds_vc10/WIN32_DS.sln b/cpp_test_suite/cpp_test_ds/win64_ds_vc10/WIN32_DS.sln deleted file mode 100644 index c70f7d734..000000000 --- a/cpp_test_suite/cpp_test_ds/win64_ds_vc10/WIN32_DS.sln +++ /dev/null @@ -1,64 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32_ds_static", "win64_ds.vcxproj", "{19FA8AFF-C805-4D18-8A62-DD623D383C51}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32_ds_dll", "win64_ds_dll\win64_ds_dll.vcxproj", "{A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32_ds_win", "win64_ds_win\win64_ds_win.vcxproj", "{B5E926E7-E990-427A-BBCC-E5F37687BEC6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fwd_ds_static", "fwd_ds_static\fwd_ds_static.vcxproj", "{CD071605-5F70-49FB-8B4B-04BA4D389C0E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fwd_ds_dll", "fwd_ds_dll\fwd_ds_dll.vcxproj", "{50016779-0B5B-40A5-AB76-986224DC537A}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Debug|Win32.ActiveCfg = Debug|Win32 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Debug|Win32.Build.0 = Debug|Win32 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Debug|x64.ActiveCfg = Debug|x64 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Debug|x64.Build.0 = Debug|x64 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Release|Win32.ActiveCfg = Release|Win32 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Release|Win32.Build.0 = Release|Win32 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Release|x64.ActiveCfg = Release|x64 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Release|x64.Build.0 = Release|x64 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Debug|Win32.ActiveCfg = Debug|Win32 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Debug|Win32.Build.0 = Debug|Win32 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Debug|x64.ActiveCfg = Debug|x64 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Debug|x64.Build.0 = Debug|x64 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Release|Win32.ActiveCfg = Release|Win32 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Release|Win32.Build.0 = Release|Win32 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Release|x64.ActiveCfg = Release|x64 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Release|x64.Build.0 = Release|x64 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Debug|Win32.ActiveCfg = Debug|Win32 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Debug|Win32.Build.0 = Debug|Win32 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Debug|x64.ActiveCfg = Debug|x64 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Debug|x64.Build.0 = Debug|x64 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Release|Win32.ActiveCfg = Release|Win32 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Release|Win32.Build.0 = Release|Win32 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Release|x64.ActiveCfg = Release|x64 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Release|x64.Build.0 = Release|x64 - {CD071605-5F70-49FB-8B4B-04BA4D389C0E}.Debug|Win32.ActiveCfg = Debug|Win32 - {CD071605-5F70-49FB-8B4B-04BA4D389C0E}.Debug|Win32.Build.0 = Debug|Win32 - {CD071605-5F70-49FB-8B4B-04BA4D389C0E}.Debug|x64.ActiveCfg = Debug|x64 - {CD071605-5F70-49FB-8B4B-04BA4D389C0E}.Debug|x64.Build.0 = Debug|x64 - {CD071605-5F70-49FB-8B4B-04BA4D389C0E}.Release|Win32.ActiveCfg = Release|Win32 - {CD071605-5F70-49FB-8B4B-04BA4D389C0E}.Release|Win32.Build.0 = Release|Win32 - {CD071605-5F70-49FB-8B4B-04BA4D389C0E}.Release|x64.ActiveCfg = Release|Win32 - {50016779-0B5B-40A5-AB76-986224DC537A}.Debug|Win32.ActiveCfg = Debug|Win32 - {50016779-0B5B-40A5-AB76-986224DC537A}.Debug|Win32.Build.0 = Debug|Win32 - {50016779-0B5B-40A5-AB76-986224DC537A}.Debug|x64.ActiveCfg = Debug|x64 - {50016779-0B5B-40A5-AB76-986224DC537A}.Debug|x64.Build.0 = Debug|x64 - {50016779-0B5B-40A5-AB76-986224DC537A}.Release|Win32.ActiveCfg = Release|Win32 - {50016779-0B5B-40A5-AB76-986224DC537A}.Release|Win32.Build.0 = Release|Win32 - {50016779-0B5B-40A5-AB76-986224DC537A}.Release|x64.ActiveCfg = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/cpp_test_suite/cpp_test_ds/win64_ds_vc10/fwd_ds_dll/fwd_ds_dll.vcxproj b/cpp_test_suite/cpp_test_ds/win64_ds_vc10/fwd_ds_dll/fwd_ds_dll.vcxproj deleted file mode 100644 index 12dffddaf..000000000 --- a/cpp_test_suite/cpp_test_ds/win64_ds_vc10/fwd_ds_dll/fwd_ds_dll.vcxproj +++ /dev/null @@ -1,146 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {50016779-0B5B-40A5-AB76-986224DC537A} - fwd_ds_dll - - - - Application - true - MultiByte - Windows7.1SDK - - - Application - true - MultiByte - Windows7.1SDK - - - Application - false - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - - - - - - - .\Debug\ - - - .\Debug\ - - - .\Debug\ - - - .\Debug\ - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Lib\x64;$(LibraryPath) - true - false - - - - Level3 - Disabled - - - true - - - - - Level3 - Disabled - ..\..;C:\tango_src\cpp_test_ds\fwd_ds;$(PREFIX)\win64\include;$(OMNI_BASE)\include\vc10;$(ZMQ_BASE)\win64\include\vc10;$(LOG4TANGO_BASE)\win64\include\vc10;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL;%(PreprocessorDefinitions) - - - true - $(PREFIX)\win64\bin\shared\FwdTest.exe - $(PREFIX)\win64\lib\vc10_dll;$(OMNI_BASE)\lib\vc10_dll;$(LOG4TANGO_BASE)\win64\lib\vc10_dll;$(ZMQ_BASE)\win64\lib\vc10_dll;%(AdditionalLibraryDirectories) - tangod.lib;log4tangod.lib;omniORB421_rtd.lib;omniDynamic421_rtd.lib;omnithread40_rtd.lib;COS421_rtd.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - Console - - - - - Level3 - MaxSpeed - true - true - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - - - true - true - true - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/cpp_test_ds/win64_ds_vc10/fwd_ds_static/fwd_ds_static.vcxproj b/cpp_test_suite/cpp_test_ds/win64_ds_vc10/fwd_ds_static/fwd_ds_static.vcxproj deleted file mode 100644 index 89b5f987a..000000000 --- a/cpp_test_suite/cpp_test_ds/win64_ds_vc10/fwd_ds_static/fwd_ds_static.vcxproj +++ /dev/null @@ -1,142 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {CD071605-5F70-49FB-8B4B-04BA4D389C0E} - fwd_ds_static - - - - Application - true - MultiByte - Windows7.1SDK - - - Application - true - MultiByte - Windows7.1SDK - - - Application - false - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - - - - - - - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Lib\x64;$(LibraryPath) - true - false - .\Debug\ - .\Debug\ - - - - Level3 - Disabled - - - true - - - - - Level3 - Disabled - MultiThreadedDebug - $(PREFIX)/win64/include;..;C:\tango_src\cpp_test_ds\fwd_ds;$(OMNI_BASE)\include\vc10;$(ZMQ_BASE)\win64\include\vc10;$(LOG4TANGO_BASE)\win64\include\vc10;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_WINSTATIC;%(PreprocessorDefinitions) - true - - - true - $(PREFIX)/win64/bin/archive/FwdTest.exe - $(PREFIX)\win64\lib\vc10;$(OMNI_BASE)\lib\vc10;$(ZMQ_BASE)\win64\lib\vc10;$(LOG4TANGO_BASE)\win64\lib\vc10;%(AdditionalLibraryDirectories) - tangod.lib;log4tangod.lib;omniORB4d.lib;omniDynamic4d.lib;omnithreadd.lib;COS4d.lib;zmqd.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - .\Debug/FwdTest.pdb - Console - NotSet - - - - - Level3 - MaxSpeed - true - true - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - - - true - true - true - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/cpp_test_ds/win64_ds_vc10/win64_ds.vcxproj b/cpp_test_suite/cpp_test_ds/win64_ds_vc10/win64_ds.vcxproj deleted file mode 100644 index 6f49b25f2..000000000 --- a/cpp_test_suite/cpp_test_ds/win64_ds_vc10/win64_ds.vcxproj +++ /dev/null @@ -1,452 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - win32_ds_static - {19FA8AFF-C805-4D18-8A62-DD623D383C51} - win32_ds_static - - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Debug\ - .\Debug\ - .\Debug\ - .\Debug\ - true - true - .\Release\ - .\Release\ - .\Release\ - .\Release\ - false - false - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Lib\x64;$(LibraryPath) - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Bin;$(ExecutablePath) - false - - - - .\Debug/win32_ds.tlb - - - - - Disabled - $(PREFIX)/win32/include;..;$(OMNI_BASE)\win32\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_WINSTATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - .\Debug/win32_ds.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - tangod.lib;log4tangod.lib;omniORB4d.lib;omniDynamic4d.lib;omnithreadd.lib;COS4d.lib;zmqd.lib;Rpcrt4.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)/win32/bin/archive/devTest.exe - true - $(PREFIX)\win32\lib\vc9;$(OMNI_BASE)\win32\lib;$(ZMQ_BASE)\win32\lib\vc9;$(LOG4TANGO_BASE)\win32\lib;%(AdditionalLibraryDirectories) - true - .\Debug/devTest.pdb - Console - false - - - MachineX86 - - - true - .\Debug/win32_ds.bsc - - - - - .\Debug/win32_ds.tlb - - - - - Disabled - $(PREFIX)/win64/include;..;$(OMNI_BASE)\include\vc10;$(ZMQ_BASE)\win64\include\vc10;$(LOG4TANGO_BASE)\win64\include\vc10;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_WINSTATIC;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - .\Debug/win32_ds.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - ProgramDatabase - /MP8 %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - tangod.lib;log4tangod.lib;omniORB4d.lib;omniDynamic4d.lib;omnithreadd.lib;COS4d.lib;zmqd.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)/win64/bin/archive/devTest.exe - true - $(PREFIX)\win64\lib\vc10;$(OMNI_BASE)\lib\vc10;$(ZMQ_BASE)\win64\lib\vc10;$(LOG4TANGO_BASE)\win64\lib\vc10;%(AdditionalLibraryDirectories) - true - .\Debug/devTest.pdb - Console - false - - - NotSet - - - true - .\Debug/win32_ds.bsc - - - - - .\Release/win32_ds.tlb - - - - - MaxSpeed - OnlyExplicitInline - $(OMNI_BASE)\win32\include;$(LOG4TANGO_BASE)\win32\include;C:\tango_src\cppapi_7_0\client;C:\tango_src\cppapi_7_0\server;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_WINSTATIC;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - .\Release/win32_ds.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - tango.lib;log4tango.lib;omniORB4.lib;omniDynamic4.lib;omnithread.lib;COS4.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - Release/devTest.exe - true - C:\tango_src\cppapi_7_0\win32\tango_vc9\tango_static\lib;$(OMNI_BASE)\win32\lib;$(LOG4TANGO_BASE)\win32\lib;%(AdditionalLibraryDirectories) - .\Release/devTest.pdb - Console - false - - - MachineX86 - - - true - .\Release/win32_ds.bsc - - - - - .\Release/win32_ds.tlb - - - - - MaxSpeed - OnlyExplicitInline - $(PREFIX)/win64/include;..;$(OMNI_BASE)\include\vc10;$(ZMQ_BASE)\win64\include\vc10;$(LOG4TANGO_BASE)\win64\include\vc10;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_WINSTATIC;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - .\Release/win32_ds.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - tango.lib;log4tango.lib;omniORB4.lib;omniDynamic4.lib;omnithread.lib;COS4.lib;zmq.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - Release/devTest.exe - true - $(PREFIX)\win64\lib\vc10;$(OMNI_BASE)\lib\vc10;$(ZMQ_BASE)\win64\lib\vc10;$(LOG4TANGO_BASE)\win64\lib\vc10;%(AdditionalLibraryDirectories) - .\Release/devTest.pdb - Console - false - - - - - true - .\Release/win32_ds.bsc - - - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/cpp_test_ds/win64_ds_vc10/win64_ds_dll/win64_ds_dll.vcxproj b/cpp_test_suite/cpp_test_ds/win64_ds_vc10/win64_ds_dll/win64_ds_dll.vcxproj deleted file mode 100644 index 5169cd0a8..000000000 --- a/cpp_test_suite/cpp_test_ds/win64_ds_vc10/win64_ds_dll/win64_ds_dll.vcxproj +++ /dev/null @@ -1,457 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - win32_ds_dll - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD} - - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Release\ - .\Release\ - .\Release\ - .\Release\ - false - false - .\Debug\ - .\Debug\ - .\Debug\ - .\Debug\ - true - true - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Bin;$(ExecutablePath) - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Lib\x64;$(LibraryPath) - true - - - - .\Release/win32_ds_dll.tlb - - - - - MaxSpeed - OnlyExplicitInline - C:\cppapi_5_2\server;C:\cppapi_5_2\client;$(OMNI_BASE)\win32_dll\include;$(LOG4TANGO_BASE)\win32_dll\include;F:\tango\tools\test_system\ref\device;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - .\Release/win32_ds_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x040c - - - tango.lib;log4tango.lib;omniORB416_rt.lib;omniDynamic416_rt.lib;omnithread34_rt.lib;COS416_rt.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - Release/devTest.exe - true - C:\cppapi\server\winnt_lib\tango_dll\release;$(OMNI_BASE)\win32_dll\lib;$(LOG4TANGO_BASE)\win32_dll\lib;%(AdditionalLibraryDirectories) - .\Release/devTest.pdb - Console - false - - - MachineX86 - - - true - .\Release/win32_ds_dll.bsc - - - - - .\Release/win32_ds_dll.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..;$(PREFIX)\win64\include;$(OMNI_BASE)\include\vc10;$(ZMQ_BASE)\win64\include\vc10;$(LOG4TANGO_BASE)\win64\include\vc10;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - .\Release/win32_ds_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x040c - - - tango.lib;log4tango.lib;omniORB420_rt.lib;omniDynamic420_rt.lib;omnithread40_rt.lib;COS420_rt.lib;zmq.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - Release/devTest.exe - true - $(PREFIX)\win64\lib\vc10_dll;$(OMNI_BASE)\lib\vc10_dll;$(LOG4TANGO_BASE)\win64\lib\vc10_dll;$(ZMQ_BASE)\win64\lib\vc10_dll;%(AdditionalLibraryDirectories) - .\Release/devTest.pdb - Console - false - - - - - true - .\Release/win32_ds_dll.bsc - - - true - - - - - .\Debug/win32_ds_dll.tlb - - - - - Disabled - ..\..;$(PREFIX)\win32\include;$(OMNI_BASE)\win32_dll\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32_dll\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - .\Debug/win32_ds_dll.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x040c - - - tangod.lib;log4tangod.lib;omniORB416_rtd.lib;omniDynamic416_rtd.lib;omnithread34_rtd.lib;COS416_rtd.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win32\bin\shared\devTest.exe - true - $(PREFIX)\win32\lib\vc9_dll;$(OMNI_BASE)\win32_dll\lib;$(LOG4TANGO_BASE)\win32_dll\lib;%(AdditionalLibraryDirectories) - true - .\Debug/devTest.pdb - Console - false - - - MachineX86 - - - true - .\Debug/win32_ds_dll.bsc - - - - - .\Debug/win32_ds_dll.tlb - - - - - Disabled - ..\..;$(PREFIX)\win64\include;$(OMNI_BASE)\include\vc10;$(ZMQ_BASE)\win64\include\vc10;$(LOG4TANGO_BASE)\win64\include\vc10;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - .\Debug/win32_ds_dll.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level2 - true - ProgramDatabase - /MP8 %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x040c - - - tangod.lib;log4tangod.lib;omniORB421_rtd.lib;omniDynamic421_rtd.lib;omnithread40_rtd.lib;COS421_rtd.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win64\bin\shared\devTest.exe - true - $(PREFIX)\win64\lib\vc10_dll;$(OMNI_BASE)\lib\vc10_dll;$(LOG4TANGO_BASE)\win64\lib\vc10_dll;$(ZMQ_BASE)\win64\lib\vc10_dll;%(AdditionalLibraryDirectories) - true - .\Debug/devTest.pdb - Console - false - - - - - true - .\Debug/win32_ds_dll.bsc - - - false - false - - - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/cpp_test_ds/win64_ds_vc10/win64_ds_win/win64_ds_win.vcxproj b/cpp_test_suite/cpp_test_ds/win64_ds_vc10/win64_ds_win/win64_ds_win.vcxproj deleted file mode 100644 index 97be12e58..000000000 --- a/cpp_test_suite/cpp_test_ds/win64_ds_vc10/win64_ds_win/win64_ds_win.vcxproj +++ /dev/null @@ -1,421 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - win32_ds_win - {B5E926E7-E990-427A-BBCC-E5F37687BEC6} - - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Release\ - .\Release\ - .\Release\ - .\Release\ - false - false - .\Debug\ - .\Debug\ - .\Debug\ - .\Debug\ - true - true - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Lib\x64;$(LibraryPath) - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Bin;$(ExecutablePath) - false - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/win32_ds_win.tlb - - - - - MaxSpeed - OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/win32_ds_win.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - .\Release/win32_ds_win.exe - true - .\Release/win32_ds_win.pdb - Windows - false - - - MachineX86 - - - true - .\Release/win32_ds_win.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/win32_ds_win.tlb - - - - - MaxSpeed - OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/win32_ds_win.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - .\Release/win32_ds_win.exe - true - .\Release/win32_ds_win.pdb - Windows - false - - - - - true - .\Release/win32_ds_win.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/win32_ds_win.tlb - - - - - Disabled - ..\..;$(PREFIX)\win32\include;$(OMNI_BASE)\win32\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_WINSTATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - .\Debug/win32_ds_win.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - tangod.lib;log4tangod.lib;omniorb4d.lib;omnidynamic4d.lib;omnithreadd.lib;COS4d.lib;zmqd.lib;ws2_32.lib;Rpcrt4.lib;tango.res;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win32\bin\archive_win\devTest.exe - true - $(OMNI_BASE)\win32\lib;$(PREFIX)\win32\lib\vc9;$(ZMQ_BASE)\win32\lib\vc9;$(LOG4TANGO_BASE)\win32\lib;C:\tango_src\cppapi_7_2_6\win32\resources;%(AdditionalLibraryDirectories) - true - .\Debug/devTest.pdb - Windows - false - - - MachineX86 - - - true - .\Debug/win32_ds_win.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/win32_ds_win.tlb - - - - - Disabled - ..\..;$(PREFIX)\win64\include;$(OMNI_BASE)\include\vc10;$(ZMQ_BASE)\win64\include\vc10;$(LOG4TANGO_BASE)\win64\include\vc10;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_WINSTATIC;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - .\Debug/win32_ds_win.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level2 - true - ProgramDatabase - /MP8 %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - tangod.lib;log4tangod.lib;omniorb4d.lib;omnidynamic4d.lib;omnithreadd.lib;COS4d.lib;zmqd.lib;ws2_32.lib;tango.res;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win64\bin\archive_win\devTest.exe - true - $(OMNI_BASE)\lib\vc10;$(PREFIX)\win64\lib\vc10;$(ZMQ_BASE)\win64\lib\vc10;$(LOG4TANGO_BASE)\win64\lib\vc10;C:\tango_src\cppapi_develop\win32\resources;%(AdditionalLibraryDirectories) - true - .\Debug/devTest.pdb - Windows - false - - - - - true - .\Debug/win32_ds_win.bsc - - - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/cpp_test_ds/win64_ds_vc11/WIN32_DS.sln b/cpp_test_suite/cpp_test_ds/win64_ds_vc11/WIN32_DS.sln deleted file mode 100644 index f08975682..000000000 --- a/cpp_test_suite/cpp_test_ds/win64_ds_vc11/WIN32_DS.sln +++ /dev/null @@ -1,46 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32_ds_static", "win64_ds.vcxproj", "{19FA8AFF-C805-4D18-8A62-DD623D383C51}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32_ds_dll", "win64_ds_dll\win64_ds_dll.vcxproj", "{A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32_ds_win", "win64_ds_win\win64_ds_win.vcxproj", "{B5E926E7-E990-427A-BBCC-E5F37687BEC6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Debug|Win32.ActiveCfg = Debug|Win32 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Debug|Win32.Build.0 = Debug|Win32 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Debug|x64.ActiveCfg = Debug|x64 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Debug|x64.Build.0 = Debug|x64 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Release|Win32.ActiveCfg = Release|Win32 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Release|Win32.Build.0 = Release|Win32 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Release|x64.ActiveCfg = Release|x64 - {19FA8AFF-C805-4D18-8A62-DD623D383C51}.Release|x64.Build.0 = Release|x64 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Debug|Win32.ActiveCfg = Debug|Win32 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Debug|Win32.Build.0 = Debug|Win32 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Debug|x64.ActiveCfg = Debug|x64 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Debug|x64.Build.0 = Debug|x64 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Release|Win32.ActiveCfg = Release|Win32 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Release|Win32.Build.0 = Release|Win32 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Release|x64.ActiveCfg = Release|x64 - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD}.Release|x64.Build.0 = Release|x64 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Debug|Win32.ActiveCfg = Debug|Win32 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Debug|Win32.Build.0 = Debug|Win32 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Debug|x64.ActiveCfg = Debug|x64 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Debug|x64.Build.0 = Debug|x64 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Release|Win32.ActiveCfg = Release|Win32 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Release|Win32.Build.0 = Release|Win32 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Release|x64.ActiveCfg = Release|x64 - {B5E926E7-E990-427A-BBCC-E5F37687BEC6}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/cpp_test_suite/cpp_test_ds/win64_ds_vc11/win64_ds.vcxproj b/cpp_test_suite/cpp_test_ds/win64_ds_vc11/win64_ds.vcxproj deleted file mode 100644 index 1629ab1d6..000000000 --- a/cpp_test_suite/cpp_test_ds/win64_ds_vc11/win64_ds.vcxproj +++ /dev/null @@ -1,446 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - win32_ds_static - {19FA8AFF-C805-4D18-8A62-DD623D383C51} - win32_ds_static - - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - Application - false - MultiByte - - - Application - false - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Debug\ - .\Debug\ - .\Debug\ - .\Debug\ - true - true - .\Release\ - .\Release\ - .\Release\ - .\Release\ - false - false - - - - .\Debug/win32_ds.tlb - - - - - Disabled - $(PREFIX)/win32/include;..;$(OMNI_BASE)\win32\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_WINSTATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - .\Debug/win32_ds.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - tangod.lib;log4tangod.lib;omniORB4d.lib;omniDynamic4d.lib;omnithreadd.lib;COS4d.lib;zmqd.lib;Rpcrt4.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)/win32/bin/archive/devTest.exe - true - $(PREFIX)\win32\lib\vc9;$(OMNI_BASE)\win32\lib;$(ZMQ_BASE)\win32\lib\vc9;$(LOG4TANGO_BASE)\win32\lib;%(AdditionalLibraryDirectories) - true - .\Debug/devTest.pdb - Console - false - - - MachineX86 - - - true - .\Debug/win32_ds.bsc - - - - - .\Debug/win32_ds.tlb - - - - - Disabled - $(PREFIX)/win64/include;..;$(OMNI_BASE)\win64\include;$(ZMQ_BASE)\win64\include\vc11;$(LOG4TANGO_BASE)\win64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_WINSTATIC;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - .\Debug/win32_ds.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - tangod.lib;log4tangod.lib;omniORB4d.lib;omniDynamic4d.lib;omnithreadd.lib;COS4d.lib;zmqd.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)/win64/bin/archive/devTest.exe - true - $(PREFIX)\win64\lib\vc11;$(OMNI_BASE)\win64\lib;$(ZMQ_BASE)\win64\lib\vc11;$(LOG4TANGO_BASE)\win64\lib;%(AdditionalLibraryDirectories) - true - .\Debug/devTest.pdb - Console - false - - - - - true - .\Debug/win32_ds.bsc - - - - - .\Release/win32_ds.tlb - - - - - MaxSpeed - OnlyExplicitInline - $(OMNI_BASE)\win32\include;$(LOG4TANGO_BASE)\win32\include;C:\tango_src\cppapi_7_0\client;C:\tango_src\cppapi_7_0\server;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_WINSTATIC;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - .\Release/win32_ds.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - tango.lib;log4tango.lib;omniORB4.lib;omniDynamic4.lib;omnithread.lib;COS4.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - Release/devTest.exe - true - C:\tango_src\cppapi_7_0\win32\tango_vc9\tango_static\lib;$(OMNI_BASE)\win32\lib;$(LOG4TANGO_BASE)\win32\lib;%(AdditionalLibraryDirectories) - .\Release/devTest.pdb - Console - false - - - MachineX86 - - - true - .\Release/win32_ds.bsc - - - - - .\Release/win32_ds.tlb - - - - - MaxSpeed - OnlyExplicitInline - $(PREFIX)/win64/include;..;$(OMNI_BASE)\win64\include;$(ZMQ_BASE)\win64\include\vc10;$(LOG4TANGO_BASE)\win64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_WINSTATIC;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - .\Release/win32_ds.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - tango.lib;log4tango.lib;omniORB4.lib;omniDynamic4.lib;omnithread.lib;COS4.lib;zmq.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - Release/devTest.exe - true - $(PREFIX)\win64\lib\vc10;$(OMNI_BASE)\win64\lib;$(ZMQ_BASE)\win64\lib\vc10;$(LOG4TANGO_BASE)\win64\lib;%(AdditionalLibraryDirectories) - .\Release/devTest.pdb - Console - false - - - - - true - .\Release/win32_ds.bsc - - - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/cpp_test_ds/win64_ds_vc11/win64_ds_dll/win64_ds_dll.vcxproj b/cpp_test_suite/cpp_test_ds/win64_ds_vc11/win64_ds_dll/win64_ds_dll.vcxproj deleted file mode 100644 index 6e5b8cbf8..000000000 --- a/cpp_test_suite/cpp_test_ds/win64_ds_vc11/win64_ds_dll/win64_ds_dll.vcxproj +++ /dev/null @@ -1,444 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - win32_ds_dll - {A06580DD-0FF4-4A0F-8C45-05B4002BF5CD} - - - - Application - false - MultiByte - - - Application - false - MultiByte - v110 - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Release\ - .\Release\ - .\Release\ - .\Release\ - false - false - .\Debug\ - .\Debug\ - .\Debug\ - .\Debug\ - true - true - - - - .\Release/win32_ds_dll.tlb - - - - - MaxSpeed - OnlyExplicitInline - C:\cppapi_5_2\server;C:\cppapi_5_2\client;$(OMNI_BASE)\win32_dll\include;$(LOG4TANGO_BASE)\win32_dll\include;F:\tango\tools\test_system\ref\device;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - .\Release/win32_ds_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x040c - - - tango.lib;log4tango.lib;omniORB416_rt.lib;omniDynamic416_rt.lib;omnithread34_rt.lib;COS416_rt.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - Release/devTest.exe - true - C:\cppapi\server\winnt_lib\tango_dll\release;$(OMNI_BASE)\win32_dll\lib;$(LOG4TANGO_BASE)\win32_dll\lib;%(AdditionalLibraryDirectories) - .\Release/devTest.pdb - Console - false - - - MachineX86 - - - true - .\Release/win32_ds_dll.bsc - - - - - .\Release/win32_ds_dll.tlb - - - - - MaxSpeed - OnlyExplicitInline - C:\cppapi_5_2\server;C:\cppapi_5_2\client;$(OMNI_BASE)\win32_dll\include;$(LOG4TANGO_BASE)\win32_dll\include;F:\tango\tools\test_system\ref\device;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - .\Release/win32_ds_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x040c - - - tango.lib;log4tango.lib;omniORB416_rt.lib;omniDynamic416_rt.lib;omnithread34_rt.lib;COS416_rt.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - Release/devTest.exe - true - C:\cppapi\server\winnt_lib\tango_dll\release;$(OMNI_BASE)\win32_dll\lib;$(LOG4TANGO_BASE)\win32_dll\lib;%(AdditionalLibraryDirectories) - .\Release/devTest.pdb - Console - false - - - - - true - .\Release/win32_ds_dll.bsc - - - - - .\Debug/win32_ds_dll.tlb - - - - - Disabled - ..\..;$(PREFIX)\win32\include;$(OMNI_BASE)\win32_dll\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32_dll\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - .\Debug/win32_ds_dll.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x040c - - - tangod.lib;log4tangod.lib;omniORB416_rtd.lib;omniDynamic416_rtd.lib;omnithread34_rtd.lib;COS416_rtd.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win32\bin\shared\devTest.exe - true - $(PREFIX)\win32\lib\vc9_dll;$(OMNI_BASE)\win32_dll\lib;$(LOG4TANGO_BASE)\win32_dll\lib;%(AdditionalLibraryDirectories) - true - .\Debug/devTest.pdb - Console - false - - - MachineX86 - - - true - .\Debug/win32_ds_dll.bsc - - - - - .\Debug/win32_ds_dll.tlb - - - - - Disabled - ..\..;$(PREFIX)\win64\include;$(OMNI_BASE)\win64_dll\include;$(ZMQ_BASE)\win64\include\vc11;$(LOG4TANGO_BASE)\win64_dll\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - .\Debug/win32_ds_dll.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level2 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x040c - - - tangod.lib;log4tangod.lib;omniORB416_rtd.lib;omniDynamic416_rtd.lib;omnithread34_rtd.lib;COS416_rtd.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win64\bin\shared\devTest.exe - true - $(PREFIX)\win64\lib\vc11_dll;$(OMNI_BASE)\win64_dll\lib;$(LOG4TANGO_BASE)\win64_dll\lib;%(AdditionalLibraryDirectories) - true - .\Debug/devTest.pdb - Console - false - - - - - true - .\Debug/win32_ds_dll.bsc - - - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/cpp_test_ds/win64_ds_vc11/win64_ds_win/win64_ds_win.vcxproj b/cpp_test_suite/cpp_test_ds/win64_ds_vc11/win64_ds_win/win64_ds_win.vcxproj deleted file mode 100644 index 010696c3b..000000000 --- a/cpp_test_suite/cpp_test_ds/win64_ds_vc11/win64_ds_win/win64_ds_win.vcxproj +++ /dev/null @@ -1,416 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - win32_ds_win - {B5E926E7-E990-427A-BBCC-E5F37687BEC6} - - - - Application - false - MultiByte - - - Application - false - MultiByte - v110 - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Release\ - .\Release\ - .\Release\ - .\Release\ - false - false - .\Debug\ - .\Debug\ - .\Debug\ - .\Debug\ - true - true - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/win32_ds_win.tlb - - - - - MaxSpeed - OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/win32_ds_win.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - .\Release/win32_ds_win.exe - true - .\Release/win32_ds_win.pdb - Windows - false - - - MachineX86 - - - true - .\Release/win32_ds_win.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/win32_ds_win.tlb - - - - - MaxSpeed - OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/win32_ds_win.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - .\Release/win32_ds_win.exe - true - .\Release/win32_ds_win.pdb - Windows - false - - - - - true - .\Release/win32_ds_win.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/win32_ds_win.tlb - - - - - Disabled - ..\..;$(PREFIX)\win32\include;$(OMNI_BASE)\win32\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_WINSTATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - .\Debug/win32_ds_win.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - tangod.lib;log4tangod.lib;omniorb4d.lib;omnidynamic4d.lib;omnithreadd.lib;COS4d.lib;zmqd.lib;ws2_32.lib;Rpcrt4.lib;tango.res;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win32\bin\archive_win\devTest.exe - true - $(OMNI_BASE)\win32\lib;$(PREFIX)\win32\lib\vc9;$(ZMQ_BASE)\win32\lib\vc9;$(LOG4TANGO_BASE)\win32\lib;C:\tango_src\cppapi_7_2_6\win32\resources;%(AdditionalLibraryDirectories) - true - .\Debug/devTest.pdb - Windows - false - - - MachineX86 - - - true - .\Debug/win32_ds_win.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/win32_ds_win.tlb - - - - - Disabled - ..\..;$(PREFIX)\win64\include;$(OMNI_BASE)\win64\include;$(ZMQ_BASE)\win64\include\vc11;$(LOG4TANGO_BASE)\win64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_WINSTATIC;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - .\Debug/win32_ds_win.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level2 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - tangod.lib;log4tangod.lib;omniorb4d.lib;omnidynamic4d.lib;omnithreadd.lib;COS4d.lib;zmqd.lib;ws2_32.lib;tango.res;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win64\bin\archive_win\devTest.exe - true - $(OMNI_BASE)\win64\lib;$(PREFIX)\win64\lib\vc11;$(ZMQ_BASE)\win64\lib\vc11;$(LOG4TANGO_BASE)\win64\lib;C:\tango_src\cppapi_develop\win32\resources;%(AdditionalLibraryDirectories) - true - .\Debug/devTest.pdb - Windows - false - - - - - true - .\Debug/win32_ds_win.bsc - - - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/cxxtest/CMakeLists.txt b/cpp_test_suite/cxxtest/CMakeLists.txt deleted file mode 100644 index aa3187944..000000000 --- a/cpp_test_suite/cxxtest/CMakeLists.txt +++ /dev/null @@ -1,66 +0,0 @@ -message("Generate runner.cpp") - -execute_process(COMMAND python cxxtestgen.py --template=${CMAKE_CURRENT_SOURCE_DIR}/template/tango_template.tpl - -o ${CMAKE_CURRENT_SOURCE_DIR}/runner.cpp - ../../new_tests/cxx_syntax.cpp - ../../new_tests/cxx_poll.cpp - ../../new_tests/cxx_poll_admin.cpp - ../../new_tests/cxx_dserver_cmd.cpp - ../../new_tests/cxx_dserver_misc.cpp - ../../new_tests/cxx_always_hook.cpp - ../../new_tests/cxx_blackbox.cpp - ../../new_tests/cxx_class_dev_signal.cpp - ../../new_tests/cxx_class_signal.cpp - ../../new_tests/cxx_attr_misc.cpp - ../../new_tests/cxx_attrprop.cpp - ../../new_tests/cxx_attr_write.cpp - ../../new_tests/cxx_attr_conf.cpp - ../../new_tests/cxx_attr.cpp - ../../new_tests/cxx_misc_util.cpp - ../../new_tests/cxx_templ_cmd.cpp - ../../new_tests/cxx_exception.cpp - ../../new_tests/cxx_cmd_query.cpp - ../../new_tests/cxx_seq_vec.cpp - ../../new_tests/cxx_signal.cpp - ../../new_tests/cxx_test_state_on.cpp - ../../new_tests/cxx_misc.cpp - ../../new_tests/cxx_cmd_types.cpp - ../../new_tests/cxx_group.cpp - ../../new_tests/cxx_encoded.cpp - ../../new_tests/cxx_database.cpp - ../../new_tests/cxx_mem_attr.cpp - ../../new_tests/cxx_enum_att.cpp - ../../new_tests/cxx_write_attr_hard.cpp - ../../new_tests/cxx_fwd_att.cpp - ../../new_tests/cxx_pipe_conf.cpp - ../../new_tests/cxx_pipe.cpp - ../../new_tests/cxx_z00_dyn_cmd.cpp - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin) - -add_executable(runner $ ${CMAKE_CURRENT_SOURCE_DIR}/runner.cpp) -target_include_directories(runner PUBLIC include) -target_link_libraries(runner PUBLIC tango ${CMAKE_DL_LIBS}) -target_compile_definitions(runner PUBLIC "-DVALGRIND -D_PTHREADS -D_REENTRANT") - -add_test("CXX::runner" runner - --device1=${DEV1} - --device2=${DEV2} - --device3=${DEV3} - --fwd_device=${FWD_DEV} - --loop=1 - --fulldsname=${SERV_NAME}/${INST_NAME} - --serverhost=${HOST_NAME} - --clienthost=${HOST_NAME} - --serverversion=5 - --docurl=http://www.tango-controls.org - --devtype=TestDevice - --dbserver=sys/database/2 - --outpath=/tmp/ - --refpath=${CMAKE_CURRENT_SOURCE_DIR}/../new_tests/out/ - --loglevel=0 - --dsloglevel=5 - --suiteloop=1 - --devicealias=${DEV1_ALIAS} - --attributealias=${ATTR_ALIAS} - --verbose=true -) diff --git a/cpp_test_suite/event/reco_event.cpp b/cpp_test_suite/event/reco_event.cpp deleted file mode 100644 index 297c7f5d5..000000000 --- a/cpp_test_suite/event/reco_event.cpp +++ /dev/null @@ -1,388 +0,0 @@ -/* - * example of a client using the TANGO device api. - */ - -#include -#include - -#ifdef WIN32 -#include -#include -#else -#include -#include -#endif - -#define coutv if (verbose == true) cout - -using namespace Tango; - -void wait_and_dot(int); - -bool verbose = false; - -class EventCallBack : public Tango::CallBack -{ - void push_event(Tango::EventData*); - -public: - int cb_executed; - int cb_no_err; - int cb_err; - int old_sec,old_usec; - int delta_msec; -}; - -void EventCallBack::push_event(Tango::EventData* event_data) -{ - struct timeval now_timeval; -#ifdef WIN32 - struct _timeb before_win; - _ftime(&before_win); - now_timeval.tv_sec = (unsigned long)before_win.time; - now_timeval.tv_usec = (long)before_win.millitm * 1000; -#else - gettimeofday(&now_timeval,NULL); -#endif - - coutv << "date : tv_sec = " << now_timeval.tv_sec; - coutv << ", tv_usec = " << now_timeval.tv_usec << endl; - - int delta_s = now_timeval.tv_sec - old_sec; - if (delta_s == 0) - delta_msec = (now_timeval.tv_usec - old_usec) / 1000; - else - { - delta_msec = (now_timeval.tv_usec + (1000000 - old_usec)) / 1000; - if (delta_s > 1) - delta_msec = delta_msec + ((delta_s - 1)* 1000); - } - old_sec = now_timeval.tv_sec; - old_usec = now_timeval.tv_usec; - - coutv << "delta_msec = " << delta_msec << endl; - - cb_executed++; - try - { - coutv << "StateEventCallBack::push_event(): called attribute " << event_data->attr_name << " event " << event_data->event << "\n"; - if (!event_data->err) - { - - coutv << "CallBack without error " << endl; - cb_no_err++; - } - else - { - coutv << "Error send to callback" << endl; - cb_err++; - } - } - catch (...) - { - coutv << "EventCallBack::push_event(): could not extract data !\n"; - } - -} - -int main(int argc, char **argv) -{ - DeviceProxy *device; - - if (argc == 1) - { - cout << "usage: %s device [-v]" << endl; - exit(-1); - } - - string device_name = argv[1]; - - if (argc == 3) - { - if (strcmp(argv[2],"-v") == 0) - verbose = true; - } - - try - { - device = new DeviceProxy(device_name); - } - catch (CORBA::Exception &e) - { - Except::print_exception(e); - exit(1); - } - - coutv << endl << "new DeviceProxy(" << device->name() << ") returned" << endl << endl; - - - - - try - { - - string att_name("short_attr"); - string att_name_change("event_change_tst"); - -// -// Test set up (stop polling and clear event_period attribute property but -// restart device to take this into account) -// - - if (device->is_attribute_polled(att_name)) - device->stop_poll_attribute(att_name); - if (device->is_attribute_polled(att_name_change)) - device->stop_poll_attribute(att_name_change); - - DbAttribute dba(att_name,device_name); - DbData dbd; - DbDatum a(att_name); - a << (short)1; - dbd.push_back(a); - dbd.push_back(DbDatum("event_period")); - dba.delete_property(dbd); - - DeviceProxy adm_dev(device->adm_name().c_str()); - DeviceData di; - di << device_name; - adm_dev.command_inout("DevRestart",di); - - delete device; - device = new DeviceProxy(device_name); - Tango_sleep(1); - -// -// subscribe to a periodic event and a change event -// - - int eve_id,eve_id_change; - vector filters; - - EventCallBack cb; - cb.cb_executed = 0; - cb.cb_err = 0; - cb.cb_no_err = 0; - cb.old_sec = cb.old_usec = 0; - - EventCallBack cb_change; - cb_change.cb_executed = 0; - cb_change.cb_err = 0; - cb_change.cb_no_err = 0; - cb_change.old_sec = cb.old_usec = 0; - - // start the polling first! - device->poll_attribute(att_name,1000); - device->poll_attribute(att_name_change,1000); - - eve_id = device->subscribe_event(att_name,Tango::PERIODIC_EVENT,&cb,filters); - eve_id_change = device->subscribe_event(att_name_change,Tango::CHANGE_EVENT,&cb_change,filters); - - cout << " subscribe_event --> OK" << endl; - -// -// Check that callback was called -// - -// A trick for gdb. The thread created by omniORB for the callback execution -// is just started during the sleep. Gdb has a breakpoint reached at each thread -// creation to display message on the console. This breakpoint is a software -// signal which interrupts the sleep..... -// - -#ifndef WIN32 - int rest = sleep(3); - if (rest != 0) - sleep(3); -#else - Sleep(3000); -#endif - - coutv << "cb excuted = " << cb.cb_executed << endl; - assert (cb.cb_executed >= 2); - assert (cb.cb_executed < 5); - assert (cb.delta_msec > 950); - assert (cb.delta_msec < 1050); - - cout << " CallBack executed every 1000 mS for periodic event--> OK" << endl; - - assert (cb_change.cb_executed != 0); - cout << " CallBack executed once for change event--> OK" << endl; - -// -// Now, kill the notifd -// - - string key; - cout << "Kill notifd process and hit \"return\" key when done" << endl; - cout << "Process will wait for callback with error during 30 sec"; - getline(cin,key); - -// -// Checking for error in callback -// - - wait_and_dot(30); - - assert (cb.cb_err != 0); - assert (cb_change.cb_err != 0); - - cout << "\n CallBacks executed with error --> OK" << endl; - -// -// Now, kill device server -// - - cout << "Kill device server process and hit \"return\" key when done" << endl; - cout << "Process will wait for callback with error during 25 sec"; - getline(cin,key); - -// -// Checking for error in callback -// - - int old_cb_err = cb.cb_err; - int old_cb_err_ch = cb_change.cb_err; - - wait_and_dot(25); - - int new_cb_err = cb.cb_err; - int new_cb_err_ch = cb_change.cb_err; - - assert ((new_cb_err - old_cb_err) >= 2); - assert ((new_cb_err_ch - old_cb_err_ch) >= 2); - - cout << "\n CallBacks executed with error --> OK" << endl; - -// -// Now, Restart notifd -// - -#ifdef WIN32 - cout << "Restart notifd (notifd -n -DFactoryIORFileName=C:\\Temp\\evfact.ior)" << endl; - cout << "and hit \"return\" key when done" << endl; -#else - cout << "Restart notifd (notifd -n) and hit \"return\" key when done" << endl; -#endif - cout << "Process will wait for callback with error during 25 sec"; - getline(cin,key); - -// -// Checking for error in callback -// - - old_cb_err = cb.cb_err; - old_cb_err_ch = cb_change.cb_err; - - wait_and_dot(25); - - new_cb_err = cb.cb_err; - new_cb_err_ch = cb_change.cb_err; - - assert ((new_cb_err - old_cb_err) >= 2); - assert ((new_cb_err_ch - old_cb_err_ch) >= 2); - - cout << "\n CallBacks executed with error --> OK" << endl; - -// -// Now, export notifd to db -// - -#ifdef WIN32 - cout << "Export notifd to db (notifd2db C:\\Temp\\evfact.ior) and hit \"return\" key when done" << endl; -#else - cout << "Export notifd to db (notifd2db) and hit \"return\" key when done" << endl; -#endif - cout << "Process will wait for callback with error during 25 sec"; - getline(cin,key); - -// -// Checking for error in callback -// - - old_cb_err = cb.cb_err; - old_cb_err_ch = cb_change.cb_err; - - wait_and_dot(25); - - new_cb_err = cb.cb_err; - new_cb_err_ch = cb_change.cb_err; - - assert ((new_cb_err - old_cb_err) >= 2); - assert ((new_cb_err_ch - old_cb_err_ch) >= 2); - - cout << "\n CallBacks executed with error --> OK" << endl; - -// -// Now, restart device server -// - - int old_cb_no_err = cb_change.cb_no_err; - cout << "Restart device server and hit \"return\" key when done" << endl; - cout << "Process will wait for callback during 25 sec"; - getline(cin,key); - -// -// Checking for error in callback -// - - old_cb_err = cb.cb_executed; - old_cb_err_ch = cb_change.cb_executed; - - wait_and_dot(25); - - new_cb_err = cb.cb_executed; - new_cb_err_ch = cb_change.cb_executed; - int new_cb_no_err = cb_change.cb_no_err; - - assert ((new_cb_err - old_cb_err) > 4); - assert ((new_cb_no_err - old_cb_no_err) >= 1); - - cout << "\n CallBacks executed after reconnection to notifd --> OK" << endl; - -// -// unsubscribe to the event -// - - device->unsubscribe_event(eve_id); - device->unsubscribe_event(eve_id_change); - - cout << " unsubscribe_event --> OK" << endl; -// -// Stop polling -// - device->stop_poll_attribute(att_name); - device->stop_poll_attribute(att_name_change); - } - catch (Tango::DevFailed &e) - { - Except::print_exception(e); - exit(-1); - } - catch (CORBA::Exception &ex) - { - Except::print_exception(ex); - exit(-1); - } - - delete device; - - return 0; -} - - -void wait_and_dot(int max) -{ - int loop = 0; - for (loop = 0;loop < max;loop++) - { -#ifndef WIN32 - int rest = sleep(1); - if (rest != 0) - sleep(1); -#else - Sleep(1000); -#endif - cout << "."; - cout.flush(); - } -} diff --git a/cpp_test_suite/event/reco_svc.cpp b/cpp_test_suite/event/reco_svc.cpp deleted file mode 100644 index cc7188cc6..000000000 --- a/cpp_test_suite/event/reco_svc.cpp +++ /dev/null @@ -1,446 +0,0 @@ -/* - * example of a client using the TANGO device api. - */ - -#include -#include - -#ifdef WIN32 -#include -#include -#else -#include -#include -#endif - -#define coutv if (verbose == true) cout - -using namespace Tango; - -void wait_and_dot(int); - -bool verbose = false; - -class EventCallBack : public Tango::CallBack -{ - void push_event(Tango::EventData*); - -public: - int cb_executed; - int cb_err; - int cb_no_err; - int old_sec,old_usec; - int delta_msec; -}; - -void EventCallBack::push_event(Tango::EventData* event_data) -{ - struct timeval now_timeval; -#ifdef WIN32 - struct _timeb before_win; - _ftime(&before_win); - now_timeval.tv_sec = (unsigned long)before_win.time; - now_timeval.tv_usec = (long)before_win.millitm * 1000; -#else - gettimeofday(&now_timeval,NULL); -#endif - - coutv << "date : tv_sec = " << now_timeval.tv_sec; - coutv << ", tv_usec = " << now_timeval.tv_usec << endl; - - int delta_s = now_timeval.tv_sec - old_sec; - if (delta_s == 0) - delta_msec = (now_timeval.tv_usec - old_usec) / 1000; - else - { - delta_msec = (now_timeval.tv_usec + (1000000 - old_usec)) / 1000; - if (delta_s > 1) - delta_msec = delta_msec + ((delta_s - 1)* 1000); - } - old_sec = now_timeval.tv_sec; - old_usec = now_timeval.tv_usec; - - coutv << "delta_msec = " << delta_msec << endl; - - cb_executed++; - try - { - coutv << "StateEventCallBack::push_event(): called attribute " << event_data->attr_name << " event " << event_data->event << "\n"; - if (!event_data->err) - { - coutv << "CallBack without error " << endl; - cb_no_err++; - } - else - { - coutv << "Error send to callback" << endl; - cb_err++; - } - } - catch (...) - { - coutv << "EventCallBack::push_event(): could not extract data !\n"; - } - -} - -int main(int argc, char **argv) -{ - DeviceProxy *device; - - if (argc == 1) - { - cout << "usage: %s device [-v]" << endl; - exit(-1); - } - - string device_name = argv[1]; - - if (argc == 3) - { - if (strcmp(argv[2],"-v") == 0) - verbose = true; - } - - try - { - device = new DeviceProxy(device_name); - } - catch (CORBA::Exception &e) - { - Except::print_exception(e); - exit(1); - } - - coutv << endl << "new DeviceProxy(" << device->name() << ") returned" << endl << endl; - - try - { - - string att_name("short_attr"); - string att_name_change("event_change_tst"); - -// -// Test set up (stop polling and clear event_period attribute property but -// restart device to take this into account) -// - - if (device->is_attribute_polled(att_name)) - device->stop_poll_attribute(att_name); - if (device->is_attribute_polled(att_name_change)) - device->stop_poll_attribute(att_name_change); - - DbAttribute dba(att_name,device_name); - DbData dbd; - DbDatum a(att_name); - a << (short)1; - dbd.push_back(a); - dbd.push_back(DbDatum("event_period")); - dba.delete_property(dbd); - - DeviceProxy adm_dev(device->adm_name().c_str()); - DeviceData di; - di << device_name; - adm_dev.command_inout("DevRestart",di); - - delete device; - device = new DeviceProxy(device_name); - Tango_sleep(1); - -// -// subscribe to a periodic and to a change event -// - - int eve_id1,eve_id2; - int eve_id_change1,eve_id_change2; - vector filters; - - EventCallBack cb1; - cb1.cb_executed = 0; - cb1.cb_err = 0; - cb1.cb_no_err = 0; - cb1.old_sec = cb1.old_usec = 0; - - EventCallBack cb2; - cb2.cb_executed = 0; - cb2.cb_err = 0; - cb2.cb_no_err = 0; - cb2.old_sec = cb2.old_usec = 0; - - EventCallBack cb_change1; - cb_change1.cb_executed = 0; - cb_change1.cb_err = 0; - cb_change1.cb_no_err = 0; - cb_change1.old_sec = cb_change1.old_usec = 0; - - EventCallBack cb_change2; - cb_change2.cb_executed = 0; - cb_change2.cb_err = 0; - cb_change2.cb_no_err = 0; - cb_change2.old_sec = cb_change2.old_usec = 0; - - // start the polling first! - device->poll_attribute(att_name,1000); - device->poll_attribute(att_name_change,1000); - - eve_id1 = device->subscribe_event(att_name,Tango::PERIODIC_EVENT,&cb1,filters); - eve_id2 = device->subscribe_event(att_name,Tango::PERIODIC_EVENT,&cb2,filters); - eve_id_change1 = device->subscribe_event(att_name_change,Tango::CHANGE_EVENT,&cb_change1,filters); - eve_id_change2 = device->subscribe_event(att_name_change,Tango::CHANGE_EVENT,&cb_change2,filters); - - cout << " subscribe_event --> OK" << endl; - -// -// Check that callback was called -// - -// A trick for gdb. The thread created by omniORB for the callback execution -// is just started during the sleep. Gdb has a breakpoint reached at each thread -// creation to display message on the console. This breakpoint is a software -// signal which interrupts the sleep..... -// - -#ifndef WIN32 - int rest = sleep(3); - if (rest != 0) - sleep(3); -#else - Sleep(3000); -#endif - - coutv << "cb excuted = " << cb1.cb_executed << endl; - assert (cb1.cb_executed >= 2); - assert (cb1.cb_executed < 5); - assert (cb1.delta_msec > 950); - assert (cb1.delta_msec < 1050); - - assert (cb2.cb_executed >= 2); - assert (cb2.cb_executed < 5); - assert (cb2.delta_msec > 950); - assert (cb2.delta_msec < 1050); - - cout << " CallBack executed every 1000 mS for periodic event--> OK" << endl; - - assert (cb_change1.cb_executed != 0); - assert (cb_change2.cb_executed != 0); - -cout << " CallBack executed once for change event--> OK" << endl; - -// -// Now, kill the server -// - - string key; - cout << "Kill device server and hit \"return\" key when done" << endl; - cout << "Process will wait for callback with error during 25 sec"; - getline(cin,key); - -// -// Checking for error in callback -// - - wait_and_dot(25); - - assert (cb1.cb_err != 0); - assert (cb_change1.cb_err != 0); - - assert (cb2.cb_err != 0); - assert (cb_change2.cb_err != 0); - - cout << "\n CallBacks executed with error --> OK" << endl; - -// -// Now, Restart DS -// - - int old_cb_no_err1,old_cb_no_err2; - int new_cb_no_err1,new_cb_no_err2; - - old_cb_no_err1 = cb_change1.cb_no_err; - old_cb_no_err2 = cb_change2.cb_no_err; - cout << "Restart DS and hit \"return\" key when done" << endl; - cout << "Process will wait for callback without error during 25 sec"; - getline(cin,key); - - int old_cb_err1,old_cb_err_ch1; - int new_cb_err1,new_cb_err_ch1; - int old_cb_err2,old_cb_err_ch2; - int new_cb_err2,new_cb_err_ch2; - - old_cb_err1 = cb1.cb_executed; - old_cb_err_ch1 = cb_change1.cb_executed; - - old_cb_err2 = cb2.cb_executed; - old_cb_err_ch2 = cb_change2.cb_executed; - - wait_and_dot(25); - - new_cb_err1 = cb1.cb_executed; - new_cb_err_ch1 = cb_change1.cb_executed; - new_cb_no_err1 = cb_change1.cb_no_err; - - new_cb_err2 = cb2.cb_executed; - new_cb_err_ch2 = cb_change2.cb_executed; - new_cb_no_err2 = cb_change2.cb_no_err; - - assert ((new_cb_err1 - old_cb_err1) > 4); - assert ((new_cb_no_err1 - old_cb_no_err1) >= 1); - - assert ((new_cb_err2 - old_cb_err2) > 4); - assert ((new_cb_no_err2 - old_cb_no_err2) >= 1); - - cout << "\n CallBacks executed after reconnection to notifd --> OK" << endl; - -// -// Now, kill the notifd -// - - cout << "Kill notifd process and hit \"return\" key when done" << endl; - cout << "Process will wait for callback with error during 30 sec"; - getline(cin,key); - -// -// Checking for error in callback -// - - wait_and_dot(30); - - assert (cb1.cb_err != 0); - assert (cb_change1.cb_err != 0); - - assert (cb2.cb_err != 0); - assert (cb_change2.cb_err != 0); - - cout << "\n CallBacks executed with error --> OK" << endl; - -// -// Now, Restart notifd -// - -#ifdef WIN32 - cout << "Restart notifd (notifd -n -DFactoryIORFileName=C:\\Temp\\evfact.ior)" << endl; - cout << "and hit \"return\" key when done" << endl; -#else - cout << "Restart notifd (notifd -n) and hit \"return\" key when done" << endl; -#endif - cout << "Process will wait for callback with error during 25 sec"; - getline(cin,key); - -// -// Checking for error in callback -// - - old_cb_err1 = cb1.cb_err; - old_cb_err_ch1 = cb_change1.cb_err; - - old_cb_err2 = cb2.cb_err; - old_cb_err_ch2 = cb_change2.cb_err; - - wait_and_dot(25); - - new_cb_err1 = cb1.cb_err; - new_cb_err_ch1 = cb_change1.cb_err; - - new_cb_err2 = cb2.cb_err; - new_cb_err_ch2 = cb_change2.cb_err; - - assert ((new_cb_err1 - old_cb_err1) >= 2); - assert ((new_cb_err_ch1 - old_cb_err_ch1) >= 2); - - assert ((new_cb_err2 - old_cb_err2) >= 2); - assert ((new_cb_err_ch2 - old_cb_err_ch2) >= 2); - - cout << "\n CallBacks executed with error --> OK" << endl; - -// -// Now, export notifd to db -// - - old_cb_no_err1 = cb_change1.cb_no_err; - old_cb_no_err2 = cb_change2.cb_no_err; -#ifdef WIN32 - cout << "Export notifd to db (notifd2db C:\\Temp\\evfact.ior) and hit \"return\" key when done" << endl; -#else - cout << "Export notifd to db (notifd2db) and hit \"return\" key when done" << endl; -#endif - cout << "Process will wait for callback during 20 sec"; - getline(cin,key); - -// -// Checking for error in callback -// - - old_cb_err1 = cb1.cb_executed; - old_cb_err_ch1 = cb_change1.cb_executed; - - old_cb_err2 = cb2.cb_executed; - old_cb_err_ch2 = cb_change2.cb_executed; - - wait_and_dot(20); - - new_cb_err1 = cb1.cb_executed; - new_cb_err_ch1 = cb_change1.cb_executed; - new_cb_no_err1 = cb_change1.cb_no_err; - - new_cb_err2 = cb2.cb_executed; - new_cb_err_ch2 = cb_change2.cb_executed; - new_cb_no_err2 = cb_change2.cb_no_err; - - assert ((new_cb_err1 - old_cb_err1) > 4); - assert ((new_cb_no_err1 - old_cb_no_err1) >= 1); - - assert ((new_cb_err2 - old_cb_err2) > 4); - assert ((new_cb_no_err2 - old_cb_no_err2) >= 1); - - cout << "\n CallBacks executed after reconnection to notifd --> OK" << endl; - -// -// unsubscribe to the event -// - - device->unsubscribe_event(eve_id1); - device->unsubscribe_event(eve_id2); - device->unsubscribe_event(eve_id_change1); - device->unsubscribe_event(eve_id_change2); - - cout << " unsubscribe_event --> OK" << endl; -// -// Stop polling -// - device->stop_poll_attribute(att_name); - device->stop_poll_attribute(att_name_change); - - } - catch (Tango::DevFailed &e) - { - Except::print_exception(e); - exit(-1); - } - catch (CORBA::Exception &ex) - { - Except::print_exception(ex); - exit(-1); - } - - delete device; - - return 0; -} - - -void wait_and_dot(int max) -{ - int loop = 0; - for (loop = 0;loop < max;loop++) - { -#ifndef WIN32 - int rest = sleep(1); - if (rest != 0) - sleep(1); -#else - Sleep(1000); -#endif - cout << "."; - cout.flush(); - } -} diff --git a/cpp_test_suite/event/reco_zmq.cpp b/cpp_test_suite/event/reco_zmq.cpp deleted file mode 100644 index c3c039cf9..000000000 --- a/cpp_test_suite/event/reco_zmq.cpp +++ /dev/null @@ -1,190 +0,0 @@ -/* - * example of a client using the TANGO device api. - */ - -#include -#include - -#ifndef WIN32 -#include -#endif - -#define coutv if (verbose == true) cout - -using namespace Tango; - -bool verbose = false; - -class EventCallback : public Tango::CallBack -{ -public: - EventCallback() { }; - ~EventCallback() { }; - void push_event( Tango::EventData *ed ); - - int cb_executed; - int cb_err; -}; - -void EventCallback::push_event( Tango::EventData *ed ) -{ - coutv << "In callback with error flag = " << std::boolalpha << ed->err << endl; - //TODO is it thread safe? - if(ed->err == false) - cb_executed++; - else { - cb_err++; - coutv << "Error: " << ed->errors[0].reason << endl; - } -} - -int main(int argc, char **argv) -{ - DeviceProxy *device; - - if (argc == 1) - { - cout << "usage: %s device [-v]" << endl; - exit(-1); - } - - string device_name = argv[1]; - - if (argc == 3) - { - if (strcmp(argv[2],"-v") == 0) - verbose = true; - } - - try - { - device = new DeviceProxy(device_name); - } - catch (CORBA::Exception &e) - { - Except::print_exception(e); - exit(1); - } - - string att_name ("event_change_tst"); - - try - { - -// -// Subscribe to a user event -// - - const vector filters; - EventCallback *eventCallback = new EventCallback(); - eventCallback->cb_executed = 0; - eventCallback->cb_err = 0; - - device->subscribe_event(att_name,Tango::USER_EVENT,eventCallback,filters); - -// -// Fire one event -// - - device->command_inout("IOPushEvent"); - device->command_inout("IOPushEvent"); - - Tango_sleep(1); - - coutv << "Callback execution before re-connection = " << eventCallback->cb_executed << endl; - coutv << "Callback error before re-connection = " << eventCallback->cb_err << endl; - - assert (eventCallback->cb_executed == 3); - assert (eventCallback->cb_err == 0); - -// -// Kill device server (using its admin device) -// - - string adm_name = device->adm_name(); - DeviceProxy admin_dev(adm_name); - admin_dev.command_inout("kill"); - -// -// Wait for some error and re-connection -// - - Tango_sleep(40); - -// -// Check error and re-connection -// - - coutv << "Callback execution after re-connection = " << eventCallback->cb_executed << endl; - coutv << "Callback error after re-connection = " << eventCallback->cb_err << endl; - - assert (eventCallback->cb_err >= 1); - assert (eventCallback->cb_executed == 4); - -// -// Fire another event -// - - device->command_inout("IOPushEvent"); - device->command_inout("IOPushEvent"); - - Tango_sleep(1); - - coutv << "Callback execution after re-connection and event = " << eventCallback->cb_executed << endl; - coutv << "Callback error after re-connection and event = " << eventCallback->cb_err << endl; - - assert (eventCallback->cb_executed == 6); - assert (eventCallback->cb_err >= 1); - - cout << " Event re-connection (differents ports) --> OK" << endl; - -// -// Clear call back counters and kill device server once more -// - - eventCallback->cb_executed = 0; - eventCallback->cb_err = 0; - - admin_dev.command_inout("kill"); - -// -// Wait for some error and re-connection -// - - Tango_sleep(40); - -// -// Check error and re-connection -// - - coutv << "Callback execution after second re-connection = " << eventCallback->cb_executed << endl; - coutv << "Callback error after second re-connection = " << eventCallback->cb_err << endl; - - assert (eventCallback->cb_err >= 1); - assert (eventCallback->cb_executed == 1); - -// -// Fire yet another event -// - - device->command_inout("IOPushEvent"); - - Tango_sleep(2); - - coutv << "Callback execution after second re-connection and event = " << eventCallback->cb_executed << endl; - coutv << "Callback error after second re-connection and event = " << eventCallback->cb_err << endl; - - assert (eventCallback->cb_executed == 2); - assert (eventCallback->cb_err >= 1); - - cout << " Event re-connection (same ports) --> OK" << endl; - } - catch (Tango::DevFailed &e) - { - Except::print_exception(e); - exit(-1); - } - delete device; - - return 0; -} diff --git a/cpp_test_suite/event/server_event.cpp b/cpp_test_suite/event/server_event.cpp deleted file mode 100644 index 4b4ae8944..000000000 --- a/cpp_test_suite/event/server_event.cpp +++ /dev/null @@ -1,118 +0,0 @@ -/* - * example of a client using the TANGO device api. - */ - -#include -#include - -#ifndef WIN32 -#include -#endif - -#define coutv if (verbose == true) cout - -using namespace Tango; - -bool verbose = false; - -int main(int argc, char **argv) -{ - DeviceProxy *device; - - if (argc < 3 || argc > 4) - { - cout << "usage: %s local_device remote_device [-v]" << endl; - exit(-1); - } - - string device_name = argv[1]; - - if (argc == 4) - { - if (strcmp(argv[3],"-v") == 0) - verbose = true; - } - - try - { - device = new DeviceProxy(device_name); - } - catch (CORBA::Exception &e) - { - Except::print_exception(e); - exit(1); - } - - coutv << endl << "new DeviceProxy(" << device->name() << ") returned" << endl << endl; - - try - { - -// -// Ask the device server to subscribe to an event -// - - vector vs; - vs.push_back(argv[2]); - vs.push_back("Short_attr"); - vs.push_back("periodic"); - - DeviceData dd_in,dd_out; - dd_in << vs; - dd_out = device->command_inout("IOSubscribeEvent",dd_in); - DevLong eve_id; - dd_out >> eve_id; - - cout << " Server subscribe to event --> OK" << endl; - -// -// Wait for event to be executed -// - - Tango_sleep(3); - - DeviceData da; - da = device->command_inout("IOGetCbExecuted"); - Tango::DevLong cb; - da >> cb; - - coutv << "cb executed = " << cb << endl; - assert (cb >= 2); - assert (cb <= 4); - - cout << " Callback executed --> OK" << endl; - -// -// Ask server to unsubsribe from event -// - - DeviceData dd_un; - dd_un << eve_id; - - device->command_inout("IOUnSubscribeEvent",dd_un); - da = device->command_inout("IOGetCbExecuted"); - da >> cb; - - Tango_sleep(2); - da = device->command_inout("IOGetCbExecuted"); - Tango::DevLong cb2; - da >> cb2; - - assert (cb2 == cb); - cout << " Server unsubscribe to event --> OK" << endl; - } - catch (Tango::DevFailed &e) - { - Except::print_exception(e); - exit(-1); - } - catch (CORBA::Exception &ex) - { - Except::print_exception(ex); - exit(-1); - } - - delete device; - - return 0; -} diff --git a/cpp_test_suite/event/stateless_sub.cpp b/cpp_test_suite/event/stateless_sub.cpp deleted file mode 100644 index 044fcbc5c..000000000 --- a/cpp_test_suite/event/stateless_sub.cpp +++ /dev/null @@ -1,124 +0,0 @@ -/* - * example of a client using the TANGO device api. - */ - -#include -#include - -#ifndef WIN32 -#include -#endif - -#define coutv if (verbose == true) cout - -using namespace Tango; - -bool verbose = false; - -class EventCallback : public Tango::CallBack -{ -public: - EventCallback() { }; - ~EventCallback() { }; - void push_event( Tango::EventData *ed ); - - int cb_executed; - int cb_err; -}; - -void EventCallback::push_event( Tango::EventData *ed ) -{ - coutv << "In callback with error flag = " << std::boolalpha << ed->err << endl; - //TODO is it thread safe? - if(ed->err == false) - cb_executed++; - else { - cb_err++; - coutv << "Error: " << ed->errors[0].reason << endl; - } -} - -int main(int argc, char **argv) -{ - DeviceProxy *device; - - if (argc == 1) - { - cout << "usage: %s device [-v]" << endl; - exit(-1); - } - - string device_name = argv[1]; - - if (argc == 3) - { - if (strcmp(argv[2],"-v") == 0) - verbose = true; - } - - try - { - device = new DeviceProxy(device_name); - } - catch (CORBA::Exception &e) - { - Except::print_exception(e); - exit(1); - } - - string att_name ("event_change_tst"); - - try - { - -// -// Subscribe to event with stateless flag set -// - - int eventID = 0; - const vector< string > filters; - EventCallback *eventCallback = new EventCallback(); - eventCallback->cb_executed = 0; - eventCallback->cb_err = 0; - - eventID = device->subscribe_event(att_name,Tango::CHANGE_EVENT,eventCallback,filters,true); - - Tango_sleep(6); - - device->unsubscribe_event(eventID); - - cout << " Unsubscription while event still not connected --> OK" << endl; - -// -// Re-subscribe -// - - eventID = device->subscribe_event(att_name,Tango::CHANGE_EVENT,eventCallback,true); - -// -// Wait for connection and event -// - - Tango_sleep(40); - -// -// Check error and connection -// - - coutv << "cb err = " << eventCallback->cb_err << endl; - coutv << "cb executed = " << eventCallback->cb_executed << endl; - - assert (eventCallback->cb_err >= 1); - assert (eventCallback->cb_executed >= 1); - - cout << " Stateless connection to event --> OK" << endl; - } - catch (Tango::DevFailed &e) - { - Except::print_exception(e); - exit(-1); - } - delete device; - - return 0; -} diff --git a/cpp_test_suite/event/test_reconnection.sh.cmake b/cpp_test_suite/event/test_reconnection.sh.cmake deleted file mode 100644 index a5147e278..000000000 --- a/cpp_test_suite/event/test_reconnection.sh.cmake +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/env bash -check_return_value () { - if [ $1 != "0" ] - then - echo "Event Test Suite has FAILED !!!!!!!!!!!!!!!!!!" - echo "Leaving test suite, try to fix it" - date - exit -1 - fi -} - -start_server(){ - echo "Starting DevTest $1" - @PROJECT_BINARY_DIR@/cpp_test_ds/DevTest $1 -v5 1>@PROJECT_BINARY_DIR@/cpp_test_ds/DevTest_$1.out 2>&1 & - echo $! > @PROJECT_BINARY_DIR@/cpp_test_ds/DevTest_$1.pid - echo "Done. PID="`cat @PROJECT_BINARY_DIR@/cpp_test_ds/DevTest_$1.pid` -} - -kill_servers(){ - PIDS=`ps -e | grep DevTest | grep -v grep | awk '{print $1}'` - echo "PIDS = $PIDS" - for pid in $PIDS - do - echo "Killing process with PID $pid" - kill $pid - done - - sleep 2 -} - - -start_server "@INST_NAME@2" -sleep 20 - -echo "Testing server_event" -./server_event @DEV1@ @DEV20@ -ret=$? -check_return_value $ret - -# -# kill DevTest servers (/10 and /20) -# -kill_servers - -# -# Start DevTest server -# - -start_server "@INST_NAME@" -sleep 20 -# -# Next test will restart server -# - -echo "Testing event re-connection (takes time...)" -sleep 18 && start_server "@INST_NAME@" & -sleep 62 && start_server "@INST_NAME@" & -./reco_zmq @DEV1@ -v -ret=$? -check_return_value $ret - -# -# kill servers -# -kill_servers - -echo "Testing stateless event connection (takes time...)" -sleep 24 && start_server "@INST_NAME@2" & -./stateless_sub @DEV20@ -v -ret=$? -check_return_value $ret - -#kill extra server -kill_servers - -#restart DEV1 -start_server "@INST_NAME@" - -sleep 20 - -echo "PID=$(<@PROJECT_BINARY_DIR@/cpp_test_ds/DevTest_@INST_NAME@.pid)" \ No newline at end of file diff --git a/cpp_test_suite/makeprofiles/default.profile b/cpp_test_suite/makeprofiles/default.profile deleted file mode 100644 index f40b8029e..000000000 --- a/cpp_test_suite/makeprofiles/default.profile +++ /dev/null @@ -1,47 +0,0 @@ -####################################################################################################################### -# -# Parameters explained (with examples): -# -# ! Assumption: all file names are unique ! -# -# Mandatory parameters: -# -# TANGO_BASE = /usr/local/tango - directory where Tango include and lib directories are stored -# TANGO_INCLUDE_DIR = /usr/local/tango/include/client /usr/local/tango/include/server... - if defined, takes precedence -# over the include directory located in TANGO_BASE; can contain more than one path -# TANGO_LIB_DIR = /usr/local/tango/lib - if defined, takes precedence over lib directory located in TANGO_BASE -# OMNI_BASE = /usr/local/omniORB - directory where omniORB include and lib directories are stored -# LOG4TANGO_BASE = /usr/local/log4tango - directory where log4tango include/tango and lib directories are stored -# ZMQ_BASE = /urs/local/zmq - directory where ZMQ include and lib directories are stored -# -# Optional parameters: -# -# TEST_DIRS = asyn event old_tests new_tests - directories where test suites (*.cpp and cxx_*.cpp) are located, all files in -# these directories will be compiled (see also EXCLUDE_FILES and COMPILE_FILES); default values as in the example -# TEST_DIRS_EXTRA = my_tests1 my_tests2... - extra directories to be scanned in search for test suites; can be used to -# add source directories to the default set of directories; default values - not set -# BIN_DIR = bin - directory where test suite binaries will be stored; default value as in the example -# OBJ_DIR = obj - directory where object files will be stored; default value as in the example -# -# EXCLUDE_FILES = runner.cpp compare_test.cpp - do not compile these files; default values as in the example -# COMPILE_FILES = file1.cpp file2.cpp file3.cpp... - compile only listed files; default values - not set -# ALWAYS_RECOMPILE_CXX = true - if set to true forces recompilation of the cxx test suite runner; useful when combined -# with COMPILE_FILES to select different cxx_ files to be incorporated in the runner, if ALWAYS_RECOMPILE_CXX -# not set runner executable will not recompile if it already exists; default values - not set -# SORT_ALPHABETICALLY_CXX = true - has a meaning only when COMPILE_FILES is set; if set to true the cxx_ files will be -# alphabetically sorted within the runner, otherwise the order defined by the user is kept; default values -# - not set -# -# CC = c++ - compiler; default value as in the example -# CXXFLAGS = -g -Wall -Wextra -DVALGRIND -D_PTHREADS -D_REENTRANT - compiler parameters; default values -# as in the example -# CXXFLAGS_EXTRA = -O... - extra compiler options, will be appended to CXXFLAGS; default values - not set -# -# LFLAGS_EXTRA = -static... - extra linker options; default values - not set -# -####################################################################################################################### - -TANGO_BASE = -OMNI_BASE = -LOG4TANGO_BASE = -ZMQ_BASE = \ No newline at end of file diff --git a/cpp_test_suite/makeprofiles/jenkins.profile b/cpp_test_suite/makeprofiles/jenkins.profile deleted file mode 100644 index eccff1de8..000000000 --- a/cpp_test_suite/makeprofiles/jenkins.profile +++ /dev/null @@ -1,54 +0,0 @@ -####################################################################################################################### -# -# Parameters explained (with examples): -# -# ! Assumption: all file names are unique ! -# -# Mandatory parameters: -# -# TANGO_BASE = /usr/local/tango - directory where Tango include and lib directories are stored -# TANGO_INCLUDE_DIR = /usr/local/tango/include/client /usr/local/tango/include/server... - if defined, takes precedence -# over the include directory located in TANGO_BASE; can contain more than one path -# TANGO_LIB_DIR = /usr/local/tango/lib - if defined, takes precedence over lib directory located in TANGO_BASE -# OMNI_BASE = /usr/local/omniORB - directory where omniORB include and lib directories are stored -# LOG4TANGO_BASE = /usr/local/log4tango - directory where log4tango include/tango and lib directories are stored -# ZMQ_BASE = /urs/local/zmq - directory where ZMQ include and lib directories are stored -# -# Optional parameters: -# -# TEST_DIRS = asyn event old_tests new_tests - directories where test suites (*.cpp and cxx_*.cpp) are located, all files in -# these directories will be compiled (see also EXCLUDE_FILES and COMPILE_FILES); default values as in the example -# TEST_DIRS_EXTRA = my_tests1 my_tests2... - extra directories to be scanned in search for test suites; can be used to -# add source directories to the default set of directories; default values - not set -# BIN_DIR = bin - directory where test suite binaries will be stored; default value as in the example -# OBJ_DIR = obj - directory where object files will be stored; default value as in the example -# -# EXCLUDE_FILES = runner.cpp compare_test.cpp - do not compile these files; default values as in the example -# COMPILE_FILES = file1.cpp file2.cpp file3.cpp... - compile only listed files; default values - not set -# ALWAYS_RECOMPILE_CXX = true - if set to true forces recompilation of the cxx test suite runner; useful when combined -# with COMPILE_FILES to select different cxx_ files to be incorporated in the runner, if ALWAYS_RECOMPILE_CXX -# not set runner executable will not recompile if it already exists; default values - not set -# SORT_ALPHABETICALLY_CXX = true - has a meaning only when COMPILE_FILES is set; if set to true the cxx_ files will be -# alphabetically sorted within the runner, otherwise the order defined by the user is kept; default values -# - not set -# -# CC = c++ - compiler; default value as in the example -# CXXFLAGS = -g -Wall -Wextra -DVALGRIND -D_PTHREADS -D_REENTRANT - compiler parameters; default values -# as in the example -# CXXFLAGS_EXTRA = -O... - extra compiler options, will be appended to CXXFLAGS; default values - not set -# -# LFLAGS_EXTRA = -static... - extra linker options; default values - not set -# -####################################################################################################################### - -EXCLUDE_FILES = 64.cpp helper.cpp -#COMPILE_FILES = cxx_blackbox.cpp - -TANGO_BASE = /segfs/tango/ci/Tango/$(OS) - -OMNI_BASE = /segfs/tango/ORB/omniORB4.2.1/$(OS) -LOG4TANGO_BASE = /segfs/tango/tools/log4tango-release/log4tango5.0.1/$(OS) -ZMQ_BASE = /segfs/tango/transport/zmq4.0.5/$(OS) - -BIN_DIR = $(TANGO_BASE)/bin - diff --git a/cpp_test_suite/makeprofiles/jenkins_no_mcast.profile b/cpp_test_suite/makeprofiles/jenkins_no_mcast.profile deleted file mode 100644 index 55b6a4358..000000000 --- a/cpp_test_suite/makeprofiles/jenkins_no_mcast.profile +++ /dev/null @@ -1,54 +0,0 @@ -####################################################################################################################### -# -# Parameters explained (with examples): -# -# ! Assumption: all file names are unique ! -# -# Mandatory parameters: -# -# TANGO_BASE = /usr/local/tango - directory where Tango include and lib directories are stored -# TANGO_INCLUDE_DIR = /usr/local/tango/include/client /usr/local/tango/include/server... - if defined, takes precedence -# over the include directory located in TANGO_BASE; can contain more than one path -# TANGO_LIB_DIR = /usr/local/tango/lib - if defined, takes precedence over lib directory located in TANGO_BASE -# OMNI_BASE = /usr/local/omniORB - directory where omniORB include and lib directories are stored -# LOG4TANGO_BASE = /usr/local/log4tango - directory where log4tango include/tango and lib directories are stored -# ZMQ_BASE = /urs/local/zmq - directory where ZMQ include and lib directories are stored -# -# Optional parameters: -# -# TEST_DIRS = asyn event old_tests new_tests - directories where test suites (*.cpp and cxx_*.cpp) are located, all files in -# these directories will be compiled (see also EXCLUDE_FILES and COMPILE_FILES); default values as in the example -# TEST_DIRS_EXTRA = my_tests1 my_tests2... - extra directories to be scanned in search for test suites; can be used to -# add source directories to the default set of directories; default values - not set -# BIN_DIR = bin - directory where test suite binaries will be stored; default value as in the example -# OBJ_DIR = obj - directory where object files will be stored; default value as in the example -# -# EXCLUDE_FILES = runner.cpp compare_test.cpp - do not compile these files; default values as in the example -# COMPILE_FILES = file1.cpp file2.cpp file3.cpp... - compile only listed files; default values - not set -# ALWAYS_RECOMPILE_CXX = true - if set to true forces recompilation of the cxx test suite runner; useful when combined -# with COMPILE_FILES to select different cxx_ files to be incorporated in the runner, if ALWAYS_RECOMPILE_CXX -# not set runner executable will not recompile if it already exists; default values - not set -# SORT_ALPHABETICALLY_CXX = true - has a meaning only when COMPILE_FILES is set; if set to true the cxx_ files will be -# alphabetically sorted within the runner, otherwise the order defined by the user is kept; default values -# - not set -# -# CC = c++ - compiler; default value as in the example -# CXXFLAGS = -g -Wall -Wextra -DVALGRIND -D_PTHREADS -D_REENTRANT - compiler parameters; default values -# as in the example -# CXXFLAGS_EXTRA = -O... - extra compiler options, will be appended to CXXFLAGS; default values - not set -# -# LFLAGS_EXTRA = -static... - extra linker options; default values - not set -# -####################################################################################################################### - -EXCLUDE_FILES = 64.cpp helper.cpp cxx_zmcast01_simple.cpp cxx_zmcast02_local_remote.cpp cxx_zmcast03_svr_local_remote.cpp -#COMPILE_FILES = cxx_blackbox.cpp - -TANGO_BASE = /segfs/tango/ci/Tango/$(OS) - -OMNI_BASE = /segfs/tango/ORB/omniORB4.2.1/$(OS) -LOG4TANGO_BASE = /segfs/tango/tools/log4tango-release/log4tango5.0.1/$(OS) -ZMQ_BASE = /segfs/tango/transport/zmq4.0.5/$(OS) - -BIN_DIR = $(TANGO_BASE)/bin - diff --git a/cpp_test_suite/makeprofiles/taurel.profile b/cpp_test_suite/makeprofiles/taurel.profile deleted file mode 100644 index 6385f6a8d..000000000 --- a/cpp_test_suite/makeprofiles/taurel.profile +++ /dev/null @@ -1,62 +0,0 @@ -####################################################################################################################### -# -# Parameters explained (with examples): -# -# ! Assumption: all file names are unique ! -# -# Mandatory parameters: -# -# TANGO_BASE = /usr/local/tango - directory where Tango include and lib directories are stored -# TANGO_INCLUDE_DIR = /usr/local/tango/include/client /usr/local/tango/include/server... - if defined, takes precedence -# over the include directory located in TANGO_BASE; can contain more than one path -# TANGO_LIB_DIR = /usr/local/tango/lib - if defined, takes precedence over lib directory located in TANGO_BASE -# OMNI_BASE = /usr/local/omniORB - directory where omniORB include and lib directories are stored -# LOG4TANGO_BASE = /usr/local/log4tango - directory where log4tango include/tango and lib directories are stored -# ZMQ_BASE = /urs/local/zmq - directory where ZMQ include and lib directories are stored -# -# Optional parameters: -# -# TEST_DIRS = asyn event old_tests new_tests - directories where test suites (*.cpp and cxx_*.cpp) are located, all files in -# these directories will be compiled (see also EXCLUDE_FILES and COMPILE_FILES); default values as in the example -# TEST_DIRS_EXTRA = my_tests1 my_tests2... - extra directories to be scanned in search for test suites; can be used to -# add source directories to the default set of directories; default values - not set -# BIN_DIR = bin - directory where test suite binaries will be stored; default value as in the example -# OBJ_DIR = obj - directory where object files will be stored; default value as in the example -# -# EXCLUDE_FILES = runner.cpp compare_test.cpp - do not compile these files; default values as in the example -# COMPILE_FILES = file1.cpp file2.cpp file3.cpp... - compile only listed files; default values - not set -# ALWAYS_RECOMPILE_CXX = true - if set to true forces recompilation of the cxx test suite runner; useful when combined -# with COMPILE_FILES to select different cxx_ files to be incorporated in the runner, if ALWAYS_RECOMPILE_CXX -# not set runner executable will not recompile if it already exists; default values - not set -# SORT_ALPHABETICALLY_CXX = true - has a meaning only when COMPILE_FILES is set; if set to true the cxx_ files will be -# alphabetically sorted within the runner, otherwise the order defined by the user is kept; default values -# - not set -# -# CC = c++ - compiler; default value as in the example -# CXXFLAGS = -g -Wall -Wextra -DVALGRIND -D_PTHREADS -D_REENTRANT - compiler parameters; default values -# as in the example -# CXXFLAGS_EXTRA = -O... - extra compiler options, will be appended to CXXFLAGS; default values - not set -# -# LFLAGS_EXTRA = -static... - extra linker options; default values - not set -# -####################################################################################################################### - -EXCLUDE_FILES = 64.cpp helper.cpp zmcast01_simple.cpp zmcast02_local_remote.cpp zmcast03_svr_local_remote.cpp -#COMPILE_FILES = pipe_event.cpp -#COMPILE_FILES = add_rem_attr.cpp -#COMPILE_FILES = cxx_zmcast01_simple.cpp zmcast02_local_remote.cpp zmcast03_svr_local_remote.cpp -#COMPILE_FILES = cxx_fwd_att.cpp -#COMPILE_FILES = cxx_svr_mcast_local_remote.cpp -#COMPILE_FILES = att_type_event.cpp - -OS_DIR = ubuntu1404 - -TANGO_BASE = /home/taurel/tango/cppapi_900 -TANGO_INCLUDE_DIR = $(TANGO_BASE)/client $(TANGO_BASE)/server -TANGO_LIB_DIR = $(TANGO_BASE)/../install/$(OS_DIR)/lib/debug - -OMNI_BASE = /segfs/tango/ORB/omniORB4.2.1/$(OS_DIR) -LOG4TANGO_BASE = /segfs/tango/tools/log4tango-release/log4tango5.0.1/$(OS_DIR) -ZMQ_BASE = /segfs/tango/transport/zmq4.0.5/$(OS_DIR) - - diff --git a/cpp_test_suite/makeprofiles/trogucki.profile b/cpp_test_suite/makeprofiles/trogucki.profile deleted file mode 100644 index ea4cff227..000000000 --- a/cpp_test_suite/makeprofiles/trogucki.profile +++ /dev/null @@ -1,57 +0,0 @@ -####################################################################################################################### -# -# Parameters explained (with examples): -# -# ! Assumption: all file names are unique ! -# -# Mandatory parameters: -# -# TANGO_BASE = /usr/local/tango - directory where Tango include and lib directories are stored -# TANGO_INCLUDE_DIR = /usr/local/tango/include/client /usr/local/tango/include/server... - if defined, takes precedence -# over the include directory located in TANGO_BASE; can contain more than one path -# TANGO_LIB_DIR = /usr/local/tango/lib - if defined, takes precedence over lib directory located in TANGO_BASE -# OMNI_BASE = /usr/local/omniORB - directory where omniORB include and lib directories are stored -# LOG4TANGO_BASE = /usr/local/log4tango - directory where log4tango include/tango and lib directories are stored -# ZMQ_BASE = /urs/local/zmq - directory where ZMQ include and lib directories are stored -# -# Optional parameters: -# -# TEST_DIRS = asyn event old_tests new_tests - directories where test suites (*.cpp and cxx_*.cpp) are located, all files in -# these directories will be compiled (see also EXCLUDE_FILES and COMPILE_FILES); default values as in the example -# TEST_DIRS_EXTRA = my_tests1 my_tests2... - extra directories to be scanned in search for test suites; can be used to -# add source directories to the default set of directories; default values - not set -# BIN_DIR = bin - directory where test suite binaries will be stored; default value as in the example -# OBJ_DIR = obj - directory where object files will be stored; default value as in the example -# -# EXCLUDE_FILES = runner.cpp compare_test.cpp - do not compile these files; default values as in the example -# COMPILE_FILES = file1.cpp file2.cpp file3.cpp... - compile only listed files; default values - not set -# ALWAYS_RECOMPILE_CXX = true - if set to true forces recompilation of the cxx test suite runner; useful when combined -# with COMPILE_FILES to select different cxx_ files to be incorporated in the runner, if ALWAYS_RECOMPILE_CXX -# not set runner executable will not recompile if it already exists; default values - not set -# SORT_ALPHABETICALLY_CXX = true - has a meaning only when COMPILE_FILES is set; if set to true the cxx_ files will be -# alphabetically sorted within the runner, otherwise the order defined by the user is kept; default values -# - not set -# -# CC = c++ - compiler; default value as in the example -# CXXFLAGS = -g -Wall -Wextra -DVALGRIND -D_PTHREADS -D_REENTRANT - compiler parameters; default values -# as in the example -# CXXFLAGS_EXTRA = -O... - extra compiler options, will be appended to CXXFLAGS; default values - not set -# -# LFLAGS_EXTRA = -static... - extra linker options; default values - not set -# -####################################################################################################################### - -EXCLUDE_FILES = cxx_attprop.cpp #att_conf.cpp #64.cpp helper.cpp cxx_group.cpp -COMPILE_FILES = cxx_attrprop.cpp #cxx_mcast_simple.cpp #attr_misc.cpp cxx_just_test.cpp #cxx_param_test.cpp # #cxx_blackbox.cpp #cxx_syntax.cpp cxx_attr.cpp #cxx_attprop.cpp -#SORT_ALPHABETICALLY_CXX = TRUE -ALWAYS_RECOMPILE_CXX = true -TEST_DIRS = new_tests old_tests - -BIN_DIR = bin -OBJ_DIR = obj -TANGO_BASE = /home/trogucki/local/tango/8.1.0 -TANGO_INCLUDE_DIR = /home/trogucki/workspace/cppapi_NextRelease/client /home/trogucki/workspace/cppapi_NextRelease/server -TANGO_LIB_DIR = /home/trogucki/local/tango/8.1.0/lib/debug -OMNI_BASE = /home/trogucki/local/omniORB -LOG4TANGO_BASE = /home/trogucki/local/log4tango -ZMQ_BASE = /home/trogucki/local/zmq \ No newline at end of file diff --git a/cpp_test_suite/old_tests/poll_attr.cpp b/cpp_test_suite/old_tests/poll_attr.cpp deleted file mode 100644 index 3733913ee..000000000 --- a/cpp_test_suite/old_tests/poll_attr.cpp +++ /dev/null @@ -1,172 +0,0 @@ -/* - * example of a client using the TANGO device api. - */ - -#include -#include - -#define coutv if (verbose == true) cout - -using namespace Tango; -using namespace std; - -bool verbose = false; - -int main(int argc, char **argv) -{ - DeviceProxy *device; - - if (argc == 1) - { - cout << "usage: %s device [-v]" << endl; - exit(-1); - } - - string device_name = argv[1]; - - if (argc == 3) - { - if (strcmp(argv[2],"-v") == 0) - verbose = true; - } - - try - { - device = new DeviceProxy(device_name); - } - catch (CORBA::Exception &e) - { - Except::print_exception(e); - exit(1); - } - - coutv << endl << "new DeviceProxy(" << device->name() << ") returned" << endl << endl; - - try - { - - device->set_source(Tango::CACHE); - -// Test getting a long 64 attribute from polling buffer - - DeviceAttribute da; - int data_type; - - try - { - da = device->read_attribute("Long64_attr_rw"); - } - catch (CORBA::Exception &e) - { - Except::print_exception(e); - exit(-1); - } - DevLong64 lo; - da >> lo; - data_type = da.get_type(); - coutv << "64 bits attribute data = " << hex << lo << dec << endl; - assert ( lo == 0x800000000LL ); - assert ( data_type == Tango::DEV_LONG64 ); - - cout << " Scalar long 64 bits from CACHE buffer --> OK" << endl; - -// Test getting a unsigned long 64 bits attribute from polling buffer - - DeviceAttribute da_ulo; - try - { - da_ulo = device->read_attribute("ULong64_attr_rw"); - } - catch (CORBA::Exception &e) - { - Except::print_exception(e); - exit(-1); - } - DevULong64 ulo; - da_ulo >> ulo; - int data_type_ulo = da_ulo.get_type(); - coutv << "unsigned 64 bits attribute data = " << hex << ulo << dec << endl; - assert ( ulo == 0xC000000000000000LL ); - assert ( data_type_ulo == Tango::DEV_ULONG64 ); - - cout << " Scalar unsigned long 64 bits from CACHE buffer --> OK" << endl; - -// Test getting a unsigned long spectrum attribute from polling buffer - - bool ret; - try - { - da = device->read_attribute("ULong_spec_attr_rw"); - } - catch (CORBA::Exception &e) - { - Except::print_exception(e); - exit(-1); - } - vector v_lo; - ret = (da >> v_lo); - - assert (ret == true); - assert ( v_lo[0] == 2222 ); - assert ( v_lo[1] == 22222 ); - assert ( v_lo[2] == 222222 ); - - cout << " Spectrum unsigned long from CACHE buffer --> OK" << endl; - -// Test getting a state spectrum attribute from polling buffer - - try - { - da = device->read_attribute("State_spec_attr_rw"); - } - catch (CORBA::Exception &e) - { - Except::print_exception(e); - exit(-1); - } - vector v_sta; - ret = (da >> v_sta); - - assert (ret == true); - assert ( v_sta[0] == Tango::ON ); - assert ( v_sta[1] == Tango::OFF ); - - cout << " Spectrum state from CACHE buffer --> OK" << endl; - -// Test getting a DevEncoded attribute from polling buffer - -#ifndef COMPAT - try - { - da = device->read_attribute("Encoded_attr"); - } - catch (CORBA::Exception &e) - { - Except::print_exception(e); - exit(-1); - } - - DevEncoded enc_lo; - da >> enc_lo; - data_type = da.get_type(); - assert ( ::strcmp(enc_lo.encoded_format.in(),"Which format?") == 0 ); - assert ( data_type == Tango::DEV_ENCODED ); - assert ( enc_lo.encoded_data.length() == 4 ); - assert ( enc_lo.encoded_data[0] == 97 ); - assert ( enc_lo.encoded_data[1] == 98 ); - assert ( enc_lo.encoded_data[2] == 99 ); - assert ( enc_lo.encoded_data[3] == 100 ); - - cout << " DevEncoded attribute from CACHE buffer --> OK" << endl; -#endif - - } - catch (Tango::DevFailed &e) - { - Except::print_exception(e); - exit(-1); - } - - delete device; - return 0; -} diff --git a/cpp_test_suite/old_tests/poll_met.cpp b/cpp_test_suite/old_tests/poll_met.cpp deleted file mode 100644 index 87f2bff3b..000000000 --- a/cpp_test_suite/old_tests/poll_met.cpp +++ /dev/null @@ -1,450 +0,0 @@ -/* - * example of a client using the TANGO device api. - */ - -#include -#include - -#ifndef COMPAT -#define BASIC_NB_POLL 16 -#else -#define BASIC_NB_POLL 14 -#endif - -using namespace Tango; -using namespace std; - -int main(int argc, char **argv) -{ - DeviceProxy *device,*device1; - - if (argc != 4) - { - cout << "usage: poll_met " << endl; - exit(-1); - } - - string device_name = argv[1]; - string device2_name = argv[2]; - string alias_name = argv[3]; - bool print = false; - - if (argc == 2) - { - string verb = argv[1]; - if (verb != "-v") - { - cout << "Usage: %s [-v]" << endl; - exit(-1); - } - else - print = true; - } - - try - { - device = new DeviceProxy(device_name); - } - catch (CORBA::Exception &e) - { - Except::print_exception(e); - exit(1); - } - - cout << endl << "new DeviceProxy(" << device->name() << ") returned" << endl << endl; - - try - { - -// Test polling_status from device name - - vector *poll_str; - poll_str = device->polling_status(); - - unsigned long nb_polled = BASIC_NB_POLL; - for (unsigned int i = 0;i < poll_str->size();i++) - { - if ((*poll_str)[i].find("String_attr") != string::npos) - { - nb_polled++; - } - if ((*poll_str)[i].find("IOStartPoll") != string::npos) - { - nb_polled++; - } - } - - if (print == true) - { - cout << poll_str->size() << " object(s) polled for device" << endl; - cout << endl; - for (unsigned int i = 0;i < poll_str->size();i++) - cout << "Polling status = " << (*poll_str)[i] << endl; - cout << endl; - } - - assert (poll_str->size() == nb_polled ); - - delete poll_str; - - device1 = new DeviceProxy(device2_name); - poll_str = device1->polling_status(); - - if (print == true) - { - cout << poll_str->size() << " object(s) polled for device" << endl; - cout << endl; - for (unsigned int i = 0;i < poll_str->size();i++) - cout << "Polling status = " << (*poll_str)[i] << endl; - cout << endl; - } - - assert (poll_str->size() == 0); - delete poll_str; - - delete device1; - -// Test polling status from alias name - - string adm_name = device->adm_name(); - DeviceProxy *admin_dev = new DeviceProxy(adm_name); - - DeviceData d_send,d_received; - d_send << alias_name; - d_received = admin_dev->command_inout("DevPollStatus",d_send); - vector v_str; - d_received >> v_str; - - nb_polled = BASIC_NB_POLL; - for (unsigned int i = 0;i < v_str.size();i++) - { - if (v_str[i].find("String_attr") != string::npos) - { - nb_polled++; - continue; - } - if (v_str[i].find("IOStartPoll") != string::npos) - { - nb_polled++; - } - } - - if (print == true) - { - cout << v_str.size() << " object(s) polled for device" << endl; - cout << endl; - for (unsigned int i = 0;i < v_str.size();i++) - cout << "Polling status = " << v_str[i] << endl; - cout << endl; - } - - assert ( v_str.size() == nb_polled); - - cout << " Polling_status (from device name and alias) --> OK" << endl; - -// Test get_command_poll_period - - string cmd("IOExcept"); - int per = device->get_command_poll_period(cmd); - - if (print == true) - { - cout << "Cmd " << cmd << " polling period = " << per << endl; - } - - assert( per == 2000 ); - - string attr("PollLong_attr"); - per = device->get_attribute_poll_period(attr); - - if (print == true) - cout << "Attr " << attr << " polling period = " << per << endl; - - assert ( per == 1000 ); - - cout << " Get polling period (cmd and attr) --> OK" << endl; - -// Test poll_command - - cmd = ("IOArray1"); - bool poll = device->is_command_polled(cmd); - - assert( poll == false ); - - device->poll_command(cmd,3000); - poll = device->is_command_polled(cmd); - - assert ( poll == true ); - - per = device->get_command_poll_period(cmd); - - assert (per == 3000 ); - -#ifdef WIN32 - Sleep(3000); -#else - sleep(3); -#endif - - device->poll_command(cmd,5000); - per = device->get_command_poll_period(cmd); - - assert ( per == 5000 ); - -#ifdef WIN32 - Sleep(3000); -#else - sleep(3); -#endif - poll_str = device->polling_status(); - - if (print == true) - { - cout << poll_str->size() << " object(s) polled for device" << endl; - cout << endl; - for (unsigned int i = 0;i < poll_str->size();i++) - cout << "Polling status = " << (*poll_str)[i] << endl; - cout << endl; - } - - nb_polled = BASIC_NB_POLL + 1; - for (unsigned int i = 0;i < poll_str->size();i++) - { - if ((*poll_str)[i].find("String_attr") != string::npos) - { - nb_polled++; - } - if ((*poll_str)[i].find("IOStartPoll") != string::npos) - { - nb_polled++; - } - } - - assert ( poll_str->size() == nb_polled); - - delete poll_str; - - cout << " Poll command method --> OK" << endl; - -// Test min polling period -// -// WARNING, this test works only if device property min_poll_period set to 200 -// and cmd_min_poll_period set to IOExcept,500 -// - - bool except = false; - try - { - device->poll_command("IOExcept",300); - } - catch (Tango::DevFailed &) - { - except = true; - } - - assert (except == true); - except = false; - - string prop_name("cmd_min_poll_period"); - device->delete_property(prop_name); - - try - { - device->poll_command("IOExcept",100); - } - catch (Tango::DevFailed &) - { - except = true; - } - - assert (except == true); - except = false; - - try - { - device->poll_command("IOExcept",500); - } - catch (Tango::DevFailed e) - { - except = true; - } - - assert (except = true); - except = false; - -#ifdef WIN32 - Sleep(3000); -#else - sleep(3); -#endif - - try - { - device->poll_command("IOExcept",2000); - } - catch (Tango::DevFailed &) - { - except = true; - } - - assert (except == false); - - DbData db; - vector prop_vs; - prop_vs.push_back("IOExcept"); - prop_vs.push_back("500"); - db.push_back(DbDatum("cmd_min_poll_period")); - db[0] << prop_vs; - device->put_property(db); - - cout << " min polling period management --> OK" << endl; - -// Test stop_poll_command - - device->stop_poll_command(cmd); - - poll = device->is_command_polled(cmd); - - assert ( poll == false ); - - poll_str = device->polling_status(); - - if (print == true) - { - cout << poll_str->size() << " object(s) polled for device" << endl; - cout << endl; - for (unsigned int i = 0;i < poll_str->size();i++) - cout << "Polling status = " << (*poll_str)[i] << endl; - cout << endl; - } - - nb_polled = BASIC_NB_POLL; - for (unsigned int i = 0;i < poll_str->size();i++) - { - if ((*poll_str)[i].find("String_attr") != string::npos) - { - nb_polled++; - } - if ((*poll_str)[i].find("IOStartPoll") != string::npos) - { - nb_polled++; - } - } - - assert ( poll_str->size() == nb_polled); - - delete poll_str; - - cout << " Stop poll command method --> OK" << endl; - -// Test poll_attribute - - attr = ("Double_attr"); - poll = device->is_attribute_polled(attr); - - assert( poll == false ); - - device->poll_attribute(attr,3000); - poll = device->is_attribute_polled(attr); - - assert ( poll == true ); - - per = device->get_attribute_poll_period(attr); - - assert (per == 3000 ); - -#ifdef WIN32 - Sleep(3000); -#else - sleep(3); -#endif - - device->poll_attribute(attr,5000); - per = device->get_attribute_poll_period(attr); - - assert ( per == 5000 ); - -#ifdef WIN32 - Sleep(3000); -#else - sleep(3); -#endif - - poll_str = device->polling_status(); - - if (print == true) - { - cout << poll_str->size() << " object(s) polled for device" << endl; - cout << endl; - for (unsigned int i = 0;i < poll_str->size();i++) - cout << "Polling status = " << (*poll_str)[i] << endl; - cout << endl; - } - - nb_polled = BASIC_NB_POLL + 1; - for (unsigned int i = 0;i < poll_str->size();i++) - { - if ((*poll_str)[i].find("String_attr") != string::npos) - { - nb_polled++; - } - if ((*poll_str)[i].find("IOStartPoll") != string::npos) - { - nb_polled++; - } - } - - assert ( poll_str->size() == nb_polled); - - delete poll_str; - - cout << " Poll attribute method --> OK" << endl; - -// Test stop_poll_command - - device->stop_poll_attribute(attr); - - poll = device->is_attribute_polled(attr); - - assert ( poll == false ); - - poll_str = device->polling_status(); - - if (print == true) - { - cout << poll_str->size() << " object(s) polled for device" << endl; - cout << endl; - for (unsigned int i = 0;i < poll_str->size();i++) - cout << "Polling status = " << (*poll_str)[i] << endl; - cout << endl; - } - - nb_polled = BASIC_NB_POLL; - for (unsigned int i = 0;i < poll_str->size();i++) - { - if ((*poll_str)[i].find("String_attr") != string::npos) - { - nb_polled++; - } - if ((*poll_str)[i].find("IOStartPoll") != string::npos) - { - nb_polled++; - } - } - - assert ( poll_str->size() == nb_polled); - - delete poll_str; - - cout << " Stop poll attribute method --> OK" << endl; - } - catch (Tango::DevFailed &e) - { - Except::print_exception(e); - exit(-1); - } - - - delete device; - return 0; -} diff --git a/cpp_test_suite/old_tests/poll_pool.cpp b/cpp_test_suite/old_tests/poll_pool.cpp deleted file mode 100644 index 1e63d08bf..000000000 --- a/cpp_test_suite/old_tests/poll_pool.cpp +++ /dev/null @@ -1,315 +0,0 @@ -/* - * example of a client using the TANGO device api. - */ - -#include -#include - -#define coutv if (verbose == true) cout - -using namespace Tango; -using namespace std; - -bool verbose = false; - -#define TEST_CLASS "devTest" - -void split_string(string &,char,vector &); -void reset_device_server(Database *,vector &,string &,DeviceProxy *,string &,DeviceProxy *); -void del_device_no_error(Database *,const char *); - -int main(int argc, char **argv) -{ - if (argc != 4) - { - cout << "usage: %s device1 device2 inst_name [-v]" << endl; - exit(-1); - } - - string device_name1 = argv[1]; - string device_name2 = argv[2]; - string inst_name = argv[3]; - - vector ref_polling_pool_conf; - string admin_dev_name("dserver/"); - Database *db = new Database(); - DeviceProxy *admin_dev = NULL; - DeviceProxy *dev2 = NULL; - - try - { - -// First poll device 2 - - dev2 = new DeviceProxy(device_name2); - dev2->poll_attribute("PollLong_attr",1000); - - Tango_sleep(2); - -// Get a reference polling thread pool - - DeviceProxy dev(device_name1); - DeviceData dd; - - dd = dev.command_inout("PollingPoolTst"); - vector polled_devs; - - dd >> ref_polling_pool_conf; - split_string(ref_polling_pool_conf[0],',',polled_devs); - int nb_polled_devs = polled_devs.size(); - -// Add a device into device server and restart it -// Also add property to poll one of the device attribute - - DbDevInfo my_device_info; - string new_dev("test/"); - new_dev = new_dev + inst_name + "/77"; - - my_device_info.name = new_dev.c_str(); - my_device_info._class = TEST_CLASS; - string serv_name(TEST_CLASS); - serv_name = serv_name + '/' + inst_name; - my_device_info.server = serv_name.c_str(); - - db->add_device(my_device_info); - - DbDatum poll_prop("polled_attr"); - vector poll_param; - poll_param.push_back("PollLong_attr"); - poll_param.push_back("1000"); - poll_prop << poll_param; - DbData db_poll; - db_poll.push_back(poll_prop); - db->put_device_property(new_dev.c_str(),db_poll); - - admin_dev_name = admin_dev_name + serv_name; - - admin_dev = new DeviceProxy(admin_dev_name); - admin_dev->command_inout("RestartServer"); - - Tango_sleep(5); - -// Read polling threads pool conf once more - - DeviceData da; - - da = dev.command_inout("PollingPoolTst"); - vector new_polling_pool_conf; - da >> new_polling_pool_conf; - - assert (ref_polling_pool_conf.size() == new_polling_pool_conf.size()); - split_string(new_polling_pool_conf[0],',',polled_devs); - int new_nb_polled_devs = polled_devs.size(); - - assert (new_nb_polled_devs == nb_polled_devs + 1); - vector::iterator iter; - iter = find(polled_devs.begin(),polled_devs.end(),new_dev); - - assert (iter != polled_devs.end()); - - cout << " Add one device to a polling thread pool with 1 thread --> OK" << endl; - -// Change polling thread number and add 2 more devices - - string new_dev1_th2 = "test/"; - new_dev1_th2 = new_dev1_th2 + inst_name + "/800"; - - my_device_info.name = new_dev1_th2.c_str(); - db->add_device(my_device_info); - - string new_dev2_th2 = "test/"; - new_dev2_th2 = new_dev2_th2 + inst_name + "/801"; - - my_device_info.name = new_dev2_th2.c_str(); - db->add_device(my_device_info); - - DbDatum pool_size("polling_threads_pool_size"); - DbData db_data; - - pool_size << 2L; - db_data.push_back(pool_size); - db->put_device_property(admin_dev_name.c_str(),db_data); - - db->put_device_property(new_dev1_th2.c_str(),db_poll); - db->put_device_property(new_dev2_th2.c_str(),db_poll); - - admin_dev->command_inout("RestartServer"); - - Tango_sleep(5); - -// Check new pool conf - - DeviceData dz; - - dz = dev.command_inout("PollingPoolTst"); - dz >> new_polling_pool_conf; - - assert (new_polling_pool_conf.size() == ref_polling_pool_conf.size() + 1); - split_string(new_polling_pool_conf[1],',',polled_devs); - new_nb_polled_devs = polled_devs.size(); - - assert (new_nb_polled_devs == 2); - - iter = find(polled_devs.begin(),polled_devs.end(),new_dev1_th2); - assert (iter != polled_devs.end()); - - iter = find(polled_devs.begin(),polled_devs.end(),new_dev2_th2); - assert (iter != polled_devs.end()); - - cout << " Add two other devices to the polling threads pool with now 2 threads --> OK" << endl; - -// Change polling thread number to 3 and add 1 more device - - string new_dev1_th3 = "test/"; - new_dev1_th3 = new_dev1_th3 + inst_name + "/9000"; - - my_device_info.name = new_dev1_th3.c_str(); - db->add_device(my_device_info); - - DbDatum pool_size3("polling_threads_pool_size"); - DbData db_data3; - - pool_size3 << 3L; - db_data3.push_back(pool_size3); - db->put_device_property(admin_dev_name.c_str(),db_data3); - - db->put_device_property(new_dev1_th3.c_str(),db_poll); - - admin_dev->command_inout("RestartServer"); - - Tango_sleep(5); - -// Check new pool conf - - DeviceData dx; - - dx = dev.command_inout("PollingPoolTst"); - dx >> new_polling_pool_conf; - - assert (new_polling_pool_conf.size() == ref_polling_pool_conf.size() + 2); - split_string(new_polling_pool_conf[2],',',polled_devs); - new_nb_polled_devs = polled_devs.size(); - - assert (new_nb_polled_devs == 1); - - iter = find(polled_devs.begin(),polled_devs.end(),new_dev1_th3); - assert (iter != polled_devs.end()); - - cout << " Add one device to the polling threads pool with now 3 threads --> OK" << endl; - -// Delete one device to check automatic polling pool re-configuration - - db->delete_device(new_dev1_th3); - - admin_dev->command_inout("RestartServer"); - - Tango_sleep(5); - -// Check pool conf - - DeviceData dv; - - dv = dev.command_inout("PollingPoolTst"); - dv >> new_polling_pool_conf; - - assert (new_polling_pool_conf.size() == ref_polling_pool_conf.size() + 1); - split_string(new_polling_pool_conf[1],',',polled_devs); - new_nb_polled_devs = polled_devs.size(); - - assert (new_nb_polled_devs == 2); - - iter = find(polled_devs.begin(),polled_devs.end(),new_dev1_th2); - assert (iter != polled_devs.end()); - - iter = find(polled_devs.begin(),polled_devs.end(),new_dev2_th2); - assert (iter != polled_devs.end()); - - cout << " Automatic polling threads pool reconfig after device removal --> OK" << endl; - - reset_device_server(db,ref_polling_pool_conf,admin_dev_name,admin_dev,inst_name,dev2); - } - catch (Tango::DevFailed &e) - { - Except::print_exception(e); - reset_device_server(db,ref_polling_pool_conf,admin_dev_name,admin_dev,inst_name,dev2); - exit(-1); - } - - delete db; - delete admin_dev; - delete dev2; - return 0; -} - -// -// Split a string according to a delimiter character -// - -void split_string(string &the_str,char delim,vector &splitted_str) -{ - string::size_type pos,start; - splitted_str.clear(); - - start = 0; - while ((pos = the_str.find(delim,start)) != string::npos) - { - splitted_str.push_back(the_str.substr(start,pos - start)); - start = pos + 1; - } - - splitted_str.push_back(the_str.substr(start)); -} - - -void del_device_no_error(Database *db,const char *d_name) -{ - try - { - db->delete_device(d_name); - } - catch (DevFailed &) {} -} - -// -// Reset device server to default conf -// - -void reset_device_server(Database *db,vector &polling_pool_conf,string &admin_dev_name,DeviceProxy *adm_dev,string &inst_name,DeviceProxy *dev2) -{ - string base_name("test/"); - base_name = base_name + inst_name; - - string dev_name = base_name + "/77"; - del_device_no_error(db,dev_name.c_str()); - - dev_name = base_name + "/800"; - del_device_no_error(db,dev_name.c_str()); - - dev_name = base_name + "/801"; - del_device_no_error(db,dev_name.c_str()); - - dev_name = base_name + "/9000"; - del_device_no_error(db,dev_name.c_str()); - - DbDatum pool_conf("polling_threads_pool_conf"); - DbData db_data; - - pool_conf << polling_pool_conf; - db_data.push_back(pool_conf); - db->put_device_property(admin_dev_name.c_str(),db_data); - - DbDatum del_prop("polling_threads_pool_size"); - db_data.clear(); - db_data.push_back(del_prop); - db->delete_device_property(admin_dev_name.c_str(),db_data); - - try - { - dev2->stop_poll_attribute("PollLong_attr"); - } - catch(DevFailed &) {} - - adm_dev->command_inout("RestartServer"); - - Tango_sleep(3); -} diff --git a/cpp_test_suite/old_tests/read_hist.cpp b/cpp_test_suite/old_tests/read_hist.cpp deleted file mode 100644 index 7faa4c94b..000000000 --- a/cpp_test_suite/old_tests/read_hist.cpp +++ /dev/null @@ -1,657 +0,0 @@ -/* - * example of a client using the TANGO device api. - */ - -#include -#include - -#include - -typedef enum -{ - FIRST_EXCEPT = 0, - SECOND_EXCEPT, - FIRST_DATA, - SECOND_DATA -}AttrResult; - -typedef enum -{ - EXCEPT = 0, - FIRST_STR, - SECOND_STR -}CmdResult; - -using namespace Tango; -using namespace std; - -int main(int argc, char **argv) -{ - DeviceProxy *device; - - if (argc < 2) - { - cout << "usage: %s device [-v]" << endl; - exit(-1); - } - - string device_name = argv[1]; - bool print = false; - - if (argc == 3) - { - string verb = argv[2]; - if (verb != "-v") - { - cout << "Usage: %s device [-v]" << endl; - exit(-1); - } - else - print = true; - } - - try - { - device = new DeviceProxy(device_name); - } - catch (CORBA::Exception &e) - { - Except::print_exception(e); - exit(1); - } - - cout << endl << "new DeviceProxy(" << device->name() << ") returned" << endl << endl; - - unsigned int i; - vector *d_hist; - - try - { - -// Test command_history (for strings) - - int hist_depth = 10; - d_hist = device->command_history("IOPollStr1",hist_depth); - - if (d_hist->size() < 4) - { - cout << "Not enought data in polling buffer, restart later" << endl; - exit(-1); - } - - CmdResult cr; - - if ((*d_hist)[0].has_failed() == true) - { - cr = EXCEPT; - } - else - { - string str; - (*d_hist)[0] >> str; - if (str[0] == 'E') - cr = FIRST_STR; - else - cr = SECOND_STR; - } - - for (i = 0;i < d_hist->size();i++) - { - string str; - if ((*d_hist)[i].has_failed() == false) - (*d_hist)[i] >> str; - - if (print == true) - { - cout << "Command failed = " << (*d_hist)[i].has_failed() << endl; - if ((*d_hist)[i].has_failed() == false) - { - (*d_hist)[i] >> str; - cout << "Value = " << str << endl; - } - TimeVal &t = (*d_hist)[i].get_date(); - cout << "Date : " << t.tv_sec << " sec, " << t.tv_usec << " usec" << endl; - cout << "Error stack depth = " << (*d_hist)[i].get_err_stack().length() << endl; - cout << endl; - } - } - - DevErrorList del; - string simple_str; - - switch(cr) - { - case EXCEPT: - assert( (*d_hist)[0].has_failed() == true); - assert( (*d_hist)[0].get_err_stack().length() == 1); - del = (*d_hist)[0].get_err_stack(); - assert( ::strcmp(del[0].desc.in(),"www") == 0); - - (*d_hist)[1] >> simple_str; - assert( (*d_hist)[1].has_failed() == false); - assert( (*d_hist)[1].get_err_stack().length() == 0); - assert( simple_str == "Even value from IOPollStr1"); - - (*d_hist)[2] >> simple_str; - assert( (*d_hist)[2].has_failed() == false); - assert( (*d_hist)[2].get_err_stack().length() == 0); - assert( simple_str == "Odd value from IOPollStr1"); - break; - - case FIRST_STR: - (*d_hist)[0] >> simple_str; - assert( (*d_hist)[0].has_failed() == false); - assert( (*d_hist)[0].get_err_stack().length() == 0); - assert( simple_str == "Even value from IOPollStr1"); - - (*d_hist)[1] >> simple_str; - assert( (*d_hist)[1].has_failed() == false); - assert( (*d_hist)[1].get_err_stack().length() == 0); - assert( simple_str == "Odd value from IOPollStr1"); - - assert( (*d_hist)[2].has_failed() == true); - assert( (*d_hist)[2].get_err_stack().length() == 1); - del = (*d_hist)[2].get_err_stack(); - assert( ::strcmp(del[0].desc.in(),"www") == 0); - break; - - case SECOND_STR: - (*d_hist)[0] >> simple_str; - assert( (*d_hist)[0].has_failed() == false); - assert( (*d_hist)[0].get_err_stack().length() == 0); - assert( simple_str == "Odd value from IOPollStr1"); - - assert( (*d_hist)[1].has_failed() == true); - assert( (*d_hist)[1].get_err_stack().length() == 1); - del = (*d_hist)[1].get_err_stack(); - assert( ::strcmp(del[0].desc.in(),"www") == 0); - - (*d_hist)[2] >> simple_str; - assert( (*d_hist)[2].has_failed() == false); - assert( (*d_hist)[2].get_err_stack().length() == 0); - assert( simple_str == "Even value from IOPollStr1"); - break; - } - - delete d_hist; - - cout << " Read command history (string) --> OK" << endl; - -// Test command_history (array) - - d_hist = device->command_history("IOPollArray2",hist_depth); - - if (d_hist->size() < 4) - { - cout << "Not enought data in polling buffer, retry later" << endl; - exit(-1); - } - - short first_val_first_rec; - for (i = 0;i < d_hist->size();i++) - { - vector vect; - (*d_hist)[i] >> vect; - - if (print == true) - { - cout << "Command failed = " << (*d_hist)[i].has_failed() << endl; - cout << "Value 0 = " << vect[0] << ", Value 1 = " << vect[1] << endl; - TimeVal &t = (*d_hist)[i].get_date(); - cout << "Date : " << t.tv_sec << " sec, " << t.tv_usec << " usec" << endl; - cout << "Error stack depth = " << (*d_hist)[i].get_err_stack().length() << endl; - cout << endl; - } - - if (i == 0) - first_val_first_rec = vect[0]; - - assert( (*d_hist)[i].has_failed() == false); - assert( (*d_hist)[i].get_err_stack().length() == 0); - if (i != 0) - { - if (first_val_first_rec == 100) - { - if ((i % 2) == 0) - { - assert( vect[0] == 100 ); - assert( vect[1] == 200 ); - } - else - { - assert( vect[0] == 300 ); - assert( vect[1] == 400 ); - } - } - else - { - if ((i % 2) == 0) - { - assert( vect[0] == 300); - assert( vect[1] == 400); - } - else - { - assert( vect[0] == 100 ); - assert( vect[1] == 200 ); - } - } - } - } - delete d_hist; - - cout << " Read command history (array) --> OK" << endl; - -// Test command_history with exception - - d_hist = device->command_history("IOExcept",hist_depth); - - for (i = 0;i < d_hist->size();i++) - { - if (print == true) - { - cout << "Command failed = " << (*d_hist)[i].has_failed() << endl; - TimeVal &t = (*d_hist)[i].get_date(); - cout << "Date : " << t.tv_sec << " sec, " << t.tv_usec << " usec" << endl; - cout << "Error stack depth = " << (*d_hist)[i].get_err_stack().length() << endl; - cout << endl; - } - - assert( (*d_hist)[i].has_failed() == true); - assert( (*d_hist)[i].get_err_stack().length() == 1); - assert( !strcmp((*d_hist)[i].get_err_stack()[0].reason ,"API_ThrowException") ); - } - delete d_hist; - - cout << " Read command history with exception --> OK" << endl; - -// Test command_history for State - - d_hist = device->command_history("State",hist_depth); - - for (i = 0;i < d_hist->size();i++) - { - if (print == true) - { - cout << (*d_hist)[i] << endl; - } - - assert( (*d_hist)[i].has_failed() == false); - assert( (*d_hist)[i].get_err_stack().length() == 0); - Tango::DevState ds; - (*d_hist)[i] >> ds; - assert( ds == Tango::ON ); - } - delete d_hist; - - cout << " Read command history (State) --> OK" << endl; - -// Test command_history for Status - - d_hist = device->command_history("Status",hist_depth); - - for (i = 0;i < d_hist->size();i++) - { - if (print == true) - { - cout << (*d_hist)[i] << endl; - } - - assert( (*d_hist)[i].has_failed() == false); - assert( (*d_hist)[i].get_err_stack().length() == 0); - string str; - (*d_hist)[i] >> str; - assert( ::strcmp(str.c_str(),"The device is in ON state.") == 0 ); - } - delete d_hist; - - cout << " Read command history (Status) --> OK" << endl; - -// Test command_history (DevEncoded) - - d_hist = device->command_history("OEncoded",hist_depth); - - if (d_hist->size() < 4) - { - cout << "Not enought data in polling buffer, retry later" << endl; - exit(-1); - } - - unsigned char first_val_enc; - for (i = 0;i < d_hist->size();i++) - { - DevEncoded the_enc; - (*d_hist)[i] >> the_enc; - - if (print == true) - { - cout << "Command failed = " << (*d_hist)[i].has_failed() << endl; - cout << "Encoded_format = " << the_enc.encoded_format << endl; - for (unsigned int ii = 0;ii < the_enc.encoded_data.length();++ii) - cout << "Encoded_data = " << (int)the_enc.encoded_data[ii] << endl; - TimeVal &t = (*d_hist)[i].get_date(); - cout << "Date : " << t.tv_sec << " sec, " << t.tv_usec << " usec" << endl; - cout << "Error stack depth = " << (*d_hist)[i].get_err_stack().length() << endl; - cout << endl; - } - - assert( (*d_hist)[i].has_failed() == false); - assert( (*d_hist)[i].get_err_stack().length() == 0); - - if (i == 0) - first_val_enc = the_enc.encoded_data[0]; - - if ((i % 2) == 0) - { - if (first_val_enc == 11) - { - assert (!strcmp(the_enc.encoded_format,"Odd - OEncoded format")); - assert (the_enc.encoded_data.length() == 2); - assert (the_enc.encoded_data[0] == 11); - assert (the_enc.encoded_data[1] == 21); - } - else - { - assert (!strcmp(the_enc.encoded_format,"Even - OEncoded format")); - assert (the_enc.encoded_data[0] == 10); - assert (the_enc.encoded_data[1] == 20); - assert (the_enc.encoded_data[2] == 30); - assert (the_enc.encoded_data[3] == 40); - } - } - else - { - if (first_val_enc == 11) - { - assert (!strcmp(the_enc.encoded_format,"Even - OEncoded format")); - assert (the_enc.encoded_data[0] == 10); - assert (the_enc.encoded_data[1] == 20); - assert (the_enc.encoded_data[2] == 30); - assert (the_enc.encoded_data[3] == 40); - } - else - { - assert (!strcmp(the_enc.encoded_format,"Odd - OEncoded format")); - assert (the_enc.encoded_data.length() == 2); - assert (the_enc.encoded_data[0] == 11); - assert (the_enc.encoded_data[1] == 21); - } - } - } - delete d_hist; - - cout << " Read command history (DevEncoded) --> OK" << endl; - -// Test attribute_history (for long) - - vector *a_hist; - hist_depth = 10; - a_hist = device->attribute_history("PollLong_attr",hist_depth); - - DevLong first_val; - for (i = 0;i < a_hist->size();i++) - { - DevLong lo; - (*a_hist)[i] >> lo; - - if (i == 0) - first_val = lo; - - if (print == true) - { - cout << "Attribute failed = " << (*a_hist)[i].has_failed() << endl; - cout << "Value = " << lo << endl; - TimeVal &t = (*a_hist)[i].get_date(); - cout << "Date : " << t.tv_sec << " sec, " << t.tv_usec << " usec" << endl; - cout << "Error stack depth = " << (*a_hist)[i].get_err_stack().length() << endl; - cout << endl; - } - - assert( (*a_hist)[i].has_failed() == false); - assert( (*a_hist)[i].get_err_stack().length() == 0); - - assert ( (*a_hist)[i].get_dim_x() == 1); - assert ( (*a_hist)[i].get_dim_y() == 0); - - if (first_val == 5555) - { - if ((i % 2) == 0) - assert( lo == 5555 ); - else - assert( lo == 6666 ); - } - else - { - if ((i % 2) == 0) - assert( lo == 6666 ); - else - assert( lo == 5555 ); - } - } - delete a_hist; - - cout << " Read attribute history (long) --> OK" << endl; - -// Test attribute_history (for strings spectrum) - - a_hist = device->attribute_history("PollString_spec_attr",hist_depth); - - string first_string; - AttrResult ar; - - vector str; - - if ((*a_hist)[0].has_failed() == true) - { - if (::strcmp(((*a_hist)[0].get_err_stack())[0].reason.in(),"aaaa") == 0) - ar = FIRST_EXCEPT; - else - ar = SECOND_EXCEPT; - } - else - { - (*a_hist)[0] >> str; - if (str.size() == 2) - ar = FIRST_DATA; - else - ar = SECOND_DATA; - } - - for (i = 0;i < a_hist->size();i++) - { - if (print == true) - { - cout << "Attribute failed = " << (*a_hist)[i].has_failed() << endl; - TimeVal &t = (*a_hist)[i].get_date(); - cout << "Date : " << t.tv_sec << " sec, " << t.tv_usec << " usec" << endl; - if ((*a_hist)[i].has_failed() == false) - { - (*a_hist)[i] >> str; - cout << "Value = " << str[0]; - if (str.size() == 2) - cout << ", Value = " << str[1]; - cout << endl; - } - else - { - cout << "Error stack depth = " << (*a_hist)[i].get_err_stack().length() << endl; - cout << "Error level 0 reason = " << ((*a_hist)[i].get_err_stack())[0].reason << endl; - cout << "Error level 0 desc = " << ((*a_hist)[i].get_err_stack())[0].desc << endl; - } - cout << endl; - } - } - - switch(ar) - { - case FIRST_EXCEPT: - assert( (*a_hist)[0].has_failed() == true ); - assert( (*a_hist)[0].get_err_stack().length() == 1); - assert( ::strcmp(((*a_hist)[0].get_err_stack())[0].desc.in(),"bbb") == 0 ); - assert( ::strcmp(((*a_hist)[0].get_err_stack())[0].reason.in(),"aaaa") == 0 ); - - assert( (*a_hist)[1].has_failed() == true ); - assert( (*a_hist)[1].get_err_stack().length() == 1); - assert( ::strcmp(((*a_hist)[1].get_err_stack())[0].desc.in(),"yyy") == 0 ); - assert( ::strcmp(((*a_hist)[1].get_err_stack())[0].reason.in(),"xxx") == 0 ); - - (*a_hist)[2] >> str; - assert( str.size() == 2 ); - assert( str[0] == "Hello world" ); - assert( str[1] == "Hello universe"); - - (*a_hist)[3] >> str; - assert( str.size() == 1 ); - assert( str[0] == "Hello Grenoble" ); - break; - - case SECOND_EXCEPT: - assert( (*a_hist)[0].has_failed() == true ); - assert( (*a_hist)[0].get_err_stack().length() == 1); - assert( ::strcmp(((*a_hist)[0].get_err_stack())[0].desc.in(),"yyy") == 0 ); - assert( ::strcmp(((*a_hist)[0].get_err_stack())[0].reason.in(),"xxx") == 0 ); - - (*a_hist)[1] >> str; - assert( str.size() == 2 ); - assert( str[0] == "Hello world" ); - assert( str[1] == "Hello universe"); - - (*a_hist)[2] >> str; - assert( str.size() == 1 ); - assert( str[0] == "Hello Grenoble" ); - - assert( (*a_hist)[3].has_failed() == true ); - assert( (*a_hist)[3].get_err_stack().length() == 1); - assert( ::strcmp(((*a_hist)[3].get_err_stack())[0].desc.in(),"bbb") == 0 ); - assert( ::strcmp(((*a_hist)[3].get_err_stack())[0].reason.in(),"aaaa") == 0 ); - break; - - case FIRST_DATA: - (*a_hist)[0] >> str; - assert( str.size() == 2 ); - assert( str[0] == "Hello world" ); - assert( str[1] == "Hello universe"); - - (*a_hist)[1] >> str; - assert( str.size() == 1 ); - assert( str[0] == "Hello Grenoble" ); - - assert( (*a_hist)[2].has_failed() == true ); - assert( (*a_hist)[2].get_err_stack().length() == 1); - assert( ::strcmp(((*a_hist)[2].get_err_stack())[0].desc.in(),"bbb") == 0 ); - assert( ::strcmp(((*a_hist)[2].get_err_stack())[0].reason.in(),"aaaa") == 0 ); - - assert( (*a_hist)[3].has_failed() == true ); - assert( (*a_hist)[3].get_err_stack().length() == 1); - assert( ::strcmp(((*a_hist)[3].get_err_stack())[0].desc.in(),"yyy") == 0 ); - assert( ::strcmp(((*a_hist)[3].get_err_stack())[0].reason.in(),"xxx") == 0 ); - break; - - case SECOND_DATA: - (*a_hist)[0] >> str; - assert( str.size() == 1 ); - assert( str[0] == "Hello Grenoble" ); - - assert( (*a_hist)[1].has_failed() == true ); - assert( (*a_hist)[1].get_err_stack().length() == 1); - assert( ::strcmp(((*a_hist)[1].get_err_stack())[0].desc.in(),"bbb") == 0 ); - assert( ::strcmp(((*a_hist)[1].get_err_stack())[0].reason.in(),"aaaa") == 0 ); - - assert( (*a_hist)[2].has_failed() == true ); - assert( (*a_hist)[2].get_err_stack().length() == 1); - assert( ::strcmp(((*a_hist)[2].get_err_stack())[0].desc.in(),"yyy") == 0 ); - assert( ::strcmp(((*a_hist)[2].get_err_stack())[0].reason.in(),"xxx") == 0 ); - - (*a_hist)[3] >> str; - assert( str.size() == 2 ); - assert( str[0] == "Hello world" ); - assert( str[1] == "Hello universe"); - break; - } - delete a_hist; - - cout << " Read attribute history (string spectrum) --> OK" << endl; - -// Test attribute_history (for DevEncoded) - -#ifndef COMPAT - vector *enc_hist; - hist_depth = 10; - enc_hist = device->attribute_history("Encoded_attr",hist_depth); - - for (i = 0;i < enc_hist->size();i++) - { - - if (print == true) - { - cout << "Value = " << (*enc_hist)[i] << endl; - cout << endl; - } - - assert( (*enc_hist)[i].has_failed() == false); - assert( (*enc_hist)[i].get_err_stack().length() == 0); - - assert ( (*enc_hist)[i].get_dim_x() == 1); - assert ( (*enc_hist)[i].get_dim_y() == 0); - - DevEncoded enc; - (*enc_hist)[i] >> enc; - - assert (::strcmp(enc.encoded_format,"Which format?") == 0); - assert (enc.encoded_data[0] == 97); - assert (enc.encoded_data[1] == 98); - assert (enc.encoded_data[2] == 99); - assert (enc.encoded_data[3] == 100); - } - delete enc_hist; - - cout << " Read attribute history (DevEncoded) --> OK" << endl; -#endif - -// Test attribute_history with exception - - a_hist = device->attribute_history("attr_wrong_type",hist_depth); - - for (i = 0;i < a_hist->size();i++) - { - if (print == true) - { - cout << "Command failed = " << (*a_hist)[i].has_failed() << endl; - TimeVal &t = (*a_hist)[i].get_date(); - cout << "Date : " << t.tv_sec << " sec, " << t.tv_usec << " usec" << endl; - cout << "Error stack depth = " << (*a_hist)[i].get_err_stack().length() << endl; - cout << "Error level 0 reason = " << ((*a_hist)[i].get_err_stack())[0].reason << endl; - cout << "Error level 0 desc = " << ((*a_hist)[i].get_err_stack())[0].desc << endl; - cout << endl; - } - - assert( (*a_hist)[i].has_failed() == true); - assert( (*a_hist)[i].get_err_stack().length() == 1); - assert( !strcmp((*a_hist)[i].get_err_stack()[0].reason ,"API_AttrOptProp") ); -// AttributeDimension dim; -// dim = (*a_hist)[i].get_r_dimension(); - - assert ( (*a_hist)[i].get_dim_x() == 0); - assert ( (*a_hist)[i].get_dim_y() == 0); - -// dim = (*a_hist)[i].get_w_dimension(); - -// assert ( dim.dim_x == 0); -// assert ( dim.dim_y == 0); - - } - delete a_hist; - - cout << " Read attribute history with exception --> OK" << endl; - - } - catch (Tango::DevFailed &e) - { - Except::print_exception(e); - exit(-1); - } - - - delete device; - return 0; -} diff --git a/cpp_test_suite/old_tests/test_polling.sh.cmake b/cpp_test_suite/old_tests/test_polling.sh.cmake deleted file mode 100644 index dd27bc181..000000000 --- a/cpp_test_suite/old_tests/test_polling.sh.cmake +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash -check_return_value () { -if [ $1 != "0" ] -then - echo "Polling Test Suite has FAILED !!!!!!!!!!!!!!!!!!" - echo "Leaving test suite, try to fix it" - date - sleep 120 - date - ./StopPoll @DEV1@ - exit -1 -fi -} - -./Poll @DEV1@ -ret=$? -check_return_value $ret - -sleep 7 - -echo "Testing command_history and attribute_history DeviceProxy methods" -./read_hist @DEV1@ -ret=$? -check_return_value $ret - -echo "Testing polling of new attribute data types" -./poll_attr @DEV1@ -ret=$? -check_return_value $ret - -echo "Testing all DeviceProxy polling methods" -./poll_met @DEV1@ @DEV2@ @DEV1_ALIAS@ -ret=$? -check_return_value $ret - -echo "Testing polling threads pool" -./poll_pool @DEV1@ @DEV2@ @INST_NAME@ -ret=$? -check_return_value $ret - -./StopPoll @DEV1@ \ No newline at end of file diff --git a/cpp_test_suite/runtest b/cpp_test_suite/runtest deleted file mode 100755 index 2c8057e3b..000000000 --- a/cpp_test_suite/runtest +++ /dev/null @@ -1,548 +0,0 @@ -#!/bin/bash - -# -# remove different echo command behaviour on different OS -# -if test "`echo -e xxx`" = "xxx" -then - echo="echo -e" -else - echo=echo -fi - -if [ $# = 0 ] -then - $echo "\nusage: runtest ds_system\n" - $echo "ds_system can be redhate5_64, ubuntu1404, python or \"jenkins \"" - exit 1 -fi - -# -# test host -# - -REDHATE5_64_HOST=esrflinux2-1a -PYTHON_HOST=controls01 -UBUNTU1404_HOST=pcrogucki - -HOST=`hostname` -SERV_NAME=devTest - - -case $1 in -redhate5_64 ) - if [ $HOST != $REDHATE5_64_HOST ] - then - $echo "For redhate5_64, test should run on "$REDHATE5_64_HOST - exit 1 - fi - DIR=bin/redhate5_64 - ;; -# -ubuntu1404 ) - if [ $HOST != $UBUNTU1404_HOST ] - then - $echo "For ubuntu 14.04, test should run on "$UBUTU1204_HOST - exit 1 - fi - DIR=bin - DEV1="dev/test/10" - DEV2="dev/test/11" - DEV3="dev/test/12" - DEV1_ALIAS="et_alias" - ATTR_ALIAS="et_attr_alias" - INST_NAME=api - DEV_MCAST="no/mcast/test" - FWD_DEV="dev/fwdtest/10" - OS=Linux - ;; -# -python ) - if [ $HOST != $PYTHON_HOST ] - then - $echo "For python, test should run on "$PYTHON_HOST - exit 1 - fi - DIR=suse93 - ;; -# -jenkins ) - if [ $# != 2 ] - then - echo "Missing base directory" - exit -1 - fi - BASE_DIR=$2 - for i in $NODE_LABELS - do - echo $i - - if [ $i = "ubuntu12.04" ] - then - echo "Ubuntu 12.04 OS" - DIR="$BASE_DIR/ubuntu1204/bin" - DEV1="test/ubuntu1204/10" - DEV2="test/ubuntu1204/11" - DEV3="test/ubuntu1204/12" - FWD_DEV="test/fwd_ubuntu1204/10" - DEV_MCAST="test/centos5/30" - DEV1_ALIAS="ubuntu1204_alias" - ATTR_ALIAS="ubuntu1204_attr_alias" - INST_NAME=ubuntu1204 - OS=Linux - fi - - if [ $i = "Windows_VC9" ] - then - echo "Windows VC9" - DIR="$BASE_DIR/win32/bin" - DEV1="test/win32_vc9/10" - DEV2="test/win32_vc9/11" - DEV3="test/win32_vc9/12" - FWD_DEV="test/fwd_win32_vc9/10" -# DEV_MCAST="test/win64_vc10/30" - DEV_MCAST="no/mcast/test" - DEV1_ALIAS="win32_vc9_alias" - ATTR_ALIAS="win32_vc9_attr_alias" - INST_NAME=win32_vc9 - OS=Windows - fi - - if [ $i = "Windows_VC10" ] - then - echo "Windows VC10 (64 bits)" - DIR="$BASE_DIR/win64/bin" - DEV1="test/win64_vc10/10" - DEV2="test/win64_vc10/11" - DEV3="test/win64_vc10/12" - FWD_DEV="test/fwd_win64_vc10/10" -# DEV_MCAST="test/win32_vc9/30" - DEV_MCAST="no/mcast/test" - DEV1_ALIAS="win64_vc10_alias" - ATTR_ALIAS="win64_vc10_attr_alias" - INST_NAME=win64_vc10 - OS=Windows - fi - - if [ $i = "centos5" ] - then - echo "CentOS 5 OS" - DIR="$BASE_DIR/centos5/bin" - DEV1="test/centos5/10" - DEV2="test/centos5/11" - DEV3="test/centos5/12" - FWD_DEV="test/fwd_centos5/10" - DEV_MCAST="test/ubuntu1204/30" - DEV1_ALIAS="centos5_alias" - ATTR_ALIAS="centos5_attr_alias" - INST_NAME=centos5 - OS=Linux - fi - - if [ $i = "redhate4" ] - then - echo "Red Hat 4 OS" - DIR="$BASE_DIR/redhate4/bin" - DEV1="test/redhate4/10" - DEV2="test/redhate4/11" - DEV3="test/redhate4/12" - FWD_DEV="test/fwd_redhate4/10" - DEV_MCAST="test/debian6/30" - DEV1_ALIAS="redhate4_alias" - ATTR_ALIAS="redhate4_attr_alias" - INST_NAME=redhate4 - OS=Linux - fi - - if [ $i = "redhate5" ] - then - echo "Red Hat 5 OS" - DIR="$BASE_DIR/redhate5/bin" - DEV1="test/redhate5/10" - DEV2="test/redhate5/11" - DEV3="test/redhate5/12" - FWD_DEV="test/fwd_redhate5/10" - DEV_MCAST="no/mcast/test" - DEV1_ALIAS="redhate5_alias" - ATTR_ALIAS="redhate5_attr_alias" - INST_NAME=redhate5 - OS=Linux - fi - - if [ $i = "debian6" ] - then - echo "Debian 6 OS" - DIR="$BASE_DIR/debian6/bin" - DEV1="test/debian6/10" - DEV2="test/debian6/11" - DEV3="test/debian6/12" - FWD_DEV="test/fwd_debian6/10" - DEV_MCAST="test/redhate4/30" - DEV1_ALIAS="debian6_alias" - ATTR_ALIAS="debian6_attr_alias" - INST_NAME=debian6 - OS=Linux - fi - - if [ $i = "debian7_tango" ] - then - echo "Debian 7 OS" - DIR="$BASE_DIR/debian7/bin" - DEV1="test/debian7/10" - DEV2="test/debian7/11" - DEV3="test/debian7/12" - FWD_DEV="test/fwd_debian7/10" - DEV_MCAST="test/redhate4/30" - DEV1_ALIAS="debian7_alias" - ATTR_ALIAS="debian7_attr_alias" - INST_NAME=debian7 - OS=Linux - fi - - if [ $i = "debian8_tango" ] - then - echo "Debian 8 OS" - DIR="$BASE_DIR/debian8/bin" - DEV1="test/debian8/10" - DEV2="test/debian8/11" - DEV3="test/debian8/12" - FWD_DEV="test/fwd_debian8/10" - DEV_MCAST="test/redhate4/30" - DEV1_ALIAS="debian8_alias" - ATTR_ALIAS="debian8_attr_alias" - INST_NAME=debian8 - OS=Linux - fi - - done - ;; -# -* ) - $echo "\nunknown system" - exit 1 - ;; -esac - -check_return_value () { -if [ $1 != "0" ] -then - echo "Test Suite FAILED !!!!!!!!!!!!!!!!!!" - echo "Leaving test suite, try to fix it" - date - sleep 120 - date - $DIR/StopPoll $DEV1 --kill $DEV_MCAST - exit -1 -fi -} - -# -# First, print used libs -# -if [ $OS != "Windows" ] -then - ldd $DIR/misc_devproxy -fi - -# -# Due to different host CPU power and in case of test suites compilation, -# the DS used for mcast test could be started at very different time ccording to host -# Wait for mcast test device to be ready before starting test -# -# Our Windows VC9 host with Samba is so slow..... -# - -if [ $OS != "Windows" ] -then - LOOP=10 -else - LOOP=35 -fi - -#if [ $DEV_MCAST != "no/mcast/test" ] -#then -# $DIR/wait_mcast_dev $DEV_MCAST $LOOP -# if [ $? != "0" ] -# then -# echo "It seems that the remote DS to test multicast feature is not started" -# echo "Exit test suite !!!!!!!!!!!!!!!!!!" -# date -# exit -1 -# fi -#fi - -# -# Wait of a random value before starting test (Spread database load) -# - -val=$RANDOM -let "val=$val % 30" -let val=$val+5 -echo "Random sleeping of $val seconds" -sleep $val -ps -ef | grep devTest -ps -ef | grep FwdTest -n=`date` -echo "Starting test at $n" - -# -# Run the CXX test suite -# - -$echo "Running the new Test Suite" -CURR_DIR="`pwd`" - -# -# Don't know why but when running this script from Jenkins on windows, -# the HOST string has 9 characters instead of 8. There is a \013 (carriage return) -# appended at the end -# - -if [ $OS = "Windows" ] -then - if [ $INST_NAME = "win32_vc9" ] - then - FULL_HOSTNAME=`host PCTAUREL | awk '{print $1}'` - touch win32/vc9/test_suite/runner/runner.cpp - else - FULL_HOSTNAME=`host W-CB126-1 | awk '{print $1}'` - touch win64/vc10/test_suite/runner/runner.cpp - fi - FULL_HOSTNAME=`echo $FULL_HOSTNAME | tr "[:upper:]" "[:lower:]"` -else - FULL_HOSTNAME=`host $HOST | awk '{print $1}'` -fi - -echo "FULL_HOSTNAME="$FULL_HOSTNAME - -if [ $OS = "Windows" ] -then - #WIN_OUT_DIR="c:\\jenkins\\workspace\\tango_test_suite\\operatingsystems\\windows_vc9\\cpp_test_suite\\win32\\vc9\\test_suite\\runner\\../../../../new_tests/out\\" - WIN_OUT_DIR="`cygpath -w -p $CURR_DIR`" - RUN_CMD="$DIR/runner --device1=$DEV1 --device2=$DEV2 --device3=$DEV3 --fwd_device=$FWD_DEV --loop=5 --fulldsname=$SERV_NAME/$INST_NAME --serverhost=$FULL_HOSTNAME --clienthost=$FULL_HOSTNAME --serverversion=5 --docurl=http://www.tango-controls.org --devtype=TestDevice --dbserver=sys/database/2 --outpath=/tmp/ --refpath=$WIN_OUT_DIR\\new_tests\\out\\ --loglevel=0 --dsloglevel=3 --suiteloop=3 --devicealias=$DEV1_ALIAS --attributealias=$ATTR_ALIAS --local_device=$DEV1 --remote_device=$DEV_MCAST" - - if [ $INST_NAME = "win32_vc9" ] - then - sleep 10 - fi - - echo "runner command="$RUN_CMD - $RUN_CMD -else - export RUN_CMD="runner --device1=$DEV1 --device2=$DEV2 --device3=$DEV3 --fwd_device=$FWD_DEV --loop=1 --fulldsname=$SERV_NAME/$INST_NAME --serverhost=$FULL_HOSTNAME --clienthost=$FULL_HOSTNAME --serverversion=5 --docurl=http://www.tango-controls.org --devtype=TestDevice --dbserver=sys/database/2 --outpath=/tmp/ --refpath=$CURR_DIR/new_tests/out/ --loglevel=0 --dsloglevel=3 --suiteloop=1 --devicealias=$DEV1_ALIAS --attributealias=$ATTR_ALIAS" - - if [ $INST_NAME != "redhate5" ] - then - RUN_CMD="$RUN_CMD --local_device=$DEV1 --remote_device=$DEV_MCAST" - fi - - # create runner_run script - RUNNER_RUN=$DIR/runner_run - if [ -f $RUNNER_RUN ] - then - rm -f $RUNNER_RUN - fi - echo "#!/bin/bash" > $RUNNER_RUN - echo "./$RUN_CMD" >> $RUNNER_RUN - - # run test suite - echo "runner command="$RUN_CMD - rm /tmp/orb.trace - export ORBtraceLevel=40 - export ORBtraceTime=1 - export ORBtraceFile=/tmp/orb.trace - eval $DIR/$RUN_CMD -fi -ret=$? -check_return_value $ret - -# -# Kill the remote device server used for mcast test -# - -$DIR/StopPoll --kill $DEV_MCAST - -unset ORBtraceLevel -unset ORBtraceFile -unset ORBtraceTime - -# -# Run test suite -# - -$echo "Testing miscellaneous DeviceProxy features" -$DIR/misc_devproxy $DEV1 $SERV_NAME/$INST_NAME -ret=$? -check_return_value $ret -# -$echo "\nTesting insertion and extraction into DeviceData objects for all types" -$DIR/cmd_types $DEV1 10 -ret=$? -check_return_value $ret -# -$echo "\nTesting extraction from DeviceAttribute objects for all types" -$DIR/attr_types $DEV1 10 -ret=$? -check_return_value $ret -# -$echo "\nTesting attribute configuration changes" -$DIR/att_conf $DEV1 -ret=$? -check_return_value $ret -# -$echo "\nTesting miscellaneous DeviceData object features" -$DIR/misc_devdata -ret=$? -check_return_value $ret -# -$echo "\nTesting miscellaneous DeviceAttribute object features" -$DIR/misc_devattr -ret=$? -check_return_value $ret -# -$echo "\nTesting writing attribute (with the eight data types) using DeviceAttribute" -$DIR/write_attr $DEV1 10 -ret=$? -check_return_value $ret -# -$echo "\nTesting copy constructor and assignement operator of the DeviceProxy class" -$DIR/copy_devproxy $DEV1 $DEV2 $DEV3 -ret=$? -check_return_value $ret -# -$echo "\nTesting miscellaneous attribute features" -$DIR/attr_misc $DEV1 -ret=$? -check_return_value $ret -# -$echo "\nTesting object property methods of the Database class" -$DIR/obj_prop -ret=$? -check_return_value $ret -# -$echo "\nTesting command_history and attribute_history DeviceProxy methods" -$DIR/Poll $DEV1 -ret=$? -check_return_value $ret -sleep 7 -$DIR/read_hist $DEV1 -ret=$? -check_return_value $ret -# -$echo "\nTesting polling of new attribute data types" -$DIR/poll_attr $DEV1 -ret=$? -check_return_value $ret -# -$echo "\nTesting all DeviceProxy polling methods" -$DIR/poll_met $DEV1 $DEV2 $DEV1_ALIAS -ret=$? -check_return_value $ret -# -$echo "\nTesting polling threads pool" -$DIR/poll_pool $DEV1 $DEV2 $INST_NAME -ret=$? -check_return_value $ret -# -$DIR/StopPoll $DEV1 -# -$echo "\nTesting all AttributeProxy methods" -$DIR/attr_proxy $DEV1/Short_attr_rw -ret=$? -check_return_value $ret -# -$echo "\nTesting writing spectrum and image attributes" -$DIR/write_attr_3 $DEV1 10 -ret=$? -check_return_value $ret -# -$echo "\nTesting polled command with external triggering" -$DIR/read_hist_ext $DEV1 -ret=$? -check_return_value $ret -# -$echo "\nTesting individual polling buffer depth and polling methods in DeviceImpl" -$DIR/ring_depth $DEV1 -ret=$? -check_return_value $ret -# -$echo "\nTesting memorized attributes" -$DIR/mem_att $DEV1 -ret=$? -check_return_value $ret -# -$echo "\nTesting state and status read as attributes" -$DIR/state_attr $DEV1 -ret=$? -check_return_value $ret -# -$echo "\nTesting RDS alarm" -$DIR/rds $DEV1 -ret=$? -check_return_value $ret -# -$echo "\nTesting Device Server Cache" -$DIR/ds_cache -ret=$? -check_return_value $ret -# -$echo "\nTesting Write_Read attribute" -$DIR/w_r_attr $DEV1 -ret=$? -check_return_value $ret -# -if [ $1 = "jenkins" ] -then - PATH=$PATH:$DIR -else - PATH=$PATH:./$DIR -fi -$echo "\nTesting device locking feature" -$DIR/lock $DEV1 $DEV2 -ret=$? -check_return_value $ret - -# -$echo "\nTesting the sub device diagnostics" -$DIR/sub_dev $DEV1 $DEV2 $DEV3 -ret=$? -check_return_value $ret -# -$echo "\nTesting printing operators" -$DIR/print_data $DEV1 -ret=$? -check_return_value $ret -# -$echo "\nTesting printing attribute property" -$DIR/attr_manip $DEV1 -ret=$? -check_return_value $ret -# -if [ $INST_NAME = "redhate4" ] -then - $echo "\nCheck user classes size" - $DIR/size - ret=$? - check_return_value $ret -fi -# -$echo "\nTesting resetting attribute event conf. reset (need event system...)" -$DIR/ConfEventBugClient $DEV3 -ret=$? -check_return_value $ret -# -$echo "\nTesting resetting attribute configuration (to user default, to class default, to lib default...)" -$DIR/attr_conf_test $DEV1 -ret=$? -check_return_value $ret -# -# Now, test asynchronous features -# -cd asyn;./runtest $* -# -# -# Now, test events -# -cd ../event;./runtest $* - - diff --git a/cpp_test_suite/win32/vc9/test_suite/ConfEventBugClient/ConfEventBugClient.vcproj b/cpp_test_suite/win32/vc9/test_suite/ConfEventBugClient/ConfEventBugClient.vcproj deleted file mode 100644 index 780206761..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/ConfEventBugClient/ConfEventBugClient.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/Poll/Include_Libs.vsprops b/cpp_test_suite/win32/vc9/test_suite/Poll/Include_Libs.vsprops deleted file mode 100644 index 5e9909844..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/Poll/Include_Libs.vsprops +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/Poll/Include_libs_release.vsprops b/cpp_test_suite/win32/vc9/test_suite/Poll/Include_libs_release.vsprops deleted file mode 100644 index 5ee6c6526..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/Poll/Include_libs_release.vsprops +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/Poll/Poll.vcproj b/cpp_test_suite/win32/vc9/test_suite/Poll/Poll.vcproj deleted file mode 100644 index 927475c51..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/Poll/Poll.vcproj +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/StopPoll/StopPoll.vcproj b/cpp_test_suite/win32/vc9/test_suite/StopPoll/StopPoll.vcproj deleted file mode 100644 index af6aa79b7..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/StopPoll/StopPoll.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/acc_right/acc_right.vcproj b/cpp_test_suite/win32/vc9/test_suite/acc_right/acc_right.vcproj deleted file mode 100644 index a74673164..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/acc_right/acc_right.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/allowed_cmd/allowed_cmd.vcproj b/cpp_test_suite/win32/vc9/test_suite/allowed_cmd/allowed_cmd.vcproj deleted file mode 100644 index beca37301..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/allowed_cmd/allowed_cmd.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/archive_event/archive_event.vcproj b/cpp_test_suite/win32/vc9/test_suite/archive_event/archive_event.vcproj deleted file mode 100644 index bb3b85331..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/archive_event/archive_event.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/asyn_attr/asyn_attr.vcproj b/cpp_test_suite/win32/vc9/test_suite/asyn_attr/asyn_attr.vcproj deleted file mode 100644 index c69eac3a4..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/asyn_attr/asyn_attr.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/asyn_attr_cb/asyn_attr_cb.vcproj b/cpp_test_suite/win32/vc9/test_suite/asyn_attr_cb/asyn_attr_cb.vcproj deleted file mode 100644 index 670a5e36d..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/asyn_attr_cb/asyn_attr_cb.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/asyn_attr_multi/asyn_attr_multi.vcproj b/cpp_test_suite/win32/vc9/test_suite/asyn_attr_multi/asyn_attr_multi.vcproj deleted file mode 100644 index 5d07183b5..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/asyn_attr_multi/asyn_attr_multi.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/asyn_cb/asyn_cb.vcproj b/cpp_test_suite/win32/vc9/test_suite/asyn_cb/asyn_cb.vcproj deleted file mode 100644 index 2734a6b8e..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/asyn_cb/asyn_cb.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/asyn_cb2/asyn_cb2.vcproj b/cpp_test_suite/win32/vc9/test_suite/asyn_cb2/asyn_cb2.vcproj deleted file mode 100644 index 03da87c9c..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/asyn_cb2/asyn_cb2.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/asyn_cb_cmd/asyn_cb_cmd.vcproj b/cpp_test_suite/win32/vc9/test_suite/asyn_cb_cmd/asyn_cb_cmd.vcproj deleted file mode 100644 index c76152711..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/asyn_cb_cmd/asyn_cb_cmd.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/asyn_cmd/asyn_cmd.vcproj b/cpp_test_suite/win32/vc9/test_suite/asyn_cmd/asyn_cmd.vcproj deleted file mode 100644 index 5467e22bf..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/asyn_cmd/asyn_cmd.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/asyn_thread/asyn_thread.vcproj b/cpp_test_suite/win32/vc9/test_suite/asyn_thread/asyn_thread.vcproj deleted file mode 100644 index a28ac8e18..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/asyn_thread/asyn_thread.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/asyn_write_attr/asyn_write_attr.vcproj b/cpp_test_suite/win32/vc9/test_suite/asyn_write_attr/asyn_write_attr.vcproj deleted file mode 100644 index 3b277e2ff..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/asyn_write_attr/asyn_write_attr.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/asyn_write_attr_multi/asyn_write_attr_multi.vcproj b/cpp_test_suite/win32/vc9/test_suite/asyn_write_attr_multi/asyn_write_attr_multi.vcproj deleted file mode 100644 index 8ce17d1ff..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/asyn_write_attr_multi/asyn_write_attr_multi.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/asyn_write_cb/asyn_write_cb.vcproj b/cpp_test_suite/win32/vc9/test_suite/asyn_write_cb/asyn_write_cb.vcproj deleted file mode 100644 index 378e15584..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/asyn_write_cb/asyn_write_cb.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/att_conf/att_conf.vcproj b/cpp_test_suite/win32/vc9/test_suite/att_conf/att_conf.vcproj deleted file mode 100644 index 284428ab8..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/att_conf/att_conf.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/att_conf_event/att_conf_event.vcproj b/cpp_test_suite/win32/vc9/test_suite/att_conf_event/att_conf_event.vcproj deleted file mode 100644 index 0b79bea30..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/att_conf_event/att_conf_event.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/att_conf_event_buffer/att_conf_event_buffer.vcproj b/cpp_test_suite/win32/vc9/test_suite/att_conf_event_buffer/att_conf_event_buffer.vcproj deleted file mode 100644 index eeb369a49..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/att_conf_event_buffer/att_conf_event_buffer.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/att_type_event/att_type_event.vcproj b/cpp_test_suite/win32/vc9/test_suite/att_type_event/att_type_event.vcproj deleted file mode 100644 index 30adf74a4..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/att_type_event/att_type_event.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/attr_conf_test/attr_conf_test.vcproj b/cpp_test_suite/win32/vc9/test_suite/attr_conf_test/attr_conf_test.vcproj deleted file mode 100644 index a4cd3be89..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/attr_conf_test/attr_conf_test.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/attr_manip/attr_manip.vcproj b/cpp_test_suite/win32/vc9/test_suite/attr_manip/attr_manip.vcproj deleted file mode 100644 index beddb3bfe..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/attr_manip/attr_manip.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/attr_misc/attr_misc.vcproj b/cpp_test_suite/win32/vc9/test_suite/attr_misc/attr_misc.vcproj deleted file mode 100644 index 02cf95e6b..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/attr_misc/attr_misc.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/attr_proxy/attr_proxy.vcproj b/cpp_test_suite/win32/vc9/test_suite/attr_proxy/attr_proxy.vcproj deleted file mode 100644 index f8507c680..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/attr_proxy/attr_proxy.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/attr_types/attr_types.vcproj b/cpp_test_suite/win32/vc9/test_suite/attr_types/attr_types.vcproj deleted file mode 100644 index f9584a1dd..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/attr_types/attr_types.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/auto_asyn_cmd/auto_asyn_cmd.vcproj b/cpp_test_suite/win32/vc9/test_suite/auto_asyn_cmd/auto_asyn_cmd.vcproj deleted file mode 100644 index 9614506ad..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/auto_asyn_cmd/auto_asyn_cmd.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/change_event/change_event.vcproj b/cpp_test_suite/win32/vc9/test_suite/change_event/change_event.vcproj deleted file mode 100644 index b3f4aa581..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/change_event/change_event.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/change_event64/change_event64.vcproj b/cpp_test_suite/win32/vc9/test_suite/change_event64/change_event64.vcproj deleted file mode 100644 index 7571ffddb..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/change_event64/change_event64.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/change_event_buffer/change_event_buffer.vcproj b/cpp_test_suite/win32/vc9/test_suite/change_event_buffer/change_event_buffer.vcproj deleted file mode 100644 index 53882275d..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/change_event_buffer/change_event_buffer.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/cmd_inout/cmd_inout.vcproj b/cpp_test_suite/win32/vc9/test_suite/cmd_inout/cmd_inout.vcproj deleted file mode 100644 index da73e8741..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/cmd_inout/cmd_inout.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/cmd_types/cmd_types.vcproj b/cpp_test_suite/win32/vc9/test_suite/cmd_types/cmd_types.vcproj deleted file mode 100644 index 3d919329f..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/cmd_types/cmd_types.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/copy_devproxy/copy_devproxy.vcproj b/cpp_test_suite/win32/vc9/test_suite/copy_devproxy/copy_devproxy.vcproj deleted file mode 100644 index d791e4824..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/copy_devproxy/copy_devproxy.vcproj +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/data_ready_event/data_ready_event.vcproj b/cpp_test_suite/win32/vc9/test_suite/data_ready_event/data_ready_event.vcproj deleted file mode 100644 index d6f08ec6d..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/data_ready_event/data_ready_event.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/data_ready_event_buffer/data_ready_event_buffer.vcproj b/cpp_test_suite/win32/vc9/test_suite/data_ready_event_buffer/data_ready_event_buffer.vcproj deleted file mode 100644 index c5e6f2a04..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/data_ready_event_buffer/data_ready_event_buffer.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/dev_intr_event/dev_intr_event.vcproj b/cpp_test_suite/win32/vc9/test_suite/dev_intr_event/dev_intr_event.vcproj deleted file mode 100644 index 0393e4cca..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/dev_intr_event/dev_intr_event.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/ds_cache/ds_cache.vcproj b/cpp_test_suite/win32/vc9/test_suite/ds_cache/ds_cache.vcproj deleted file mode 100644 index a4014647a..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/ds_cache/ds_cache.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/event_lock/event_lock.vcproj b/cpp_test_suite/win32/vc9/test_suite/event_lock/event_lock.vcproj deleted file mode 100644 index e48c3e5a5..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/event_lock/event_lock.vcproj +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/lock/lock.vcproj b/cpp_test_suite/win32/vc9/test_suite/lock/lock.vcproj deleted file mode 100644 index 103eb6d4d..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/lock/lock.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/locked_device/locked_device.vcproj b/cpp_test_suite/win32/vc9/test_suite/locked_device/locked_device.vcproj deleted file mode 100644 index ab9eb3aad..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/locked_device/locked_device.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/mem_att/mem_att.vcproj b/cpp_test_suite/win32/vc9/test_suite/mem_att/mem_att.vcproj deleted file mode 100644 index 5714a08db..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/mem_att/mem_att.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/misc-devdata/misc-devdata.vcproj b/cpp_test_suite/win32/vc9/test_suite/misc-devdata/misc-devdata.vcproj deleted file mode 100644 index e3ba26264..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/misc-devdata/misc-devdata.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/misc_devattr/misc_devattr.vcproj b/cpp_test_suite/win32/vc9/test_suite/misc_devattr/misc_devattr.vcproj deleted file mode 100644 index f9e78aaca..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/misc_devattr/misc_devattr.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/misc_devproxy/misc_devproxy.vcproj b/cpp_test_suite/win32/vc9/test_suite/misc_devproxy/misc_devproxy.vcproj deleted file mode 100644 index bd5d27787..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/misc_devproxy/misc_devproxy.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/multi_dev_event/multi_dev_event.vcproj b/cpp_test_suite/win32/vc9/test_suite/multi_dev_event/multi_dev_event.vcproj deleted file mode 100644 index 20c8ab9c4..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/multi_dev_event/multi_dev_event.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/multi_event/multi_event.vcproj b/cpp_test_suite/win32/vc9/test_suite/multi_event/multi_event.vcproj deleted file mode 100644 index 04c8f2112..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/multi_event/multi_event.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/multiple_new/multiple_new.vcproj b/cpp_test_suite/win32/vc9/test_suite/multiple_new/multiple_new.vcproj deleted file mode 100644 index 4736d1b79..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/multiple_new/multiple_new.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/new_devproxy/new_devproxy.vcproj b/cpp_test_suite/win32/vc9/test_suite/new_devproxy/new_devproxy.vcproj deleted file mode 100644 index a1445ad50..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/new_devproxy/new_devproxy.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/obj_prop/obj_prop.vcproj b/cpp_test_suite/win32/vc9/test_suite/obj_prop/obj_prop.vcproj deleted file mode 100644 index f321fd0cf..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/obj_prop/obj_prop.vcproj +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/per_event/per_event.vcproj b/cpp_test_suite/win32/vc9/test_suite/per_event/per_event.vcproj deleted file mode 100644 index 05f7cedeb..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/per_event/per_event.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/pipe_event/pipe_event.vcproj b/cpp_test_suite/win32/vc9/test_suite/pipe_event/pipe_event.vcproj deleted file mode 100644 index 6217f106b..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/pipe_event/pipe_event.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/poll_attr/poll_attr.vcproj b/cpp_test_suite/win32/vc9/test_suite/poll_attr/poll_attr.vcproj deleted file mode 100644 index be502b926..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/poll_attr/poll_attr.vcproj +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/poll_except/poll_except.vcproj b/cpp_test_suite/win32/vc9/test_suite/poll_except/poll_except.vcproj deleted file mode 100644 index 508d8c1e0..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/poll_except/poll_except.vcproj +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/poll_met/poll_met.vcproj b/cpp_test_suite/win32/vc9/test_suite/poll_met/poll_met.vcproj deleted file mode 100644 index 10e9ebf8c..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/poll_met/poll_met.vcproj +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/poll_pool/poll_pool.vcproj b/cpp_test_suite/win32/vc9/test_suite/poll_pool/poll_pool.vcproj deleted file mode 100644 index fa049ed4d..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/poll_pool/poll_pool.vcproj +++ /dev/null @@ -1,195 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/print_data/print_data.vcproj b/cpp_test_suite/win32/vc9/test_suite/print_data/print_data.vcproj deleted file mode 100644 index 542105ed5..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/print_data/print_data.vcproj +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/print_data_hist/print_data_hist.vcproj b/cpp_test_suite/win32/vc9/test_suite/print_data_hist/print_data_hist.vcproj deleted file mode 100644 index da6e7a4f3..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/print_data_hist/print_data_hist.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/prop_list/prop_list.vcproj b/cpp_test_suite/win32/vc9/test_suite/prop_list/prop_list.vcproj deleted file mode 100644 index 3d7ad9b0f..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/prop_list/prop_list.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/rds/rds.vcproj b/cpp_test_suite/win32/vc9/test_suite/rds/rds.vcproj deleted file mode 100644 index de9e3f70a..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/rds/rds.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/read_attr/read_attr.vcproj b/cpp_test_suite/win32/vc9/test_suite/read_attr/read_attr.vcproj deleted file mode 100644 index f42b2f202..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/read_attr/read_attr.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/read_hist_ext/read_hist_ext.vcproj b/cpp_test_suite/win32/vc9/test_suite/read_hist_ext/read_hist_ext.vcproj deleted file mode 100644 index df82200d9..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/read_hist_ext/read_hist_ext.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/read_host/read_host.vcproj b/cpp_test_suite/win32/vc9/test_suite/read_host/read_host.vcproj deleted file mode 100644 index 237b0b4b9..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/read_host/read_host.vcproj +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/reco_event/reco_event.vcproj b/cpp_test_suite/win32/vc9/test_suite/reco_event/reco_event.vcproj deleted file mode 100644 index 7c3ece572..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/reco_event/reco_event.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/reco_svc/reco_svc.vcproj b/cpp_test_suite/win32/vc9/test_suite/reco_svc/reco_svc.vcproj deleted file mode 100644 index 90905c9dd..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/reco_svc/reco_svc.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/reco_zmq/reco_zmq.vcproj b/cpp_test_suite/win32/vc9/test_suite/reco_zmq/reco_zmq.vcproj deleted file mode 100644 index 4f74854ec..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/reco_zmq/reco_zmq.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/reconnect/reconnect.vcproj b/cpp_test_suite/win32/vc9/test_suite/reconnect/reconnect.vcproj deleted file mode 100644 index 31b0e8024..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/reconnect/reconnect.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/restart_device/restart_device.vcproj b/cpp_test_suite/win32/vc9/test_suite/restart_device/restart_device.vcproj deleted file mode 100644 index 3cb6a81e9..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/restart_device/restart_device.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/ring_depth/ring_depth.vcproj b/cpp_test_suite/win32/vc9/test_suite/ring_depth/ring_depth.vcproj deleted file mode 100644 index 082b3bf1a..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/ring_depth/ring_depth.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/runner/runner.cpp b/cpp_test_suite/win32/vc9/test_suite/runner/runner.cpp deleted file mode 100644 index 8566df785..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/runner/runner.cpp +++ /dev/null @@ -1,128 +0,0 @@ -/* Generated file, do not edit */ - -// -*- C++ -*- -// Tango main template -// - -#define CXXTEST_HAVE_EH -#define CXXTEST_HAVE_STD -#define CXXTEST_ABORT_TEST_ON_FAIL -#ifndef CXXTEST_RUNNING -#define CXXTEST_RUNNING -#endif - -#define _CXXTEST_HAVE_STD -#define _CXXTEST_HAVE_EH -#include -#include -#include -#include - -#include - -int main( int argc, char **argv ) -{ - return CxxTest::TangoPrinter().run( argc, argv ); -} - -// The CxxTest "world" -#include "../../../../new_tests/cxx_zmcast01_simple.cpp" - -static McastSimpleTestSuite *suite_McastSimpleTestSuite = 0; - -static CxxTest::List Tests_McastSimpleTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_McastSimpleTestSuite( "../../../../new_tests/cxx_zmcast01_simple.cpp", 26, "McastSimpleTestSuite", Tests_McastSimpleTestSuite, suite_McastSimpleTestSuite, 106, 111 ); - -static class TestDescription_McastSimpleTestSuite_test_Subscribe_multicast_event_locally : public CxxTest::RealTestDescription { -public: - TestDescription_McastSimpleTestSuite_test_Subscribe_multicast_event_locally() : CxxTest::RealTestDescription( Tests_McastSimpleTestSuite, suiteDescription_McastSimpleTestSuite, 122, "test_Subscribe_multicast_event_locally" ) {} - void runTest() { if ( suite_McastSimpleTestSuite ) suite_McastSimpleTestSuite->test_Subscribe_multicast_event_locally(); } -} testDescription_McastSimpleTestSuite_test_Subscribe_multicast_event_locally; - -static class TestDescription_McastSimpleTestSuite_test_Subscribe_multicast_event_remotely : public CxxTest::RealTestDescription { -public: - TestDescription_McastSimpleTestSuite_test_Subscribe_multicast_event_remotely() : CxxTest::RealTestDescription( Tests_McastSimpleTestSuite, suiteDescription_McastSimpleTestSuite, 141, "test_Subscribe_multicast_event_remotely" ) {} - void runTest() { if ( suite_McastSimpleTestSuite ) suite_McastSimpleTestSuite->test_Subscribe_multicast_event_remotely(); } -} testDescription_McastSimpleTestSuite_test_Subscribe_multicast_event_remotely; - -static class TestDescription_McastSimpleTestSuite_test_first_point_received_locally_and_remotely : public CxxTest::RealTestDescription { -public: - TestDescription_McastSimpleTestSuite_test_first_point_received_locally_and_remotely() : CxxTest::RealTestDescription( Tests_McastSimpleTestSuite, suiteDescription_McastSimpleTestSuite, 162, "test_first_point_received_locally_and_remotely" ) {} - void runTest() { if ( suite_McastSimpleTestSuite ) suite_McastSimpleTestSuite->test_first_point_received_locally_and_remotely(); } -} testDescription_McastSimpleTestSuite_test_first_point_received_locally_and_remotely; - -static class TestDescription_McastSimpleTestSuite_test_Callback_executed_after_a_change_localy_and_remotely : public CxxTest::RealTestDescription { -public: - TestDescription_McastSimpleTestSuite_test_Callback_executed_after_a_change_localy_and_remotely() : CxxTest::RealTestDescription( Tests_McastSimpleTestSuite, suiteDescription_McastSimpleTestSuite, 173, "test_Callback_executed_after_a_change_localy_and_remotely" ) {} - void runTest() { if ( suite_McastSimpleTestSuite ) suite_McastSimpleTestSuite->test_Callback_executed_after_a_change_localy_and_remotely(); } -} testDescription_McastSimpleTestSuite_test_Callback_executed_after_a_change_localy_and_remotely; - -static class TestDescription_McastSimpleTestSuite_test_unsubscribe_event_localy_and_remotely : public CxxTest::RealTestDescription { -public: - TestDescription_McastSimpleTestSuite_test_unsubscribe_event_localy_and_remotely() : CxxTest::RealTestDescription( Tests_McastSimpleTestSuite, suiteDescription_McastSimpleTestSuite, 208, "test_unsubscribe_event_localy_and_remotely" ) {} - void runTest() { if ( suite_McastSimpleTestSuite ) suite_McastSimpleTestSuite->test_unsubscribe_event_localy_and_remotely(); } -} testDescription_McastSimpleTestSuite_test_unsubscribe_event_localy_and_remotely; - -#include "../../../../new_tests/cxx_zmcast02_local_remote.cpp" - -static McastLocalRemoteTestSuite *suite_McastLocalRemoteTestSuite = 0; - -static CxxTest::List Tests_McastLocalRemoteTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_McastLocalRemoteTestSuite( "../../../../new_tests/cxx_zmcast02_local_remote.cpp", 26, "McastLocalRemoteTestSuite", Tests_McastLocalRemoteTestSuite, suite_McastLocalRemoteTestSuite, 163, 168 ); - -static class TestDescription_McastLocalRemoteTestSuite_test_Subscribe_multicast_events : public CxxTest::RealTestDescription { -public: - TestDescription_McastLocalRemoteTestSuite_test_Subscribe_multicast_events() : CxxTest::RealTestDescription( Tests_McastLocalRemoteTestSuite, suiteDescription_McastLocalRemoteTestSuite, 179, "test_Subscribe_multicast_events" ) {} - void runTest() { if ( suite_McastLocalRemoteTestSuite ) suite_McastLocalRemoteTestSuite->test_Subscribe_multicast_events(); } -} testDescription_McastLocalRemoteTestSuite_test_Subscribe_multicast_events; - -static class TestDescription_McastLocalRemoteTestSuite_test_first_point_received : public CxxTest::RealTestDescription { -public: - TestDescription_McastLocalRemoteTestSuite_test_first_point_received() : CxxTest::RealTestDescription( Tests_McastLocalRemoteTestSuite, suiteDescription_McastLocalRemoteTestSuite, 211, "test_first_point_received" ) {} - void runTest() { if ( suite_McastLocalRemoteTestSuite ) suite_McastLocalRemoteTestSuite->test_first_point_received(); } -} testDescription_McastLocalRemoteTestSuite_test_first_point_received; - -static class TestDescription_McastLocalRemoteTestSuite_test_Callback_executed_after_a_change_for_both_events : public CxxTest::RealTestDescription { -public: - TestDescription_McastLocalRemoteTestSuite_test_Callback_executed_after_a_change_for_both_events() : CxxTest::RealTestDescription( Tests_McastLocalRemoteTestSuite, suiteDescription_McastLocalRemoteTestSuite, 217, "test_Callback_executed_after_a_change_for_both_events" ) {} - void runTest() { if ( suite_McastLocalRemoteTestSuite ) suite_McastLocalRemoteTestSuite->test_Callback_executed_after_a_change_for_both_events(); } -} testDescription_McastLocalRemoteTestSuite_test_Callback_executed_after_a_change_for_both_events; - -static class TestDescription_McastLocalRemoteTestSuite_test_unsubscribe_event : public CxxTest::RealTestDescription { -public: - TestDescription_McastLocalRemoteTestSuite_test_unsubscribe_event() : CxxTest::RealTestDescription( Tests_McastLocalRemoteTestSuite, suiteDescription_McastLocalRemoteTestSuite, 246, "test_unsubscribe_event" ) {} - void runTest() { if ( suite_McastLocalRemoteTestSuite ) suite_McastLocalRemoteTestSuite->test_unsubscribe_event(); } -} testDescription_McastLocalRemoteTestSuite_test_unsubscribe_event; - -#include "../../../../new_tests/cxx_zmcast03_svr_local_remote.cpp" - -static SvrMcastLocalRemoteTestSuite *suite_SvrMcastLocalRemoteTestSuite = 0; - -static CxxTest::List Tests_SvrMcastLocalRemoteTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_SvrMcastLocalRemoteTestSuite( "../../../../new_tests/cxx_zmcast03_svr_local_remote.cpp", 28, "SvrMcastLocalRemoteTestSuite", Tests_SvrMcastLocalRemoteTestSuite, suite_SvrMcastLocalRemoteTestSuite, 154, 159 ); - -static class TestDescription_SvrMcastLocalRemoteTestSuite_test_Subscribe_multicast_events : public CxxTest::RealTestDescription { -public: - TestDescription_SvrMcastLocalRemoteTestSuite_test_Subscribe_multicast_events() : CxxTest::RealTestDescription( Tests_SvrMcastLocalRemoteTestSuite, suiteDescription_SvrMcastLocalRemoteTestSuite, 170, "test_Subscribe_multicast_events" ) {} - void runTest() { if ( suite_SvrMcastLocalRemoteTestSuite ) suite_SvrMcastLocalRemoteTestSuite->test_Subscribe_multicast_events(); } -} testDescription_SvrMcastLocalRemoteTestSuite_test_Subscribe_multicast_events; - -static class TestDescription_SvrMcastLocalRemoteTestSuite_test_first_point_received : public CxxTest::RealTestDescription { -public: - TestDescription_SvrMcastLocalRemoteTestSuite_test_first_point_received() : CxxTest::RealTestDescription( Tests_SvrMcastLocalRemoteTestSuite, suiteDescription_SvrMcastLocalRemoteTestSuite, 205, "test_first_point_received" ) {} - void runTest() { if ( suite_SvrMcastLocalRemoteTestSuite ) suite_SvrMcastLocalRemoteTestSuite->test_first_point_received(); } -} testDescription_SvrMcastLocalRemoteTestSuite_test_first_point_received; - -static class TestDescription_SvrMcastLocalRemoteTestSuite_test_Callback_executed_after_a_change_for_both_events : public CxxTest::RealTestDescription { -public: - TestDescription_SvrMcastLocalRemoteTestSuite_test_Callback_executed_after_a_change_for_both_events() : CxxTest::RealTestDescription( Tests_SvrMcastLocalRemoteTestSuite, suiteDescription_SvrMcastLocalRemoteTestSuite, 219, "test_Callback_executed_after_a_change_for_both_events" ) {} - void runTest() { if ( suite_SvrMcastLocalRemoteTestSuite ) suite_SvrMcastLocalRemoteTestSuite->test_Callback_executed_after_a_change_for_both_events(); } -} testDescription_SvrMcastLocalRemoteTestSuite_test_Callback_executed_after_a_change_for_both_events; - -static class TestDescription_SvrMcastLocalRemoteTestSuite_test_unsubscribe_event : public CxxTest::RealTestDescription { -public: - TestDescription_SvrMcastLocalRemoteTestSuite_test_unsubscribe_event() : CxxTest::RealTestDescription( Tests_SvrMcastLocalRemoteTestSuite, suiteDescription_SvrMcastLocalRemoteTestSuite, 255, "test_unsubscribe_event" ) {} - void runTest() { if ( suite_SvrMcastLocalRemoteTestSuite ) suite_SvrMcastLocalRemoteTestSuite->test_unsubscribe_event(); } -} testDescription_SvrMcastLocalRemoteTestSuite_test_unsubscribe_event; - -#include diff --git a/cpp_test_suite/win32/vc9/test_suite/runner/runner.vcproj b/cpp_test_suite/win32/vc9/test_suite/runner/runner.vcproj deleted file mode 100644 index 1db61f339..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/runner/runner.vcproj +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/scan/scan.vcproj b/cpp_test_suite/win32/vc9/test_suite/scan/scan.vcproj deleted file mode 100644 index 2e07ea00d..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/scan/scan.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/server_event/server_event.vcproj b/cpp_test_suite/win32/vc9/test_suite/server_event/server_event.vcproj deleted file mode 100644 index a590374ec..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/server_event/server_event.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/size/size.vcproj b/cpp_test_suite/win32/vc9/test_suite/size/size.vcproj deleted file mode 100644 index d77c5dadd..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/size/size.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/state_attr/state_attr.vcproj b/cpp_test_suite/win32/vc9/test_suite/state_attr/state_attr.vcproj deleted file mode 100644 index b4873034c..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/state_attr/state_attr.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/state_event/state_event.vcproj b/cpp_test_suite/win32/vc9/test_suite/state_event/state_event.vcproj deleted file mode 100644 index 6306f955f..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/state_event/state_event.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/stateless_sub/stateless_sub.vcproj b/cpp_test_suite/win32/vc9/test_suite/stateless_sub/stateless_sub.vcproj deleted file mode 100644 index 8c9f5fa0b..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/stateless_sub/stateless_sub.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/sub_dev/sub_dev.vcproj b/cpp_test_suite/win32/vc9/test_suite/sub_dev/sub_dev.vcproj deleted file mode 100644 index 3fac5331c..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/sub_dev/sub_dev.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/syntax/syntax.vcproj b/cpp_test_suite/win32/vc9/test_suite/syntax/syntax.vcproj deleted file mode 100644 index 00a76614c..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/syntax/syntax.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/test_suite.sln b/cpp_test_suite/win32/vc9/test_suite/test_suite.sln deleted file mode 100644 index 5eb8b60d0..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/test_suite.sln +++ /dev/null @@ -1,505 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Poll", "Poll\Poll.vcproj", "{5CF0AD69-352A-4827-AD4B-DE629E1B4E78}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StopPoll", "StopPoll\StopPoll.vcproj", "{E37BBC67-2308-4B63-B961-71519FB9F279}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "new_devproxy", "new_devproxy\new_devproxy.vcproj", "{C01D8845-2CDF-43E3-BEE8-91896629E064}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multiple_new", "multiple_new\multiple_new.vcproj", "{B70EC07A-24E8-44F0-8CE6-49AC2760470F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reconnect", "reconnect\reconnect.vcproj", "{7ECEF870-A73D-4FFA-9248-4E14C528FC81}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmd_inout", "cmd_inout\cmd_inout.vcproj", "{B011952D-D686-4A1B-92A9-F457B8444154}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "read_attr", "read_attr\read_attr.vcproj", "{CE6EC813-919B-4257-A4B6-EC94A1FDABCD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmd_types", "cmd_types\cmd_types.vcproj", "{290BA60F-09D9-4BCA-8403-94EDCB899E53}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attr_types", "attr_types\attr_types.vcproj", "{DC4473DB-EAEA-4DC7-BB6F-1CA2DF5F2F3B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "misc_devdata", "misc-devdata\misc-devdata.vcproj", "{A2E9C810-2935-4805-8792-496A0ED10839}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "misc_devattr", "misc_devattr\misc_devattr.vcproj", "{4CD9F188-97C9-4C1F-AC7B-1666D5FAE3C3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "misc_devproxy", "misc_devproxy\misc_devproxy.vcproj", "{D6F15615-2C92-4CFE-B548-9506ECFD73AB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "write_attr", "write_attr\write_attr.vcproj", "{7EE9A9E4-78AE-4B6D-8F7C-DADB9FE90E7A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_devproxy", "copy_devproxy\copy_devproxy.vcproj", "{37D0C9C1-31C0-467F-9310-DAF494377E95}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj_prop", "obj_prop\obj_prop.vcproj", "{700AD2FC-90D2-480C-B059-15DCA0F8D894}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "read_hist", "read_host\read_host.vcproj", "{3CBAF461-838E-4225-A24C-21BD8E4FE551}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "poll_met", "poll_met\poll_met.vcproj", "{1491287C-D235-4BE7-A534-33055C88E59C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "poll_except", "poll_except\poll_except.vcproj", "{D58946D1-C6C3-4AE2-86C5-9C53B11E027E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "poll_attr", "poll_attr\poll_attr.vcproj", "{C0BF9611-7DFA-4782-99FA-661C29977CD1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "print_data", "print_data\print_data.vcproj", "{BDB9FBC2-8DB1-46F2-AF29-96D975120A76}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "print_data_hist", "print_data_hist\print_data_hist.vcproj", "{870C3E28-A769-4F95-B6DA-7CD45CDB780C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "syntax", "syntax\syntax.vcproj", "{4C874FC5-474A-4B12-8A56-61A53CC055DC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "size", "size\size.vcproj", "{7E906AB3-8ED0-4462-8E31-0E7D5C291806}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attr_proxy", "attr_proxy\attr_proxy.vcproj", "{2571DAA6-742A-49F1-875C-8E3EF9F52EF9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "read_hist_ext", "read_hist_ext\read_hist_ext.vcproj", "{1B4C4DA3-65F5-4D17-B082-BD2F6CAAD6C0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "write_attr_3", "write_attr_3\write_attr_3.vcproj", "{08D23250-240C-4025-8649-EC441171A51D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring_depth", "ring_depth\ring_depth.vcproj", "{23F9A2ED-D02F-410B-9004-8CC9E642EE01}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attr_misc", "attr_misc\attr_misc.vcproj", "{2640C5A4-7B5E-4159-AF46-8D012582A70A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "state_attr", "state_attr\state_attr.vcproj", "{F756059A-654F-40ED-8BA0-F478B7CBF1CF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rds", "rds\rds.vcproj", "{D136A855-85D8-4D29-99C9-AE7D5D6EA738}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mem_att", "mem_att\mem_att.vcproj", "{B2D73C70-66F2-4BB8-92A4-111C44DAA3DB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attr_manip", "attr_manip\attr_manip.vcproj", "{8594FBDD-2938-49E0-AF5B-F524ABEE5C0F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prop_list", "prop_list\prop_list.vcproj", "{2C333947-5663-4717-BB41-39804C4EDBCA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ds_cache", "ds_cache\ds_cache.vcproj", "{19B05026-7732-4FEC-A85C-8C6BC339D761}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sub_dev", "sub_dev\sub_dev.vcproj", "{E3CF6E9E-2DA5-4EB6-9529-95BF2761A9CC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "locked_device", "locked_device\locked_device.vcproj", "{683BBC0B-FE1D-4C1C-867A-C1EF384E9848}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lock", "lock\lock.vcproj", "{8A319852-91A7-4339-9C03-F4D355614454}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "restart_device", "restart_device\restart_device.vcproj", "{2E5B889E-72C7-45F8-9611-9687A706D327}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unlock", "unlock\unlock.vcproj", "{ECF3BF91-AE61-42AC-B3F2-FBCE55589B0C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "allowed_cmd", "allowed_cmd\allowed_cmd.vcproj", "{AAD01C98-3B8F-495F-A070-80A97A9AEAE2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w_r_attr", "w_r_attr\w_r_attr.vcproj", "{94F286EB-0016-4205-8B39-25EDB17C9E0C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "acc_right", "acc_right\acc_right.vcproj", "{937982FD-CB54-40B7-9A95-638F97AC6C81}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConfEventBugClient", "ConfEventBugClient\ConfEventBugClient.vcproj", "{3D404CC8-162C-46D5-8910-AB54DE545FC5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "att_conf", "att_conf\att_conf.vcproj", "{514E32B7-43FA-4CC8-A87C-540F4E0AF768}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_cmd", "asyn_cmd\asyn_cmd.vcproj", "{34BA4CE1-613B-42E0-8399-761DD96FD595}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_attr", "asyn_attr\asyn_attr.vcproj", "{C7621A8E-AB31-4D98-B995-90A99D2D7B45}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_attr_multi", "asyn_attr_multi\asyn_attr_multi.vcproj", "{B29EA00F-7420-43C0-B7BB-DF1F8AEF1C94}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_write_attr", "asyn_write_attr\asyn_write_attr.vcproj", "{649B6A2C-A3E4-48B6-AF27-D29532356A6B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_write_attr_multi", "asyn_write_attr_multi\asyn_write_attr_multi.vcproj", "{928D4E54-26B5-4B24-A1C4-4775BC0BE76C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_cb", "asyn_cb\asyn_cb.vcproj", "{E8AE8FF7-54BB-43EC-ACFD-45E70B73A2C9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_cb2", "asyn_cb2\asyn_cb2.vcproj", "{469D0696-C16C-4EC5-819F-C07E0F384285}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_cb_cmd", "asyn_cb_cmd\asyn_cb_cmd.vcproj", "{EEE171FE-9C9D-4552-BF21-2BAA5DAEDFF6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_attr_cb", "asyn_attr_cb\asyn_attr_cb.vcproj", "{5008C2DB-FA43-4E2A-B03A-C60F43FAAC1C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_write_cb", "asyn_write_cb\asyn_write_cb.vcproj", "{DF6060F0-C235-4E8E-AF43-D3385A506A2F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_thread", "asyn_thread\asyn_thread.vcproj", "{D87A0B24-AA34-41A6-93FC-7033D6BBCB63}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "auto_asyn_cmd", "auto_asyn_cmd\auto_asyn_cmd.vcproj", "{BAC3C08E-6E1A-4EA9-9F72-EE0BCC4537A9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "per_event", "per_event\per_event.vcproj", "{2B29ADC6-0E59-428F-B881-062B6515F398}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "change_event", "change_event\change_event.vcproj", "{EC965242-1D96-4E0C-9AFB-CD5EB64FDB2E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "change_event64", "change_event64\change_event64.vcproj", "{8B3A3FF3-B78C-4D50-8BBB-68F58A62DAEC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "archive_event", "archive_event\archive_event.vcproj", "{B80E8A57-208E-49FA-83BD-546B46A9BC4E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "user_event", "user_event\user_event.vcproj", "{3B7C102E-1228-4C67-AAAF-90A2894370FD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server_event", "server_event\server_event.vcproj", "{AA03D1D3-E62E-491E-BED6-7A5851879382}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reco_event", "reco_event\reco_event.vcproj", "{8926BDE3-BD11-4DA3-8F5D-09A23243DDBB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reco_svc", "reco_svc\reco_svc.vcproj", "{73B65A5F-06D3-46E3-AE76-74853A0FDB36}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "state_event", "state_event\state_event.vcproj", "{3E45FEB0-8CB6-42BC-BEF2-B7484198359A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scan", "scan\scan.vcproj", "{5DD390AE-DCDE-4B18-BEDF-6EE21B5DD6AC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "att_conf_event", "att_conf_event\att_conf_event.vcproj", "{B839A523-2BF1-4041-8438-FB084FEDE4CA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "data_ready_event", "data_ready_event\data_ready_event.vcproj", "{6BC0051B-48CC-4B9D-9BFF-5D6B9CAEDF4C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "change_event_buffer", "change_event_buffer\change_event_buffer.vcproj", "{B93C82CE-D496-47E8-B111-99F406ADB490}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "att_conf_event_buffer", "att_conf_event_buffer\att_conf_event_buffer.vcproj", "{78349AD2-3C40-4D22-BFE1-6E63686E3FFC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "data_ready_event_buffer", "data_ready_event_buffer\data_ready_event_buffer.vcproj", "{E21FE87C-B9E0-40ED-B1C5-044C116B42F8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event_lock", "event_lock\event_lock.vcproj", "{6F89B606-00C4-4DE5-BBE4-4D058E6AEB6B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multi_event", "multi_event\multi_event.vcproj", "{A2F8D0FB-F549-42BF-BB86-108B7B4AFBE0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "poll_pool", "poll_pool\poll_pool.vcproj", "{6406C9C4-DCB7-43C5-828A-15B669A2A1A4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runner", "runner\runner.vcproj", "{94D774D1-1403-4F01-AD70-1337438E970B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "att_type_event", "att_type_event\att_type_event.vcproj", "{509AE767-82A2-48A7-8C11-21D5A2432F3E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stateless_sub", "stateless_sub\stateless_sub.vcproj", "{D7E6ABD7-9412-4F77-80C8-75517D2B8D3E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reco_zmq", "reco_zmq\reco_zmq.vcproj", "{C5F9071F-B8DC-4C67-9364-84B1FF583951}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attr_conf_test", "attr_conf_test\attr_conf_test.vcproj", "{498BBB37-9982-41F9-8A39-140E794E76DC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wait_mcast_dev", "wait_mcast_dev\wait_mcast_dev.vcproj", "{E17456B8-BFA1-402F-8D40-A1157193673A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multi_dev_event", "multi_dev_event\multi_dev_event.vcproj", "{176EEE86-5A0F-4A0A-8950-1672579625B4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dev_intr_event", "dev_intr_event\dev_intr_event.vcproj", "{C9E16BC3-AB98-440C-9CFE-0D2FDB7D1FB6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pipe_event", "pipe_event\pipe_event.vcproj", "{A6D2A2C7-D277-4631-A030-EAB0D6C6CA99}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5CF0AD69-352A-4827-AD4B-DE629E1B4E78}.Debug|Win32.ActiveCfg = Release|Win32 - {5CF0AD69-352A-4827-AD4B-DE629E1B4E78}.Debug|Win32.Build.0 = Release|Win32 - {5CF0AD69-352A-4827-AD4B-DE629E1B4E78}.Release|Win32.ActiveCfg = Release|Win32 - {5CF0AD69-352A-4827-AD4B-DE629E1B4E78}.Release|Win32.Build.0 = Release|Win32 - {E37BBC67-2308-4B63-B961-71519FB9F279}.Debug|Win32.ActiveCfg = Release|Win32 - {E37BBC67-2308-4B63-B961-71519FB9F279}.Debug|Win32.Build.0 = Release|Win32 - {E37BBC67-2308-4B63-B961-71519FB9F279}.Release|Win32.ActiveCfg = Release|Win32 - {E37BBC67-2308-4B63-B961-71519FB9F279}.Release|Win32.Build.0 = Release|Win32 - {C01D8845-2CDF-43E3-BEE8-91896629E064}.Debug|Win32.ActiveCfg = Release|Win32 - {C01D8845-2CDF-43E3-BEE8-91896629E064}.Debug|Win32.Build.0 = Release|Win32 - {C01D8845-2CDF-43E3-BEE8-91896629E064}.Release|Win32.ActiveCfg = Release|Win32 - {C01D8845-2CDF-43E3-BEE8-91896629E064}.Release|Win32.Build.0 = Release|Win32 - {B70EC07A-24E8-44F0-8CE6-49AC2760470F}.Debug|Win32.ActiveCfg = Release|Win32 - {B70EC07A-24E8-44F0-8CE6-49AC2760470F}.Debug|Win32.Build.0 = Release|Win32 - {B70EC07A-24E8-44F0-8CE6-49AC2760470F}.Release|Win32.ActiveCfg = Release|Win32 - {B70EC07A-24E8-44F0-8CE6-49AC2760470F}.Release|Win32.Build.0 = Release|Win32 - {7ECEF870-A73D-4FFA-9248-4E14C528FC81}.Debug|Win32.ActiveCfg = Release|Win32 - {7ECEF870-A73D-4FFA-9248-4E14C528FC81}.Debug|Win32.Build.0 = Release|Win32 - {7ECEF870-A73D-4FFA-9248-4E14C528FC81}.Release|Win32.ActiveCfg = Release|Win32 - {7ECEF870-A73D-4FFA-9248-4E14C528FC81}.Release|Win32.Build.0 = Release|Win32 - {B011952D-D686-4A1B-92A9-F457B8444154}.Debug|Win32.ActiveCfg = Release|Win32 - {B011952D-D686-4A1B-92A9-F457B8444154}.Debug|Win32.Build.0 = Release|Win32 - {B011952D-D686-4A1B-92A9-F457B8444154}.Release|Win32.ActiveCfg = Release|Win32 - {B011952D-D686-4A1B-92A9-F457B8444154}.Release|Win32.Build.0 = Release|Win32 - {CE6EC813-919B-4257-A4B6-EC94A1FDABCD}.Debug|Win32.ActiveCfg = Release|Win32 - {CE6EC813-919B-4257-A4B6-EC94A1FDABCD}.Debug|Win32.Build.0 = Release|Win32 - {CE6EC813-919B-4257-A4B6-EC94A1FDABCD}.Release|Win32.ActiveCfg = Release|Win32 - {CE6EC813-919B-4257-A4B6-EC94A1FDABCD}.Release|Win32.Build.0 = Release|Win32 - {290BA60F-09D9-4BCA-8403-94EDCB899E53}.Debug|Win32.ActiveCfg = Release|Win32 - {290BA60F-09D9-4BCA-8403-94EDCB899E53}.Debug|Win32.Build.0 = Release|Win32 - {290BA60F-09D9-4BCA-8403-94EDCB899E53}.Release|Win32.ActiveCfg = Release|Win32 - {290BA60F-09D9-4BCA-8403-94EDCB899E53}.Release|Win32.Build.0 = Release|Win32 - {DC4473DB-EAEA-4DC7-BB6F-1CA2DF5F2F3B}.Debug|Win32.ActiveCfg = Release|Win32 - {DC4473DB-EAEA-4DC7-BB6F-1CA2DF5F2F3B}.Debug|Win32.Build.0 = Release|Win32 - {DC4473DB-EAEA-4DC7-BB6F-1CA2DF5F2F3B}.Release|Win32.ActiveCfg = Release|Win32 - {DC4473DB-EAEA-4DC7-BB6F-1CA2DF5F2F3B}.Release|Win32.Build.0 = Release|Win32 - {A2E9C810-2935-4805-8792-496A0ED10839}.Debug|Win32.ActiveCfg = Release|Win32 - {A2E9C810-2935-4805-8792-496A0ED10839}.Debug|Win32.Build.0 = Release|Win32 - {A2E9C810-2935-4805-8792-496A0ED10839}.Release|Win32.ActiveCfg = Release|Win32 - {A2E9C810-2935-4805-8792-496A0ED10839}.Release|Win32.Build.0 = Release|Win32 - {4CD9F188-97C9-4C1F-AC7B-1666D5FAE3C3}.Debug|Win32.ActiveCfg = Release|Win32 - {4CD9F188-97C9-4C1F-AC7B-1666D5FAE3C3}.Debug|Win32.Build.0 = Release|Win32 - {4CD9F188-97C9-4C1F-AC7B-1666D5FAE3C3}.Release|Win32.ActiveCfg = Release|Win32 - {4CD9F188-97C9-4C1F-AC7B-1666D5FAE3C3}.Release|Win32.Build.0 = Release|Win32 - {D6F15615-2C92-4CFE-B548-9506ECFD73AB}.Debug|Win32.ActiveCfg = Release|Win32 - {D6F15615-2C92-4CFE-B548-9506ECFD73AB}.Debug|Win32.Build.0 = Release|Win32 - {D6F15615-2C92-4CFE-B548-9506ECFD73AB}.Release|Win32.ActiveCfg = Release|Win32 - {D6F15615-2C92-4CFE-B548-9506ECFD73AB}.Release|Win32.Build.0 = Release|Win32 - {7EE9A9E4-78AE-4B6D-8F7C-DADB9FE90E7A}.Debug|Win32.ActiveCfg = Release|Win32 - {7EE9A9E4-78AE-4B6D-8F7C-DADB9FE90E7A}.Debug|Win32.Build.0 = Release|Win32 - {7EE9A9E4-78AE-4B6D-8F7C-DADB9FE90E7A}.Release|Win32.ActiveCfg = Release|Win32 - {7EE9A9E4-78AE-4B6D-8F7C-DADB9FE90E7A}.Release|Win32.Build.0 = Release|Win32 - {37D0C9C1-31C0-467F-9310-DAF494377E95}.Debug|Win32.ActiveCfg = Release|Win32 - {37D0C9C1-31C0-467F-9310-DAF494377E95}.Debug|Win32.Build.0 = Release|Win32 - {37D0C9C1-31C0-467F-9310-DAF494377E95}.Release|Win32.ActiveCfg = Release|Win32 - {37D0C9C1-31C0-467F-9310-DAF494377E95}.Release|Win32.Build.0 = Release|Win32 - {700AD2FC-90D2-480C-B059-15DCA0F8D894}.Debug|Win32.ActiveCfg = Release|Win32 - {700AD2FC-90D2-480C-B059-15DCA0F8D894}.Debug|Win32.Build.0 = Release|Win32 - {700AD2FC-90D2-480C-B059-15DCA0F8D894}.Release|Win32.ActiveCfg = Release|Win32 - {700AD2FC-90D2-480C-B059-15DCA0F8D894}.Release|Win32.Build.0 = Release|Win32 - {3CBAF461-838E-4225-A24C-21BD8E4FE551}.Debug|Win32.ActiveCfg = Release|Win32 - {3CBAF461-838E-4225-A24C-21BD8E4FE551}.Debug|Win32.Build.0 = Release|Win32 - {3CBAF461-838E-4225-A24C-21BD8E4FE551}.Release|Win32.ActiveCfg = Release|Win32 - {3CBAF461-838E-4225-A24C-21BD8E4FE551}.Release|Win32.Build.0 = Release|Win32 - {1491287C-D235-4BE7-A534-33055C88E59C}.Debug|Win32.ActiveCfg = Release|Win32 - {1491287C-D235-4BE7-A534-33055C88E59C}.Debug|Win32.Build.0 = Release|Win32 - {1491287C-D235-4BE7-A534-33055C88E59C}.Release|Win32.ActiveCfg = Release|Win32 - {1491287C-D235-4BE7-A534-33055C88E59C}.Release|Win32.Build.0 = Release|Win32 - {D58946D1-C6C3-4AE2-86C5-9C53B11E027E}.Debug|Win32.ActiveCfg = Release|Win32 - {D58946D1-C6C3-4AE2-86C5-9C53B11E027E}.Debug|Win32.Build.0 = Release|Win32 - {D58946D1-C6C3-4AE2-86C5-9C53B11E027E}.Release|Win32.ActiveCfg = Release|Win32 - {D58946D1-C6C3-4AE2-86C5-9C53B11E027E}.Release|Win32.Build.0 = Release|Win32 - {C0BF9611-7DFA-4782-99FA-661C29977CD1}.Debug|Win32.ActiveCfg = Release|Win32 - {C0BF9611-7DFA-4782-99FA-661C29977CD1}.Debug|Win32.Build.0 = Release|Win32 - {C0BF9611-7DFA-4782-99FA-661C29977CD1}.Release|Win32.ActiveCfg = Release|Win32 - {C0BF9611-7DFA-4782-99FA-661C29977CD1}.Release|Win32.Build.0 = Release|Win32 - {BDB9FBC2-8DB1-46F2-AF29-96D975120A76}.Debug|Win32.ActiveCfg = Release|Win32 - {BDB9FBC2-8DB1-46F2-AF29-96D975120A76}.Debug|Win32.Build.0 = Release|Win32 - {BDB9FBC2-8DB1-46F2-AF29-96D975120A76}.Release|Win32.ActiveCfg = Release|Win32 - {BDB9FBC2-8DB1-46F2-AF29-96D975120A76}.Release|Win32.Build.0 = Release|Win32 - {870C3E28-A769-4F95-B6DA-7CD45CDB780C}.Debug|Win32.ActiveCfg = Release|Win32 - {870C3E28-A769-4F95-B6DA-7CD45CDB780C}.Debug|Win32.Build.0 = Release|Win32 - {870C3E28-A769-4F95-B6DA-7CD45CDB780C}.Release|Win32.ActiveCfg = Release|Win32 - {870C3E28-A769-4F95-B6DA-7CD45CDB780C}.Release|Win32.Build.0 = Release|Win32 - {4C874FC5-474A-4B12-8A56-61A53CC055DC}.Debug|Win32.ActiveCfg = Release|Win32 - {4C874FC5-474A-4B12-8A56-61A53CC055DC}.Release|Win32.ActiveCfg = Release|Win32 - {7E906AB3-8ED0-4462-8E31-0E7D5C291806}.Debug|Win32.ActiveCfg = Release|Win32 - {7E906AB3-8ED0-4462-8E31-0E7D5C291806}.Release|Win32.ActiveCfg = Release|Win32 - {2571DAA6-742A-49F1-875C-8E3EF9F52EF9}.Debug|Win32.ActiveCfg = Release|Win32 - {2571DAA6-742A-49F1-875C-8E3EF9F52EF9}.Debug|Win32.Build.0 = Release|Win32 - {2571DAA6-742A-49F1-875C-8E3EF9F52EF9}.Release|Win32.ActiveCfg = Release|Win32 - {2571DAA6-742A-49F1-875C-8E3EF9F52EF9}.Release|Win32.Build.0 = Release|Win32 - {1B4C4DA3-65F5-4D17-B082-BD2F6CAAD6C0}.Debug|Win32.ActiveCfg = Release|Win32 - {1B4C4DA3-65F5-4D17-B082-BD2F6CAAD6C0}.Debug|Win32.Build.0 = Release|Win32 - {1B4C4DA3-65F5-4D17-B082-BD2F6CAAD6C0}.Release|Win32.ActiveCfg = Release|Win32 - {1B4C4DA3-65F5-4D17-B082-BD2F6CAAD6C0}.Release|Win32.Build.0 = Release|Win32 - {08D23250-240C-4025-8649-EC441171A51D}.Debug|Win32.ActiveCfg = Release|Win32 - {08D23250-240C-4025-8649-EC441171A51D}.Debug|Win32.Build.0 = Release|Win32 - {08D23250-240C-4025-8649-EC441171A51D}.Release|Win32.ActiveCfg = Release|Win32 - {08D23250-240C-4025-8649-EC441171A51D}.Release|Win32.Build.0 = Release|Win32 - {23F9A2ED-D02F-410B-9004-8CC9E642EE01}.Debug|Win32.ActiveCfg = Release|Win32 - {23F9A2ED-D02F-410B-9004-8CC9E642EE01}.Debug|Win32.Build.0 = Release|Win32 - {23F9A2ED-D02F-410B-9004-8CC9E642EE01}.Release|Win32.ActiveCfg = Release|Win32 - {23F9A2ED-D02F-410B-9004-8CC9E642EE01}.Release|Win32.Build.0 = Release|Win32 - {2640C5A4-7B5E-4159-AF46-8D012582A70A}.Debug|Win32.ActiveCfg = Release|Win32 - {2640C5A4-7B5E-4159-AF46-8D012582A70A}.Debug|Win32.Build.0 = Release|Win32 - {2640C5A4-7B5E-4159-AF46-8D012582A70A}.Release|Win32.ActiveCfg = Release|Win32 - {2640C5A4-7B5E-4159-AF46-8D012582A70A}.Release|Win32.Build.0 = Release|Win32 - {F756059A-654F-40ED-8BA0-F478B7CBF1CF}.Debug|Win32.ActiveCfg = Release|Win32 - {F756059A-654F-40ED-8BA0-F478B7CBF1CF}.Debug|Win32.Build.0 = Release|Win32 - {F756059A-654F-40ED-8BA0-F478B7CBF1CF}.Release|Win32.ActiveCfg = Release|Win32 - {F756059A-654F-40ED-8BA0-F478B7CBF1CF}.Release|Win32.Build.0 = Release|Win32 - {D136A855-85D8-4D29-99C9-AE7D5D6EA738}.Debug|Win32.ActiveCfg = Release|Win32 - {D136A855-85D8-4D29-99C9-AE7D5D6EA738}.Debug|Win32.Build.0 = Release|Win32 - {D136A855-85D8-4D29-99C9-AE7D5D6EA738}.Release|Win32.ActiveCfg = Release|Win32 - {D136A855-85D8-4D29-99C9-AE7D5D6EA738}.Release|Win32.Build.0 = Release|Win32 - {B2D73C70-66F2-4BB8-92A4-111C44DAA3DB}.Debug|Win32.ActiveCfg = Release|Win32 - {B2D73C70-66F2-4BB8-92A4-111C44DAA3DB}.Debug|Win32.Build.0 = Release|Win32 - {B2D73C70-66F2-4BB8-92A4-111C44DAA3DB}.Release|Win32.ActiveCfg = Release|Win32 - {B2D73C70-66F2-4BB8-92A4-111C44DAA3DB}.Release|Win32.Build.0 = Release|Win32 - {8594FBDD-2938-49E0-AF5B-F524ABEE5C0F}.Debug|Win32.ActiveCfg = Release|Win32 - {8594FBDD-2938-49E0-AF5B-F524ABEE5C0F}.Debug|Win32.Build.0 = Release|Win32 - {8594FBDD-2938-49E0-AF5B-F524ABEE5C0F}.Release|Win32.ActiveCfg = Release|Win32 - {8594FBDD-2938-49E0-AF5B-F524ABEE5C0F}.Release|Win32.Build.0 = Release|Win32 - {2C333947-5663-4717-BB41-39804C4EDBCA}.Debug|Win32.ActiveCfg = Release|Win32 - {2C333947-5663-4717-BB41-39804C4EDBCA}.Debug|Win32.Build.0 = Release|Win32 - {2C333947-5663-4717-BB41-39804C4EDBCA}.Release|Win32.ActiveCfg = Release|Win32 - {2C333947-5663-4717-BB41-39804C4EDBCA}.Release|Win32.Build.0 = Release|Win32 - {19B05026-7732-4FEC-A85C-8C6BC339D761}.Debug|Win32.ActiveCfg = Release|Win32 - {19B05026-7732-4FEC-A85C-8C6BC339D761}.Debug|Win32.Build.0 = Release|Win32 - {19B05026-7732-4FEC-A85C-8C6BC339D761}.Release|Win32.ActiveCfg = Release|Win32 - {19B05026-7732-4FEC-A85C-8C6BC339D761}.Release|Win32.Build.0 = Release|Win32 - {E3CF6E9E-2DA5-4EB6-9529-95BF2761A9CC}.Debug|Win32.ActiveCfg = Release|Win32 - {E3CF6E9E-2DA5-4EB6-9529-95BF2761A9CC}.Debug|Win32.Build.0 = Release|Win32 - {E3CF6E9E-2DA5-4EB6-9529-95BF2761A9CC}.Release|Win32.ActiveCfg = Release|Win32 - {E3CF6E9E-2DA5-4EB6-9529-95BF2761A9CC}.Release|Win32.Build.0 = Release|Win32 - {683BBC0B-FE1D-4C1C-867A-C1EF384E9848}.Debug|Win32.ActiveCfg = Release|Win32 - {683BBC0B-FE1D-4C1C-867A-C1EF384E9848}.Debug|Win32.Build.0 = Release|Win32 - {683BBC0B-FE1D-4C1C-867A-C1EF384E9848}.Release|Win32.ActiveCfg = Release|Win32 - {683BBC0B-FE1D-4C1C-867A-C1EF384E9848}.Release|Win32.Build.0 = Release|Win32 - {8A319852-91A7-4339-9C03-F4D355614454}.Debug|Win32.ActiveCfg = Release|Win32 - {8A319852-91A7-4339-9C03-F4D355614454}.Release|Win32.ActiveCfg = Release|Win32 - {8A319852-91A7-4339-9C03-F4D355614454}.Release|Win32.Build.0 = Release|Win32 - {2E5B889E-72C7-45F8-9611-9687A706D327}.Debug|Win32.ActiveCfg = Release|Win32 - {2E5B889E-72C7-45F8-9611-9687A706D327}.Debug|Win32.Build.0 = Release|Win32 - {2E5B889E-72C7-45F8-9611-9687A706D327}.Release|Win32.ActiveCfg = Release|Win32 - {2E5B889E-72C7-45F8-9611-9687A706D327}.Release|Win32.Build.0 = Release|Win32 - {ECF3BF91-AE61-42AC-B3F2-FBCE55589B0C}.Debug|Win32.ActiveCfg = Release|Win32 - {ECF3BF91-AE61-42AC-B3F2-FBCE55589B0C}.Debug|Win32.Build.0 = Release|Win32 - {ECF3BF91-AE61-42AC-B3F2-FBCE55589B0C}.Release|Win32.ActiveCfg = Release|Win32 - {ECF3BF91-AE61-42AC-B3F2-FBCE55589B0C}.Release|Win32.Build.0 = Release|Win32 - {AAD01C98-3B8F-495F-A070-80A97A9AEAE2}.Debug|Win32.ActiveCfg = Release|Win32 - {AAD01C98-3B8F-495F-A070-80A97A9AEAE2}.Debug|Win32.Build.0 = Release|Win32 - {AAD01C98-3B8F-495F-A070-80A97A9AEAE2}.Release|Win32.ActiveCfg = Release|Win32 - {AAD01C98-3B8F-495F-A070-80A97A9AEAE2}.Release|Win32.Build.0 = Release|Win32 - {94F286EB-0016-4205-8B39-25EDB17C9E0C}.Debug|Win32.ActiveCfg = Release|Win32 - {94F286EB-0016-4205-8B39-25EDB17C9E0C}.Debug|Win32.Build.0 = Release|Win32 - {94F286EB-0016-4205-8B39-25EDB17C9E0C}.Release|Win32.ActiveCfg = Release|Win32 - {94F286EB-0016-4205-8B39-25EDB17C9E0C}.Release|Win32.Build.0 = Release|Win32 - {937982FD-CB54-40B7-9A95-638F97AC6C81}.Debug|Win32.ActiveCfg = Release|Win32 - {937982FD-CB54-40B7-9A95-638F97AC6C81}.Release|Win32.ActiveCfg = Release|Win32 - {3D404CC8-162C-46D5-8910-AB54DE545FC5}.Debug|Win32.ActiveCfg = Release|Win32 - {3D404CC8-162C-46D5-8910-AB54DE545FC5}.Debug|Win32.Build.0 = Release|Win32 - {3D404CC8-162C-46D5-8910-AB54DE545FC5}.Release|Win32.ActiveCfg = Release|Win32 - {3D404CC8-162C-46D5-8910-AB54DE545FC5}.Release|Win32.Build.0 = Release|Win32 - {514E32B7-43FA-4CC8-A87C-540F4E0AF768}.Debug|Win32.ActiveCfg = Release|Win32 - {514E32B7-43FA-4CC8-A87C-540F4E0AF768}.Debug|Win32.Build.0 = Release|Win32 - {514E32B7-43FA-4CC8-A87C-540F4E0AF768}.Release|Win32.ActiveCfg = Release|Win32 - {514E32B7-43FA-4CC8-A87C-540F4E0AF768}.Release|Win32.Build.0 = Release|Win32 - {34BA4CE1-613B-42E0-8399-761DD96FD595}.Debug|Win32.ActiveCfg = Release|Win32 - {34BA4CE1-613B-42E0-8399-761DD96FD595}.Debug|Win32.Build.0 = Release|Win32 - {34BA4CE1-613B-42E0-8399-761DD96FD595}.Release|Win32.ActiveCfg = Release|Win32 - {34BA4CE1-613B-42E0-8399-761DD96FD595}.Release|Win32.Build.0 = Release|Win32 - {C7621A8E-AB31-4D98-B995-90A99D2D7B45}.Debug|Win32.ActiveCfg = Release|Win32 - {C7621A8E-AB31-4D98-B995-90A99D2D7B45}.Debug|Win32.Build.0 = Release|Win32 - {C7621A8E-AB31-4D98-B995-90A99D2D7B45}.Release|Win32.ActiveCfg = Release|Win32 - {C7621A8E-AB31-4D98-B995-90A99D2D7B45}.Release|Win32.Build.0 = Release|Win32 - {B29EA00F-7420-43C0-B7BB-DF1F8AEF1C94}.Debug|Win32.ActiveCfg = Release|Win32 - {B29EA00F-7420-43C0-B7BB-DF1F8AEF1C94}.Debug|Win32.Build.0 = Release|Win32 - {B29EA00F-7420-43C0-B7BB-DF1F8AEF1C94}.Release|Win32.ActiveCfg = Release|Win32 - {B29EA00F-7420-43C0-B7BB-DF1F8AEF1C94}.Release|Win32.Build.0 = Release|Win32 - {649B6A2C-A3E4-48B6-AF27-D29532356A6B}.Debug|Win32.ActiveCfg = Release|Win32 - {649B6A2C-A3E4-48B6-AF27-D29532356A6B}.Debug|Win32.Build.0 = Release|Win32 - {649B6A2C-A3E4-48B6-AF27-D29532356A6B}.Release|Win32.ActiveCfg = Release|Win32 - {649B6A2C-A3E4-48B6-AF27-D29532356A6B}.Release|Win32.Build.0 = Release|Win32 - {928D4E54-26B5-4B24-A1C4-4775BC0BE76C}.Debug|Win32.ActiveCfg = Release|Win32 - {928D4E54-26B5-4B24-A1C4-4775BC0BE76C}.Debug|Win32.Build.0 = Release|Win32 - {928D4E54-26B5-4B24-A1C4-4775BC0BE76C}.Release|Win32.ActiveCfg = Release|Win32 - {928D4E54-26B5-4B24-A1C4-4775BC0BE76C}.Release|Win32.Build.0 = Release|Win32 - {E8AE8FF7-54BB-43EC-ACFD-45E70B73A2C9}.Debug|Win32.ActiveCfg = Release|Win32 - {E8AE8FF7-54BB-43EC-ACFD-45E70B73A2C9}.Debug|Win32.Build.0 = Release|Win32 - {E8AE8FF7-54BB-43EC-ACFD-45E70B73A2C9}.Release|Win32.ActiveCfg = Release|Win32 - {E8AE8FF7-54BB-43EC-ACFD-45E70B73A2C9}.Release|Win32.Build.0 = Release|Win32 - {469D0696-C16C-4EC5-819F-C07E0F384285}.Debug|Win32.ActiveCfg = Release|Win32 - {469D0696-C16C-4EC5-819F-C07E0F384285}.Debug|Win32.Build.0 = Release|Win32 - {469D0696-C16C-4EC5-819F-C07E0F384285}.Release|Win32.ActiveCfg = Release|Win32 - {469D0696-C16C-4EC5-819F-C07E0F384285}.Release|Win32.Build.0 = Release|Win32 - {EEE171FE-9C9D-4552-BF21-2BAA5DAEDFF6}.Debug|Win32.ActiveCfg = Release|Win32 - {EEE171FE-9C9D-4552-BF21-2BAA5DAEDFF6}.Debug|Win32.Build.0 = Release|Win32 - {EEE171FE-9C9D-4552-BF21-2BAA5DAEDFF6}.Release|Win32.ActiveCfg = Release|Win32 - {EEE171FE-9C9D-4552-BF21-2BAA5DAEDFF6}.Release|Win32.Build.0 = Release|Win32 - {5008C2DB-FA43-4E2A-B03A-C60F43FAAC1C}.Debug|Win32.ActiveCfg = Release|Win32 - {5008C2DB-FA43-4E2A-B03A-C60F43FAAC1C}.Debug|Win32.Build.0 = Release|Win32 - {5008C2DB-FA43-4E2A-B03A-C60F43FAAC1C}.Release|Win32.ActiveCfg = Release|Win32 - {5008C2DB-FA43-4E2A-B03A-C60F43FAAC1C}.Release|Win32.Build.0 = Release|Win32 - {DF6060F0-C235-4E8E-AF43-D3385A506A2F}.Debug|Win32.ActiveCfg = Release|Win32 - {DF6060F0-C235-4E8E-AF43-D3385A506A2F}.Debug|Win32.Build.0 = Release|Win32 - {DF6060F0-C235-4E8E-AF43-D3385A506A2F}.Release|Win32.ActiveCfg = Release|Win32 - {DF6060F0-C235-4E8E-AF43-D3385A506A2F}.Release|Win32.Build.0 = Release|Win32 - {D87A0B24-AA34-41A6-93FC-7033D6BBCB63}.Debug|Win32.ActiveCfg = Release|Win32 - {D87A0B24-AA34-41A6-93FC-7033D6BBCB63}.Debug|Win32.Build.0 = Release|Win32 - {D87A0B24-AA34-41A6-93FC-7033D6BBCB63}.Release|Win32.ActiveCfg = Release|Win32 - {D87A0B24-AA34-41A6-93FC-7033D6BBCB63}.Release|Win32.Build.0 = Release|Win32 - {BAC3C08E-6E1A-4EA9-9F72-EE0BCC4537A9}.Debug|Win32.ActiveCfg = Release|Win32 - {BAC3C08E-6E1A-4EA9-9F72-EE0BCC4537A9}.Debug|Win32.Build.0 = Release|Win32 - {BAC3C08E-6E1A-4EA9-9F72-EE0BCC4537A9}.Release|Win32.ActiveCfg = Release|Win32 - {BAC3C08E-6E1A-4EA9-9F72-EE0BCC4537A9}.Release|Win32.Build.0 = Release|Win32 - {2B29ADC6-0E59-428F-B881-062B6515F398}.Debug|Win32.ActiveCfg = Release|Win32 - {2B29ADC6-0E59-428F-B881-062B6515F398}.Debug|Win32.Build.0 = Release|Win32 - {2B29ADC6-0E59-428F-B881-062B6515F398}.Release|Win32.ActiveCfg = Release|Win32 - {2B29ADC6-0E59-428F-B881-062B6515F398}.Release|Win32.Build.0 = Release|Win32 - {EC965242-1D96-4E0C-9AFB-CD5EB64FDB2E}.Debug|Win32.ActiveCfg = Release|Win32 - {EC965242-1D96-4E0C-9AFB-CD5EB64FDB2E}.Debug|Win32.Build.0 = Release|Win32 - {EC965242-1D96-4E0C-9AFB-CD5EB64FDB2E}.Release|Win32.ActiveCfg = Release|Win32 - {EC965242-1D96-4E0C-9AFB-CD5EB64FDB2E}.Release|Win32.Build.0 = Release|Win32 - {8B3A3FF3-B78C-4D50-8BBB-68F58A62DAEC}.Debug|Win32.ActiveCfg = Release|Win32 - {8B3A3FF3-B78C-4D50-8BBB-68F58A62DAEC}.Debug|Win32.Build.0 = Release|Win32 - {8B3A3FF3-B78C-4D50-8BBB-68F58A62DAEC}.Release|Win32.ActiveCfg = Release|Win32 - {8B3A3FF3-B78C-4D50-8BBB-68F58A62DAEC}.Release|Win32.Build.0 = Release|Win32 - {B80E8A57-208E-49FA-83BD-546B46A9BC4E}.Debug|Win32.ActiveCfg = Release|Win32 - {B80E8A57-208E-49FA-83BD-546B46A9BC4E}.Debug|Win32.Build.0 = Release|Win32 - {B80E8A57-208E-49FA-83BD-546B46A9BC4E}.Release|Win32.ActiveCfg = Release|Win32 - {B80E8A57-208E-49FA-83BD-546B46A9BC4E}.Release|Win32.Build.0 = Release|Win32 - {3B7C102E-1228-4C67-AAAF-90A2894370FD}.Debug|Win32.ActiveCfg = Release|Win32 - {3B7C102E-1228-4C67-AAAF-90A2894370FD}.Debug|Win32.Build.0 = Release|Win32 - {3B7C102E-1228-4C67-AAAF-90A2894370FD}.Release|Win32.ActiveCfg = Release|Win32 - {3B7C102E-1228-4C67-AAAF-90A2894370FD}.Release|Win32.Build.0 = Release|Win32 - {AA03D1D3-E62E-491E-BED6-7A5851879382}.Debug|Win32.ActiveCfg = Release|Win32 - {AA03D1D3-E62E-491E-BED6-7A5851879382}.Debug|Win32.Build.0 = Release|Win32 - {AA03D1D3-E62E-491E-BED6-7A5851879382}.Release|Win32.ActiveCfg = Release|Win32 - {AA03D1D3-E62E-491E-BED6-7A5851879382}.Release|Win32.Build.0 = Release|Win32 - {8926BDE3-BD11-4DA3-8F5D-09A23243DDBB}.Debug|Win32.ActiveCfg = Release|Win32 - {8926BDE3-BD11-4DA3-8F5D-09A23243DDBB}.Debug|Win32.Build.0 = Release|Win32 - {8926BDE3-BD11-4DA3-8F5D-09A23243DDBB}.Release|Win32.ActiveCfg = Release|Win32 - {8926BDE3-BD11-4DA3-8F5D-09A23243DDBB}.Release|Win32.Build.0 = Release|Win32 - {73B65A5F-06D3-46E3-AE76-74853A0FDB36}.Debug|Win32.ActiveCfg = Release|Win32 - {73B65A5F-06D3-46E3-AE76-74853A0FDB36}.Debug|Win32.Build.0 = Release|Win32 - {73B65A5F-06D3-46E3-AE76-74853A0FDB36}.Release|Win32.ActiveCfg = Release|Win32 - {73B65A5F-06D3-46E3-AE76-74853A0FDB36}.Release|Win32.Build.0 = Release|Win32 - {3E45FEB0-8CB6-42BC-BEF2-B7484198359A}.Debug|Win32.ActiveCfg = Release|Win32 - {3E45FEB0-8CB6-42BC-BEF2-B7484198359A}.Debug|Win32.Build.0 = Release|Win32 - {3E45FEB0-8CB6-42BC-BEF2-B7484198359A}.Release|Win32.ActiveCfg = Release|Win32 - {3E45FEB0-8CB6-42BC-BEF2-B7484198359A}.Release|Win32.Build.0 = Release|Win32 - {5DD390AE-DCDE-4B18-BEDF-6EE21B5DD6AC}.Debug|Win32.ActiveCfg = Release|Win32 - {5DD390AE-DCDE-4B18-BEDF-6EE21B5DD6AC}.Debug|Win32.Build.0 = Release|Win32 - {5DD390AE-DCDE-4B18-BEDF-6EE21B5DD6AC}.Release|Win32.ActiveCfg = Release|Win32 - {5DD390AE-DCDE-4B18-BEDF-6EE21B5DD6AC}.Release|Win32.Build.0 = Release|Win32 - {B839A523-2BF1-4041-8438-FB084FEDE4CA}.Debug|Win32.ActiveCfg = Release|Win32 - {B839A523-2BF1-4041-8438-FB084FEDE4CA}.Debug|Win32.Build.0 = Release|Win32 - {B839A523-2BF1-4041-8438-FB084FEDE4CA}.Release|Win32.ActiveCfg = Release|Win32 - {B839A523-2BF1-4041-8438-FB084FEDE4CA}.Release|Win32.Build.0 = Release|Win32 - {6BC0051B-48CC-4B9D-9BFF-5D6B9CAEDF4C}.Debug|Win32.ActiveCfg = Release|Win32 - {6BC0051B-48CC-4B9D-9BFF-5D6B9CAEDF4C}.Debug|Win32.Build.0 = Release|Win32 - {6BC0051B-48CC-4B9D-9BFF-5D6B9CAEDF4C}.Release|Win32.ActiveCfg = Release|Win32 - {6BC0051B-48CC-4B9D-9BFF-5D6B9CAEDF4C}.Release|Win32.Build.0 = Release|Win32 - {B93C82CE-D496-47E8-B111-99F406ADB490}.Debug|Win32.ActiveCfg = Release|Win32 - {B93C82CE-D496-47E8-B111-99F406ADB490}.Debug|Win32.Build.0 = Release|Win32 - {B93C82CE-D496-47E8-B111-99F406ADB490}.Release|Win32.ActiveCfg = Release|Win32 - {B93C82CE-D496-47E8-B111-99F406ADB490}.Release|Win32.Build.0 = Release|Win32 - {78349AD2-3C40-4D22-BFE1-6E63686E3FFC}.Debug|Win32.ActiveCfg = Release|Win32 - {78349AD2-3C40-4D22-BFE1-6E63686E3FFC}.Debug|Win32.Build.0 = Release|Win32 - {78349AD2-3C40-4D22-BFE1-6E63686E3FFC}.Release|Win32.ActiveCfg = Release|Win32 - {78349AD2-3C40-4D22-BFE1-6E63686E3FFC}.Release|Win32.Build.0 = Release|Win32 - {E21FE87C-B9E0-40ED-B1C5-044C116B42F8}.Debug|Win32.ActiveCfg = Release|Win32 - {E21FE87C-B9E0-40ED-B1C5-044C116B42F8}.Debug|Win32.Build.0 = Release|Win32 - {E21FE87C-B9E0-40ED-B1C5-044C116B42F8}.Release|Win32.ActiveCfg = Release|Win32 - {E21FE87C-B9E0-40ED-B1C5-044C116B42F8}.Release|Win32.Build.0 = Release|Win32 - {6F89B606-00C4-4DE5-BBE4-4D058E6AEB6B}.Debug|Win32.ActiveCfg = Release|Win32 - {6F89B606-00C4-4DE5-BBE4-4D058E6AEB6B}.Debug|Win32.Build.0 = Release|Win32 - {6F89B606-00C4-4DE5-BBE4-4D058E6AEB6B}.Release|Win32.ActiveCfg = Release|Win32 - {6F89B606-00C4-4DE5-BBE4-4D058E6AEB6B}.Release|Win32.Build.0 = Release|Win32 - {A2F8D0FB-F549-42BF-BB86-108B7B4AFBE0}.Debug|Win32.ActiveCfg = Release|Win32 - {A2F8D0FB-F549-42BF-BB86-108B7B4AFBE0}.Debug|Win32.Build.0 = Release|Win32 - {A2F8D0FB-F549-42BF-BB86-108B7B4AFBE0}.Release|Win32.ActiveCfg = Release|Win32 - {A2F8D0FB-F549-42BF-BB86-108B7B4AFBE0}.Release|Win32.Build.0 = Release|Win32 - {6406C9C4-DCB7-43C5-828A-15B669A2A1A4}.Debug|Win32.ActiveCfg = Release|Win32 - {6406C9C4-DCB7-43C5-828A-15B669A2A1A4}.Debug|Win32.Build.0 = Release|Win32 - {6406C9C4-DCB7-43C5-828A-15B669A2A1A4}.Release|Win32.ActiveCfg = Release|Win32 - {6406C9C4-DCB7-43C5-828A-15B669A2A1A4}.Release|Win32.Build.0 = Release|Win32 - {94D774D1-1403-4F01-AD70-1337438E970B}.Debug|Win32.ActiveCfg = Release|Win32 - {94D774D1-1403-4F01-AD70-1337438E970B}.Debug|Win32.Build.0 = Release|Win32 - {94D774D1-1403-4F01-AD70-1337438E970B}.Release|Win32.ActiveCfg = Release|Win32 - {94D774D1-1403-4F01-AD70-1337438E970B}.Release|Win32.Build.0 = Release|Win32 - {509AE767-82A2-48A7-8C11-21D5A2432F3E}.Debug|Win32.ActiveCfg = Release|Win32 - {509AE767-82A2-48A7-8C11-21D5A2432F3E}.Debug|Win32.Build.0 = Release|Win32 - {509AE767-82A2-48A7-8C11-21D5A2432F3E}.Release|Win32.ActiveCfg = Release|Win32 - {509AE767-82A2-48A7-8C11-21D5A2432F3E}.Release|Win32.Build.0 = Release|Win32 - {D7E6ABD7-9412-4F77-80C8-75517D2B8D3E}.Debug|Win32.ActiveCfg = Debug|Win32 - {D7E6ABD7-9412-4F77-80C8-75517D2B8D3E}.Debug|Win32.Build.0 = Debug|Win32 - {D7E6ABD7-9412-4F77-80C8-75517D2B8D3E}.Release|Win32.ActiveCfg = Release|Win32 - {D7E6ABD7-9412-4F77-80C8-75517D2B8D3E}.Release|Win32.Build.0 = Release|Win32 - {C5F9071F-B8DC-4C67-9364-84B1FF583951}.Debug|Win32.ActiveCfg = Debug|Win32 - {C5F9071F-B8DC-4C67-9364-84B1FF583951}.Debug|Win32.Build.0 = Debug|Win32 - {C5F9071F-B8DC-4C67-9364-84B1FF583951}.Release|Win32.ActiveCfg = Release|Win32 - {C5F9071F-B8DC-4C67-9364-84B1FF583951}.Release|Win32.Build.0 = Release|Win32 - {498BBB37-9982-41F9-8A39-140E794E76DC}.Debug|Win32.ActiveCfg = Debug|Win32 - {498BBB37-9982-41F9-8A39-140E794E76DC}.Debug|Win32.Build.0 = Debug|Win32 - {498BBB37-9982-41F9-8A39-140E794E76DC}.Release|Win32.ActiveCfg = Release|Win32 - {498BBB37-9982-41F9-8A39-140E794E76DC}.Release|Win32.Build.0 = Release|Win32 - {E17456B8-BFA1-402F-8D40-A1157193673A}.Debug|Win32.ActiveCfg = Debug|Win32 - {E17456B8-BFA1-402F-8D40-A1157193673A}.Debug|Win32.Build.0 = Debug|Win32 - {E17456B8-BFA1-402F-8D40-A1157193673A}.Release|Win32.ActiveCfg = Release|Win32 - {E17456B8-BFA1-402F-8D40-A1157193673A}.Release|Win32.Build.0 = Release|Win32 - {176EEE86-5A0F-4A0A-8950-1672579625B4}.Debug|Win32.ActiveCfg = Debug|Win32 - {176EEE86-5A0F-4A0A-8950-1672579625B4}.Debug|Win32.Build.0 = Debug|Win32 - {176EEE86-5A0F-4A0A-8950-1672579625B4}.Release|Win32.ActiveCfg = Release|Win32 - {176EEE86-5A0F-4A0A-8950-1672579625B4}.Release|Win32.Build.0 = Release|Win32 - {C9E16BC3-AB98-440C-9CFE-0D2FDB7D1FB6}.Debug|Win32.ActiveCfg = Debug|Win32 - {C9E16BC3-AB98-440C-9CFE-0D2FDB7D1FB6}.Debug|Win32.Build.0 = Debug|Win32 - {C9E16BC3-AB98-440C-9CFE-0D2FDB7D1FB6}.Release|Win32.ActiveCfg = Release|Win32 - {C9E16BC3-AB98-440C-9CFE-0D2FDB7D1FB6}.Release|Win32.Build.0 = Release|Win32 - {A6D2A2C7-D277-4631-A030-EAB0D6C6CA99}.Debug|Win32.ActiveCfg = Debug|Win32 - {A6D2A2C7-D277-4631-A030-EAB0D6C6CA99}.Debug|Win32.Build.0 = Debug|Win32 - {A6D2A2C7-D277-4631-A030-EAB0D6C6CA99}.Release|Win32.ActiveCfg = Release|Win32 - {A6D2A2C7-D277-4631-A030-EAB0D6C6CA99}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/cpp_test_suite/win32/vc9/test_suite/unlock/unlock.vcproj b/cpp_test_suite/win32/vc9/test_suite/unlock/unlock.vcproj deleted file mode 100644 index 19c40dbe3..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/unlock/unlock.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/user_event/user_event.vcproj b/cpp_test_suite/win32/vc9/test_suite/user_event/user_event.vcproj deleted file mode 100644 index 2d55c283f..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/user_event/user_event.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/w_r_attr/w_r_attr.vcproj b/cpp_test_suite/win32/vc9/test_suite/w_r_attr/w_r_attr.vcproj deleted file mode 100644 index 665b7f378..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/w_r_attr/w_r_attr.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/wait_mcast_dev/wait_mcast_dev.vcproj b/cpp_test_suite/win32/vc9/test_suite/wait_mcast_dev/wait_mcast_dev.vcproj deleted file mode 100644 index 6762f1981..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/wait_mcast_dev/wait_mcast_dev.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/write_attr/write_attr.vcproj b/cpp_test_suite/win32/vc9/test_suite/write_attr/write_attr.vcproj deleted file mode 100644 index e933f93ef..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/write_attr/write_attr.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win32/vc9/test_suite/write_attr_3/write_attr_3.vcproj b/cpp_test_suite/win32/vc9/test_suite/write_attr_3/write_attr_3.vcproj deleted file mode 100644 index d1ff18bb6..000000000 --- a/cpp_test_suite/win32/vc9/test_suite/write_attr_3/write_attr_3.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpp_test_suite/win64/vc10/test_suite/ConfEventBugClient/ConfEventBugClient.vcxproj b/cpp_test_suite/win64/vc10/test_suite/ConfEventBugClient/ConfEventBugClient.vcxproj deleted file mode 100644 index 1f03f4c93..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/ConfEventBugClient/ConfEventBugClient.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {3D404CC8-162C-46D5-8910-AB54DE545FC5} - ConfEventBugClient - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - ConfEventBugClient - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/Poll/Include_Libs.props b/cpp_test_suite/win64/vc10/test_suite/Poll/Include_Libs.props deleted file mode 100644 index 351bc88c6..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/Poll/Include_Libs.props +++ /dev/null @@ -1,19 +0,0 @@ - - - - <_ProjectFileVersion>10.0.40219.1 - - - - $(PREFIX)/win64/include;$(OMNI_BASE)\include\vc10;$(LOG4TANGO_BASE)\win64\include\vc10;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_WINSTATIC;%(PreprocessorDefinitions) - MultiThreadedDebug - Level2 - - - tangod.lib;log4tangod.lib;omniORB4d.lib;omniDynamic4d.lib;omnithreadd.lib;COS4d.lib;zmqd.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win64\bin\$(ProjectName).exe - $(PREFIX)\win64\lib\vc10;$(OMNI_BASE)\lib\vc10;$(LOG4TANGO_BASE)\win64\lib\vc10;$(ZMQ_BASE)\win64\lib\vc10;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib/x64;%(AdditionalLibraryDirectories) - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/Poll/Include_libs_release.props b/cpp_test_suite/win64/vc10/test_suite/Poll/Include_libs_release.props deleted file mode 100644 index 7b2fe7be4..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/Poll/Include_libs_release.props +++ /dev/null @@ -1,19 +0,0 @@ - - - - <_ProjectFileVersion>10.0.40219.1 - - - - Disabled - $(PREFIX)/win64/include;$(OMNI_BASE)\include\vc10;$(ZMQ_BASE)\win64\include\vc10;$(LOG4TANGO_BASE)\win64\include\vc10;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;%(AdditionalIncludeDirectories) - WIN32;_CONSOLE;_WINSTATIC;%(PreprocessorDefinitions) - Level2 - - - tango.lib;log4tango.lib;omniORB4.lib;omniDynamic4.lib;omnithread.lib;COS4.lib;zmq.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win64\bin\$(ProjectName).exe - $(PREFIX)\win64\lib\vc10;$(OMNI_BASE)\lib\vc10;$(LOG4TANGO_BASE)\win64\lib\vc10;$(ZMQ_BASE)\win64\lib\vc10;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib\x64;%(AdditionalLibraryDirectories) - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/Poll/Poll.vcxproj b/cpp_test_suite/win64/vc10/test_suite/Poll/Poll.vcxproj deleted file mode 100644 index 87c766553..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/Poll/Poll.vcxproj +++ /dev/null @@ -1,168 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {5CF0AD69-352A-4827-AD4B-DE629E1B4E78} - Poll - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - Poll - Poll - false - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - $(PREFIX)/win64/include;$(OMNI_BASE)/win64/include;$(LOG4TANGO_BASE)/win64/include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level2 - ProgramDatabase - - - true - Console - $(PREFIX)\win64\bin\$(ProjectName).exe - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - false - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - $(PREFIX)/win64/include;$(OMNI_BASE)/win64/include;$(LOG4TANGO_BASE)/win64/include;%(AdditionalIncludeDirectories) - - - false - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/StopPoll/StopPoll.vcxproj b/cpp_test_suite/win64/vc10/test_suite/StopPoll/StopPoll.vcxproj deleted file mode 100644 index 0bf3206f5..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/StopPoll/StopPoll.vcxproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {E37BBC67-2308-4B63-B961-71519FB9F279} - StopPoll - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - StopPoll - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/acc_right/acc_right.vcxproj b/cpp_test_suite/win64/vc10/test_suite/acc_right/acc_right.vcxproj deleted file mode 100644 index 4b42de54e..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/acc_right/acc_right.vcxproj +++ /dev/null @@ -1,156 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {937982FD-CB54-40B7-9A95-638F97AC6C81} - acc_right - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - false - false - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/allowed_cmd/allowed_cmd.vcxproj b/cpp_test_suite/win64/vc10/test_suite/allowed_cmd/allowed_cmd.vcxproj deleted file mode 100644 index 23f80289a..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/allowed_cmd/allowed_cmd.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {AAD01C98-3B8F-495F-A070-80A97A9AEAE2} - allowed_cmd - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - allowed_cmd - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/archive_event/archive_event.vcxproj b/cpp_test_suite/win64/vc10/test_suite/archive_event/archive_event.vcxproj deleted file mode 100644 index 261d0a24f..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/archive_event/archive_event.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B80E8A57-208E-49FA-83BD-546B46A9BC4E} - archive_event - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - archive_event - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/asyn_attr/asyn_attr.vcxproj b/cpp_test_suite/win64/vc10/test_suite/asyn_attr/asyn_attr.vcxproj deleted file mode 100644 index 795cc2087..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/asyn_attr/asyn_attr.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {C7621A8E-AB31-4D98-B995-90A99D2D7B45} - asyn_attr - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - asyn_attr - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/asyn_attr_cb/asyn_attr_cb.vcxproj b/cpp_test_suite/win64/vc10/test_suite/asyn_attr_cb/asyn_attr_cb.vcxproj deleted file mode 100644 index 0bb868ae3..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/asyn_attr_cb/asyn_attr_cb.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {5008C2DB-FA43-4E2A-B03A-C60F43FAAC1C} - asyn_attr_cb - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - asyn_attr_cb - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/asyn_attr_multi/asyn_attr_multi.vcxproj b/cpp_test_suite/win64/vc10/test_suite/asyn_attr_multi/asyn_attr_multi.vcxproj deleted file mode 100644 index 5f14ea159..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/asyn_attr_multi/asyn_attr_multi.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B29EA00F-7420-43C0-B7BB-DF1F8AEF1C94} - asyn_attr_multi - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - asyn_attr_multi - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/asyn_cb/asyn_cb.vcxproj b/cpp_test_suite/win64/vc10/test_suite/asyn_cb/asyn_cb.vcxproj deleted file mode 100644 index 3f001ee7a..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/asyn_cb/asyn_cb.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {E8AE8FF7-54BB-43EC-ACFD-45E70B73A2C9} - asyn_cb - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - asyn_cb - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/asyn_cb2/asyn_cb2.vcxproj b/cpp_test_suite/win64/vc10/test_suite/asyn_cb2/asyn_cb2.vcxproj deleted file mode 100644 index 8cf3402ee..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/asyn_cb2/asyn_cb2.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {469D0696-C16C-4EC5-819F-C07E0F384285} - asyn_cb2 - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - asyn_cb2 - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/asyn_cb_cmd/asyn_cb_cmd.vcxproj b/cpp_test_suite/win64/vc10/test_suite/asyn_cb_cmd/asyn_cb_cmd.vcxproj deleted file mode 100644 index f3c592f3f..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/asyn_cb_cmd/asyn_cb_cmd.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {EEE171FE-9C9D-4552-BF21-2BAA5DAEDFF6} - asyn_cb_cmd - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - asyn_cb_cmd - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/asyn_cmd/asyn_cmd.vcxproj b/cpp_test_suite/win64/vc10/test_suite/asyn_cmd/asyn_cmd.vcxproj deleted file mode 100644 index 5172e876e..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/asyn_cmd/asyn_cmd.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {34BA4CE1-613B-42E0-8399-761DD96FD595} - asyn_cmd - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - asyn_cmd - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/asyn_thread/asyn_thread.vcxproj b/cpp_test_suite/win64/vc10/test_suite/asyn_thread/asyn_thread.vcxproj deleted file mode 100644 index 77d03f08d..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/asyn_thread/asyn_thread.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {D87A0B24-AA34-41A6-93FC-7033D6BBCB63} - asyn_thread - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - asyn_thread - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/asyn_write_attr/asyn_write_attr.vcxproj b/cpp_test_suite/win64/vc10/test_suite/asyn_write_attr/asyn_write_attr.vcxproj deleted file mode 100644 index 332af30ae..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/asyn_write_attr/asyn_write_attr.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {649B6A2C-A3E4-48B6-AF27-D29532356A6B} - asyn_write_attr - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - asyn_write_attr - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/asyn_write_attr_multi/asyn_write_attr_multi.vcxproj b/cpp_test_suite/win64/vc10/test_suite/asyn_write_attr_multi/asyn_write_attr_multi.vcxproj deleted file mode 100644 index 11ca97b92..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/asyn_write_attr_multi/asyn_write_attr_multi.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {928D4E54-26B5-4B24-A1C4-4775BC0BE76C} - asyn_write_attr_multi - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - asyn_write_attr_multi - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/asyn_write_cb/asyn_write_cb.vcxproj b/cpp_test_suite/win64/vc10/test_suite/asyn_write_cb/asyn_write_cb.vcxproj deleted file mode 100644 index d5d990150..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/asyn_write_cb/asyn_write_cb.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {DF6060F0-C235-4E8E-AF43-D3385A506A2F} - asyn_write_cb - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - asyn_write_cb - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/att_conf/att_conf.vcxproj b/cpp_test_suite/win64/vc10/test_suite/att_conf/att_conf.vcxproj deleted file mode 100644 index 16358d30d..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/att_conf/att_conf.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {514E32B7-43FA-4CC8-A87C-540F4E0AF768} - att_conf - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - att_conf - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/att_conf_event/att_conf_event.vcxproj b/cpp_test_suite/win64/vc10/test_suite/att_conf_event/att_conf_event.vcxproj deleted file mode 100644 index 55506c61e..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/att_conf_event/att_conf_event.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B839A523-2BF1-4041-8438-FB084FEDE4CA} - att_conf_event - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - att_conf_event - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/att_conf_event_buffer/att_conf_event_buffer.vcxproj b/cpp_test_suite/win64/vc10/test_suite/att_conf_event_buffer/att_conf_event_buffer.vcxproj deleted file mode 100644 index 64837560c..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/att_conf_event_buffer/att_conf_event_buffer.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {78349AD2-3C40-4D22-BFE1-6E63686E3FFC} - att_conf_event_buffer - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - att_conf_event_buffer - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/att_type_event/att_type_event.vcxproj b/cpp_test_suite/win64/vc10/test_suite/att_type_event/att_type_event.vcxproj deleted file mode 100644 index 733ac1ea4..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/att_type_event/att_type_event.vcxproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {509AE767-82A2-48A7-8C11-21D5A2432F3E} - att_type_event - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - att_type_event - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - false - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - false - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/attr_conf_test/attr_conf_test.vcxproj b/cpp_test_suite/win64/vc10/test_suite/attr_conf_test/attr_conf_test.vcxproj deleted file mode 100644 index 3c2e627b4..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/attr_conf_test/attr_conf_test.vcxproj +++ /dev/null @@ -1,153 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {34EE9DAB-1D81-4E13-892C-CD844BCA4E50} - Win32Proj - attr_conf_test - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - $(PREFIX)\win64\bin\ - $(Configuration)\ - attr_conf_test - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level2 - - - Disabled - true - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - false - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/attr_manip/attr_manip.vcxproj b/cpp_test_suite/win64/vc10/test_suite/attr_manip/attr_manip.vcxproj deleted file mode 100644 index f4c0cac3c..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/attr_manip/attr_manip.vcxproj +++ /dev/null @@ -1,159 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {8594FBDD-2938-49E0-AF5B-F524ABEE5C0F} - attr_manip - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - attr_manip - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/attr_misc/attr_misc.vcxproj b/cpp_test_suite/win64/vc10/test_suite/attr_misc/attr_misc.vcxproj deleted file mode 100644 index 4afb293aa..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/attr_misc/attr_misc.vcxproj +++ /dev/null @@ -1,163 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2640C5A4-7B5E-4159-AF46-8D012582A70A} - attr_misc - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - attr_misc - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - NotSet - false - - - false - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/attr_proxy/attr_proxy.vcxproj b/cpp_test_suite/win64/vc10/test_suite/attr_proxy/attr_proxy.vcxproj deleted file mode 100644 index cf55aea52..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/attr_proxy/attr_proxy.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2571DAA6-742A-49F1-875C-8E3EF9F52EF9} - attr_proxy - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - attr_proxy - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/attr_types/attr_types.vcxproj b/cpp_test_suite/win64/vc10/test_suite/attr_types/attr_types.vcxproj deleted file mode 100644 index b535614b0..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/attr_types/attr_types.vcxproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {DC4473DB-EAEA-4DC7-BB6F-1CA2DF5F2F3B} - attr_types - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - attr_types - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/auto_asyn_cmd/auto_asyn_cmd.vcxproj b/cpp_test_suite/win64/vc10/test_suite/auto_asyn_cmd/auto_asyn_cmd.vcxproj deleted file mode 100644 index a98f17a6c..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/auto_asyn_cmd/auto_asyn_cmd.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {BAC3C08E-6E1A-4EA9-9F72-EE0BCC4537A9} - auto_asyn_cmd - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - auto_asyn_cmd - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/change_event/change_event.vcxproj b/cpp_test_suite/win64/vc10/test_suite/change_event/change_event.vcxproj deleted file mode 100644 index 0b925bc12..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/change_event/change_event.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {EC965242-1D96-4E0C-9AFB-CD5EB64FDB2E} - change_event - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - change_event - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/change_event64/change_event64.vcxproj b/cpp_test_suite/win64/vc10/test_suite/change_event64/change_event64.vcxproj deleted file mode 100644 index 3cf688d90..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/change_event64/change_event64.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {8B3A3FF3-B78C-4D50-8BBB-68F58A62DAEC} - change_event64 - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - change_event64 - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/change_event_buffer/change_event_buffer.vcxproj b/cpp_test_suite/win64/vc10/test_suite/change_event_buffer/change_event_buffer.vcxproj deleted file mode 100644 index b0202048a..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/change_event_buffer/change_event_buffer.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B93C82CE-D496-47E8-B111-99F406ADB490} - change_event_buffer - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - change_event_buffer - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/cmd_inout/cmd_inout.vcxproj b/cpp_test_suite/win64/vc10/test_suite/cmd_inout/cmd_inout.vcxproj deleted file mode 100644 index 4cacb1bcb..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/cmd_inout/cmd_inout.vcxproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B011952D-D686-4A1B-92A9-F457B8444154} - cmd_inout - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - cmd_inout - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level1 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level1 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/cmd_types/cmd_types.vcxproj b/cpp_test_suite/win64/vc10/test_suite/cmd_types/cmd_types.vcxproj deleted file mode 100644 index 51b7a7008..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/cmd_types/cmd_types.vcxproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {290BA60F-09D9-4BCA-8403-94EDCB899E53} - cmd_types - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - cmd_types - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/copy_devproxy/copy_devproxy.vcxproj b/cpp_test_suite/win64/vc10/test_suite/copy_devproxy/copy_devproxy.vcxproj deleted file mode 100644 index 66a846a84..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/copy_devproxy/copy_devproxy.vcxproj +++ /dev/null @@ -1,156 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {37D0C9C1-31C0-467F-9310-DAF494377E95} - copy_devproxy - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - copy_devproxy - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreaded - - - Level3 - EditAndContinue - - - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreaded - - - Level3 - ProgramDatabase - - - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/data_ready_event/data_ready_event.vcxproj b/cpp_test_suite/win64/vc10/test_suite/data_ready_event/data_ready_event.vcxproj deleted file mode 100644 index 6ce94e6d8..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/data_ready_event/data_ready_event.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {6BC0051B-48CC-4B9D-9BFF-5D6B9CAEDF4C} - data_ready_event - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - data_ready_event - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/data_ready_event_buffer/data_ready_event_buffer.vcxproj b/cpp_test_suite/win64/vc10/test_suite/data_ready_event_buffer/data_ready_event_buffer.vcxproj deleted file mode 100644 index 1e037b00b..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/data_ready_event_buffer/data_ready_event_buffer.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {E21FE87C-B9E0-40ED-B1C5-044C116B42F8} - data_ready_event_buffer - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - data_ready_event_buffer - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/dev_intr_event/dev_intr_event.vcxproj b/cpp_test_suite/win64/vc10/test_suite/dev_intr_event/dev_intr_event.vcxproj deleted file mode 100644 index 21e2b0421..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/dev_intr_event/dev_intr_event.vcxproj +++ /dev/null @@ -1,168 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {6B072643-D0CB-4B7A-BA4C-E7509ADC51B6} - dev_intr_event - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - dev_intr_event - false - - - - Disabled - C:\tango_src\cppapi_7_2_6\server;C:\tango_src\cppapi_7_2_6\client;$(LOG4TANGO_BASE)\win32\include;$(OMNI_BASE)\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - omniORB4d.lib;omniDynamic4d.lib;COS4d.lib;omnithreadd.lib;tangod.lib;log4tangod.lib;comctl32.lib;ws2_32.lib;mswsock.lib;%(AdditionalDependencies) - C:\tango_src\cppapi_7_2_6\win32\tango_vc9\tango_static\lib;$(LOG4TANGO_BASE)\win32\lib;$(OMNI_BASE)\win32\lib;%(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - Disabled - C:\tango_src\cppapi_7_2_6\server;C:\tango_src\cppapi_7_2_6\client;$(LOG4TANGO_BASE)\win32\include;$(OMNI_BASE)\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - omniORB4d.lib;omniDynamic4d.lib;COS4d.lib;omnithreadd.lib;tangod.lib;log4tangod.lib;comctl32.lib;ws2_32.lib;mswsock.lib;%(AdditionalDependencies) - C:\tango_src\cppapi_7_2_6\win32\tango_vc9\tango_static\lib;$(LOG4TANGO_BASE)\win32\lib;$(OMNI_BASE)\win32\lib;%(AdditionalLibraryDirectories) - true - Console - - - - - Disabled - true - %(AdditionalIncludeDirectories) - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - %(AdditionalLibraryDirectories) - Console - true - true - MachineX86 - - - - - Disabled - true - %(AdditionalIncludeDirectories) - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - %(AdditionalLibraryDirectories) - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/ds_cache/ds_cache.vcxproj b/cpp_test_suite/win64/vc10/test_suite/ds_cache/ds_cache.vcxproj deleted file mode 100644 index dddfcbd8d..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/ds_cache/ds_cache.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {19B05026-7732-4FEC-A85C-8C6BC339D761} - ds_cache - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - ds_cache - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/event_lock/event_lock.vcxproj b/cpp_test_suite/win64/vc10/test_suite/event_lock/event_lock.vcxproj deleted file mode 100644 index 60db619d1..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/event_lock/event_lock.vcxproj +++ /dev/null @@ -1,168 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {6F89B606-00C4-4DE5-BBE4-4D058E6AEB6B} - event_lock - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - event_lock - false - - - - Disabled - C:\tango_src\cppapi_7_2_6\server;C:\tango_src\cppapi_7_2_6\client;$(LOG4TANGO_BASE)\win32\include;$(OMNI_BASE)\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - omniORB4d.lib;omniDynamic4d.lib;COS4d.lib;omnithreadd.lib;tangod.lib;log4tangod.lib;comctl32.lib;ws2_32.lib;mswsock.lib;%(AdditionalDependencies) - C:\tango_src\cppapi_7_2_6\win32\tango_vc9\tango_static\lib;$(LOG4TANGO_BASE)\win32\lib;$(OMNI_BASE)\win32\lib;%(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - Disabled - C:\tango_src\cppapi_7_2_6\server;C:\tango_src\cppapi_7_2_6\client;$(LOG4TANGO_BASE)\win32\include;$(OMNI_BASE)\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - omniORB4d.lib;omniDynamic4d.lib;COS4d.lib;omnithreadd.lib;tangod.lib;log4tangod.lib;comctl32.lib;ws2_32.lib;mswsock.lib;%(AdditionalDependencies) - C:\tango_src\cppapi_7_2_6\win32\tango_vc9\tango_static\lib;$(LOG4TANGO_BASE)\win32\lib;$(OMNI_BASE)\win32\lib;%(AdditionalLibraryDirectories) - true - Console - - - - - Disabled - true - %(AdditionalIncludeDirectories) - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - %(AdditionalLibraryDirectories) - Console - true - true - MachineX86 - - - - - Disabled - true - %(AdditionalIncludeDirectories) - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - %(AdditionalLibraryDirectories) - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/lock/lock.vcxproj b/cpp_test_suite/win64/vc10/test_suite/lock/lock.vcxproj deleted file mode 100644 index 20c0673f3..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/lock/lock.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {8A319852-91A7-4339-9C03-F4D355614454} - lock - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - lock - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/locked_device/locked_device.vcxproj b/cpp_test_suite/win64/vc10/test_suite/locked_device/locked_device.vcxproj deleted file mode 100644 index 26f4f46a0..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/locked_device/locked_device.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {683BBC0B-FE1D-4C1C-867A-C1EF384E9848} - locked_device - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - locked_device - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/mem_att/mem_att.vcxproj b/cpp_test_suite/win64/vc10/test_suite/mem_att/mem_att.vcxproj deleted file mode 100644 index e3405f3a4..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/mem_att/mem_att.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B2D73C70-66F2-4BB8-92A4-111C44DAA3DB} - mem_att - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - mem_att - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/misc-devdata/misc-devdata.vcxproj b/cpp_test_suite/win64/vc10/test_suite/misc-devdata/misc-devdata.vcxproj deleted file mode 100644 index dcb793785..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/misc-devdata/misc-devdata.vcxproj +++ /dev/null @@ -1,161 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - misc_devdata - {A2E9C810-2935-4805-8792-496A0ED10839} - miscdevdata - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - misc_devdata - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/misc_devattr/misc_devattr.vcxproj b/cpp_test_suite/win64/vc10/test_suite/misc_devattr/misc_devattr.vcxproj deleted file mode 100644 index 55640bf5d..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/misc_devattr/misc_devattr.vcxproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {4CD9F188-97C9-4C1F-AC7B-1666D5FAE3C3} - misc_devattr - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - misc_devattr - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/misc_devproxy/misc_devproxy.vcxproj b/cpp_test_suite/win64/vc10/test_suite/misc_devproxy/misc_devproxy.vcxproj deleted file mode 100644 index 07382d3c2..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/misc_devproxy/misc_devproxy.vcxproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {D6F15615-2C92-4CFE-B548-9506ECFD73AB} - misc_devproxy - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - misc_devproxy - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/multi_dev_event/multi_dev_event.vcxproj b/cpp_test_suite/win64/vc10/test_suite/multi_dev_event/multi_dev_event.vcxproj deleted file mode 100644 index 089bd5cf7..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/multi_dev_event/multi_dev_event.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B0341BD0-497A-4969-B045-1D259C59B32D} - multi_dev_event - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - multi_dev_event - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/multi_event/multi_event.vcxproj b/cpp_test_suite/win64/vc10/test_suite/multi_event/multi_event.vcxproj deleted file mode 100644 index 02130f983..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/multi_event/multi_event.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {A2F8D0FB-F549-42BF-BB86-108B7B4AFBE0} - multi_event - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - multi_event - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/multiple_new/multiple_new.vcxproj b/cpp_test_suite/win64/vc10/test_suite/multiple_new/multiple_new.vcxproj deleted file mode 100644 index 16aaa0e4d..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/multiple_new/multiple_new.vcxproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B70EC07A-24E8-44F0-8CE6-49AC2760470F} - multiple_new - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - multiple_new - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/new_devproxy/new_devproxy.vcxproj b/cpp_test_suite/win64/vc10/test_suite/new_devproxy/new_devproxy.vcxproj deleted file mode 100644 index aebe29263..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/new_devproxy/new_devproxy.vcxproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {C01D8845-2CDF-43E3-BEE8-91896629E064} - new_devproxy - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - new_devproxy - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/obj_prop/obj_prop.vcxproj b/cpp_test_suite/win64/vc10/test_suite/obj_prop/obj_prop.vcxproj deleted file mode 100644 index 037f223c2..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/obj_prop/obj_prop.vcxproj +++ /dev/null @@ -1,156 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {700AD2FC-90D2-480C-B059-15DCA0F8D894} - obj_prop - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - obj_prop - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreaded - - - Level3 - EditAndContinue - - - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreaded - - - Level3 - ProgramDatabase - - - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/per_event/per_event.vcxproj b/cpp_test_suite/win64/vc10/test_suite/per_event/per_event.vcxproj deleted file mode 100644 index d7f60ff50..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/per_event/per_event.vcxproj +++ /dev/null @@ -1,159 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2B29ADC6-0E59-428F-B881-062B6515F398} - per_event - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - per_event - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - NotSet - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/pipe_event/pipe_event.vcxproj b/cpp_test_suite/win64/vc10/test_suite/pipe_event/pipe_event.vcxproj deleted file mode 100644 index 2094c68d6..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/pipe_event/pipe_event.vcxproj +++ /dev/null @@ -1,124 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {A3A424FA-E965-45B6-957D-3EE630C8AE91} - pipe_event - - - - Application - true - MultiByte - - - Application - true - MultiByte - - - Application - false - true - MultiByte - - - Application - Unicode - true - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - $(PREFIX)\win64\bin\ - $(Configuration)\ - pipe_event - false - false - - - - Level3 - Disabled - - - true - - - - - Level3 - Disabled - - - true - - - - - Level3 - MaxSpeed - true - true - - - true - true - true - - - - - Level2 - MaxSpeed - true - true - MultiThreaded - - - false - true - true - Console - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/poll_attr/poll_attr.vcxproj b/cpp_test_suite/win64/vc10/test_suite/poll_attr/poll_attr.vcxproj deleted file mode 100644 index e7ac4a067..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/poll_attr/poll_attr.vcxproj +++ /dev/null @@ -1,156 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {C0BF9611-7DFA-4782-99FA-661C29977CD1} - poll_attr - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - poll_attr - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreaded - - - Level3 - EditAndContinue - - - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreaded - - - Level3 - ProgramDatabase - - - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/poll_except/poll_except.vcxproj b/cpp_test_suite/win64/vc10/test_suite/poll_except/poll_except.vcxproj deleted file mode 100644 index 5fe7500d3..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/poll_except/poll_except.vcxproj +++ /dev/null @@ -1,156 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {D58946D1-C6C3-4AE2-86C5-9C53B11E027E} - poll_except - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - poll_except - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreaded - - - Level3 - EditAndContinue - - - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreaded - - - Level3 - ProgramDatabase - - - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/poll_met/poll_met.vcxproj b/cpp_test_suite/win64/vc10/test_suite/poll_met/poll_met.vcxproj deleted file mode 100644 index 41cd50021..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/poll_met/poll_met.vcxproj +++ /dev/null @@ -1,156 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {1491287C-D235-4BE7-A534-33055C88E59C} - poll_met - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - poll_met - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreaded - - - Level3 - EditAndContinue - - - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreaded - - - Level3 - ProgramDatabase - - - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/poll_pool/poll_pool.vcxproj b/cpp_test_suite/win64/vc10/test_suite/poll_pool/poll_pool.vcxproj deleted file mode 100644 index 9b411fc02..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/poll_pool/poll_pool.vcxproj +++ /dev/null @@ -1,162 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {6406C9C4-DCB7-43C5-828A-15B669A2A1A4} - poll_pool - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - poll_pool - false - - - - MaxSpeed - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - MaxSpeed - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - false - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - false - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/print_data/print_data.vcxproj b/cpp_test_suite/win64/vc10/test_suite/print_data/print_data.vcxproj deleted file mode 100644 index 1dbc83234..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/print_data/print_data.vcxproj +++ /dev/null @@ -1,156 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {BDB9FBC2-8DB1-46F2-AF29-96D975120A76} - print_data - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - print_data - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreaded - - - Level3 - EditAndContinue - - - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreaded - - - Level3 - ProgramDatabase - - - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/print_data_hist/print_data_hist.vcxproj b/cpp_test_suite/win64/vc10/test_suite/print_data_hist/print_data_hist.vcxproj deleted file mode 100644 index 6546275d4..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/print_data_hist/print_data_hist.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {870C3E28-A769-4F95-B6DA-7CD45CDB780C} - print_data_hist - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - print_data_hist - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/prop_list/prop_list.vcxproj b/cpp_test_suite/win64/vc10/test_suite/prop_list/prop_list.vcxproj deleted file mode 100644 index 914408dd9..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/prop_list/prop_list.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2C333947-5663-4717-BB41-39804C4EDBCA} - prop_list - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - prop_list - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/rds/rds.vcxproj b/cpp_test_suite/win64/vc10/test_suite/rds/rds.vcxproj deleted file mode 100644 index afdc81f76..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/rds/rds.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {D136A855-85D8-4D29-99C9-AE7D5D6EA738} - rds - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - rds - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/read_attr/read_attr.vcxproj b/cpp_test_suite/win64/vc10/test_suite/read_attr/read_attr.vcxproj deleted file mode 100644 index 6a86631d1..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/read_attr/read_attr.vcxproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {CE6EC813-919B-4257-A4B6-EC94A1FDABCD} - read_attr - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - read_attr - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/read_hist_ext/read_hist_ext.vcxproj b/cpp_test_suite/win64/vc10/test_suite/read_hist_ext/read_hist_ext.vcxproj deleted file mode 100644 index 08d95c592..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/read_hist_ext/read_hist_ext.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {1B4C4DA3-65F5-4D17-B082-BD2F6CAAD6C0} - read_hist_ext - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - read_hist_ext - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/read_host/read_host.vcxproj b/cpp_test_suite/win64/vc10/test_suite/read_host/read_host.vcxproj deleted file mode 100644 index 893fb9eae..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/read_host/read_host.vcxproj +++ /dev/null @@ -1,157 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - read_hist - {3CBAF461-838E-4225-A24C-21BD8E4FE551} - read_host - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - read_hist - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreaded - - - Level3 - EditAndContinue - - - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreaded - - - Level3 - ProgramDatabase - - - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/reco_event/reco_event.vcxproj b/cpp_test_suite/win64/vc10/test_suite/reco_event/reco_event.vcxproj deleted file mode 100644 index f948f832b..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/reco_event/reco_event.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {8926BDE3-BD11-4DA3-8F5D-09A23243DDBB} - reco_event - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - reco_event - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/reco_svc/reco_svc.vcxproj b/cpp_test_suite/win64/vc10/test_suite/reco_svc/reco_svc.vcxproj deleted file mode 100644 index 19b622823..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/reco_svc/reco_svc.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {73B65A5F-06D3-46E3-AE76-74853A0FDB36} - reco_svc - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - reco_svc - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/reco_zmq/reco_zmq.vcxproj b/cpp_test_suite/win64/vc10/test_suite/reco_zmq/reco_zmq.vcxproj deleted file mode 100644 index e6781d75c..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/reco_zmq/reco_zmq.vcxproj +++ /dev/null @@ -1,152 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {978CF74F-FE36-4343-B02E-33A62976818F} - Win32Proj - reco_zmq - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - false - true - Unicode - Windows7.1SDK - - - Application - false - true - Unicode - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - $(PREFIX)\win64\bin\ - reco_zmq - - - false - $(PREFIX)\win64\bin\ - reco_zmq - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level2 - - - MaxSpeed - true - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - false - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/reconnect/reconnect.vcxproj b/cpp_test_suite/win64/vc10/test_suite/reconnect/reconnect.vcxproj deleted file mode 100644 index 8013d0b05..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/reconnect/reconnect.vcxproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {7ECEF870-A73D-4FFA-9248-4E14C528FC81} - reconnect - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - reconnect - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/restart_device/restart_device.vcxproj b/cpp_test_suite/win64/vc10/test_suite/restart_device/restart_device.vcxproj deleted file mode 100644 index d68ff075e..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/restart_device/restart_device.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2E5B889E-72C7-45F8-9611-9687A706D327} - restart_device - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - restart_device - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/ring_depth/ring_depth.vcxproj b/cpp_test_suite/win64/vc10/test_suite/ring_depth/ring_depth.vcxproj deleted file mode 100644 index e9443aa10..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/ring_depth/ring_depth.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {23F9A2ED-D02F-410B-9004-8CC9E642EE01} - ring_depth - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - ring_depth - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/runner/runner.cpp b/cpp_test_suite/win64/vc10/test_suite/runner/runner.cpp deleted file mode 100644 index a3c831990..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/runner/runner.cpp +++ /dev/null @@ -1,1665 +0,0 @@ -/* Generated file, do not edit */ - -// -*- C++ -*- -// Tango main template -// - -#define CXXTEST_HAVE_EH -#define CXXTEST_HAVE_STD -#define CXXTEST_ABORT_TEST_ON_FAIL -#ifndef CXXTEST_RUNNING -#define CXXTEST_RUNNING -#endif - -#define _CXXTEST_HAVE_STD -#define _CXXTEST_HAVE_EH -#include -#include -#include -#include - -#include - -int main( int argc, char **argv ) -{ - return CxxTest::TangoPrinter().run( argc, argv ); -} - -// The CxxTest "world" -#include "../../../../new_tests/cxx_syntax.cpp" - -static SyntaxTestSuite *suite_SyntaxTestSuite = 0; - -static CxxTest::List Tests_SyntaxTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_SyntaxTestSuite( "../../../../new_tests/cxx_syntax.cpp", 17, "SyntaxTestSuite", Tests_SyntaxTestSuite, suite_SyntaxTestSuite, 65, 70 ); - -static class TestDescription_SyntaxTestSuite_test_check_device_name_syntax_when_creating_DeviceProxy_instance : public CxxTest::RealTestDescription { -public: - TestDescription_SyntaxTestSuite_test_check_device_name_syntax_when_creating_DeviceProxy_instance() : CxxTest::RealTestDescription( Tests_SyntaxTestSuite, suiteDescription_SyntaxTestSuite, 125, "test_check_device_name_syntax_when_creating_DeviceProxy_instance" ) {} - void runTest() { if ( suite_SyntaxTestSuite ) suite_SyntaxTestSuite->test_check_device_name_syntax_when_creating_DeviceProxy_instance(); } -} testDescription_SyntaxTestSuite_test_check_device_name_syntax_when_creating_DeviceProxy_instance; - -static class TestDescription_SyntaxTestSuite_test_connect_to_a_device_via_its_alias_as_my_alias : public CxxTest::RealTestDescription { -public: - TestDescription_SyntaxTestSuite_test_connect_to_a_device_via_its_alias_as_my_alias() : CxxTest::RealTestDescription( Tests_SyntaxTestSuite, suiteDescription_SyntaxTestSuite, 157, "test_connect_to_a_device_via_its_alias_as_my_alias" ) {} - void runTest() { if ( suite_SyntaxTestSuite ) suite_SyntaxTestSuite->test_connect_to_a_device_via_its_alias_as_my_alias(); } -} testDescription_SyntaxTestSuite_test_connect_to_a_device_via_its_alias_as_my_alias; - -static class TestDescription_SyntaxTestSuite_test_connect_to_a_device_via_its_alias_as_host_port_my_alias : public CxxTest::RealTestDescription { -public: - TestDescription_SyntaxTestSuite_test_connect_to_a_device_via_its_alias_as_host_port_my_alias() : CxxTest::RealTestDescription( Tests_SyntaxTestSuite, suiteDescription_SyntaxTestSuite, 175, "test_connect_to_a_device_via_its_alias_as_host_port_my_alias" ) {} - void runTest() { if ( suite_SyntaxTestSuite ) suite_SyntaxTestSuite->test_connect_to_a_device_via_its_alias_as_host_port_my_alias(); } -} testDescription_SyntaxTestSuite_test_connect_to_a_device_via_its_alias_as_host_port_my_alias; - -static class TestDescription_SyntaxTestSuite_test_connect_to_a_device_via_its_classic_name : public CxxTest::RealTestDescription { -public: - TestDescription_SyntaxTestSuite_test_connect_to_a_device_via_its_classic_name() : CxxTest::RealTestDescription( Tests_SyntaxTestSuite, suiteDescription_SyntaxTestSuite, 194, "test_connect_to_a_device_via_its_classic_name" ) {} - void runTest() { if ( suite_SyntaxTestSuite ) suite_SyntaxTestSuite->test_connect_to_a_device_via_its_classic_name(); } -} testDescription_SyntaxTestSuite_test_connect_to_a_device_via_its_classic_name; - -static class TestDescription_SyntaxTestSuite_test_check_attribute_name_syntax_when_creating_AttributeProxy_instance : public CxxTest::RealTestDescription { -public: - TestDescription_SyntaxTestSuite_test_check_attribute_name_syntax_when_creating_AttributeProxy_instance() : CxxTest::RealTestDescription( Tests_SyntaxTestSuite, suiteDescription_SyntaxTestSuite, 201, "test_check_attribute_name_syntax_when_creating_AttributeProxy_instance" ) {} - void runTest() { if ( suite_SyntaxTestSuite ) suite_SyntaxTestSuite->test_check_attribute_name_syntax_when_creating_AttributeProxy_instance(); } -} testDescription_SyntaxTestSuite_test_check_attribute_name_syntax_when_creating_AttributeProxy_instance; - -static class TestDescription_SyntaxTestSuite_test_connect_to_an_attribute_via_its_alias_as_attribute_alias : public CxxTest::RealTestDescription { -public: - TestDescription_SyntaxTestSuite_test_connect_to_an_attribute_via_its_alias_as_attribute_alias() : CxxTest::RealTestDescription( Tests_SyntaxTestSuite, suiteDescription_SyntaxTestSuite, 234, "test_connect_to_an_attribute_via_its_alias_as_attribute_alias" ) {} - void runTest() { if ( suite_SyntaxTestSuite ) suite_SyntaxTestSuite->test_connect_to_an_attribute_via_its_alias_as_attribute_alias(); } -} testDescription_SyntaxTestSuite_test_connect_to_an_attribute_via_its_alias_as_attribute_alias; - -static class TestDescription_SyntaxTestSuite_test_connect_to_an_attribute_via_its_alias_as_host_port_attribute_alias : public CxxTest::RealTestDescription { -public: - TestDescription_SyntaxTestSuite_test_connect_to_an_attribute_via_its_alias_as_host_port_attribute_alias() : CxxTest::RealTestDescription( Tests_SyntaxTestSuite, suiteDescription_SyntaxTestSuite, 245, "test_connect_to_an_attribute_via_its_alias_as_host_port_attribute_alias" ) {} - void runTest() { if ( suite_SyntaxTestSuite ) suite_SyntaxTestSuite->test_connect_to_an_attribute_via_its_alias_as_host_port_attribute_alias(); } -} testDescription_SyntaxTestSuite_test_connect_to_an_attribute_via_its_alias_as_host_port_attribute_alias; - -static class TestDescription_SyntaxTestSuite_test_check_alias_call : public CxxTest::RealTestDescription { -public: - TestDescription_SyntaxTestSuite_test_check_alias_call() : CxxTest::RealTestDescription( Tests_SyntaxTestSuite, suiteDescription_SyntaxTestSuite, 257, "test_check_alias_call" ) {} - void runTest() { if ( suite_SyntaxTestSuite ) suite_SyntaxTestSuite->test_check_alias_call(); } -} testDescription_SyntaxTestSuite_test_check_alias_call; - -#include "../../../../new_tests/cxx_poll.cpp" - -static PollTestSuite__loop *suite_PollTestSuite__loop = 0; - -static CxxTest::List Tests_PollTestSuite__loop = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_PollTestSuite__loop( "../../../../new_tests/cxx_poll.cpp", 17, "PollTestSuite__loop", Tests_PollTestSuite__loop, suite_PollTestSuite__loop, 158, 163 ); - -static class TestDescription_PollTestSuite__loop_test_polling_exceptions : public CxxTest::RealTestDescription { -public: - TestDescription_PollTestSuite__loop_test_polling_exceptions() : CxxTest::RealTestDescription( Tests_PollTestSuite__loop, suiteDescription_PollTestSuite__loop, 174, "test_polling_exceptions" ) {} - void runTest() { if ( suite_PollTestSuite__loop ) suite_PollTestSuite__loop->test_polling_exceptions(); } -} testDescription_PollTestSuite__loop_test_polling_exceptions; - -static class TestDescription_PollTestSuite__loop_test_commands_and_attributes_obtained_from_polling_buffer : public CxxTest::RealTestDescription { -public: - TestDescription_PollTestSuite__loop_test_commands_and_attributes_obtained_from_polling_buffer() : CxxTest::RealTestDescription( Tests_PollTestSuite__loop, suiteDescription_PollTestSuite__loop, 255, "test_commands_and_attributes_obtained_from_polling_buffer" ) {} - void runTest() { if ( suite_PollTestSuite__loop ) suite_PollTestSuite__loop->test_commands_and_attributes_obtained_from_polling_buffer(); } -} testDescription_PollTestSuite__loop_test_commands_and_attributes_obtained_from_polling_buffer; - -static class TestDescription_PollTestSuite__loop_test_check_the_CACHE_DEV_source_parameter : public CxxTest::RealTestDescription { -public: - TestDescription_PollTestSuite__loop_test_check_the_CACHE_DEV_source_parameter() : CxxTest::RealTestDescription( Tests_PollTestSuite__loop, suiteDescription_PollTestSuite__loop, 337, "test_check_the_CACHE_DEV_source_parameter" ) {} - void runTest() { if ( suite_PollTestSuite__loop ) suite_PollTestSuite__loop->test_check_the_CACHE_DEV_source_parameter(); } -} testDescription_PollTestSuite__loop_test_check_the_CACHE_DEV_source_parameter; - -#include "../../../../new_tests/cxx_poll_admin.cpp" - -static PollAdminTestSuite__loop *suite_PollAdminTestSuite__loop = 0; - -static CxxTest::List Tests_PollAdminTestSuite__loop = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_PollAdminTestSuite__loop( "../../../../new_tests/cxx_poll_admin.cpp", 17, "PollAdminTestSuite__loop", Tests_PollAdminTestSuite__loop, suite_PollAdminTestSuite__loop, 217, 222 ); - -static class TestDescription_PollAdminTestSuite__loop_test_Start_Stop_polling : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_Start_Stop_polling() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 233, "test_Start_Stop_polling" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_Start_Stop_polling(); } -} testDescription_PollAdminTestSuite__loop_test_Start_Stop_polling; - -static class TestDescription_PollAdminTestSuite__loop_test_get_polling_status_for_a_non_polled_device : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_get_polling_status_for_a_non_polled_device() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 266, "test_get_polling_status_for_a_non_polled_device" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_get_polling_status_for_a_non_polled_device(); } -} testDescription_PollAdminTestSuite__loop_test_get_polling_status_for_a_non_polled_device; - -static class TestDescription_PollAdminTestSuite__loop_test_start_polling_a_command : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_start_polling_a_command() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 287, "test_start_polling_a_command" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_start_polling_a_command(); } -} testDescription_PollAdminTestSuite__loop_test_start_polling_a_command; - -static class TestDescription_PollAdminTestSuite__loop_test_check_if_command_polling_is_started : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_check_if_command_polling_is_started() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 306, "test_check_if_command_polling_is_started" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_check_if_command_polling_is_started(); } -} testDescription_PollAdminTestSuite__loop_test_check_if_command_polling_is_started; - -static class TestDescription_PollAdminTestSuite__loop_test_update_command_polling_period : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_update_command_polling_period() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 332, "test_update_command_polling_period" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_update_command_polling_period(); } -} testDescription_PollAdminTestSuite__loop_test_update_command_polling_period; - -static class TestDescription_PollAdminTestSuite__loop_test_stop_polling_the_command : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_stop_polling_the_command() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 363, "test_stop_polling_the_command" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_stop_polling_the_command(); } -} testDescription_PollAdminTestSuite__loop_test_stop_polling_the_command; - -static class TestDescription_PollAdminTestSuite__loop_test_start_polling_an_attribute : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_start_polling_an_attribute() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 386, "test_start_polling_an_attribute" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_start_polling_an_attribute(); } -} testDescription_PollAdminTestSuite__loop_test_start_polling_an_attribute; - -static class TestDescription_PollAdminTestSuite__loop_test_check_if_attribute_polling_is_started : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_check_if_attribute_polling_is_started() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 405, "test_check_if_attribute_polling_is_started" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_check_if_attribute_polling_is_started(); } -} testDescription_PollAdminTestSuite__loop_test_check_if_attribute_polling_is_started; - -static class TestDescription_PollAdminTestSuite__loop_test_update_attribute_polling_period : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_update_attribute_polling_period() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 431, "test_update_attribute_polling_period" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_update_attribute_polling_period(); } -} testDescription_PollAdminTestSuite__loop_test_update_attribute_polling_period; - -static class TestDescription_PollAdminTestSuite__loop_test_stop_polling_the_attribute : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_stop_polling_the_attribute() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 462, "test_stop_polling_the_attribute" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_stop_polling_the_attribute(); } -} testDescription_PollAdminTestSuite__loop_test_stop_polling_the_attribute; - -static class TestDescription_PollAdminTestSuite__loop_test_start_polling_an_attribute_and_a_command : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_start_polling_an_attribute_and_a_command() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 485, "test_start_polling_an_attribute_and_a_command" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_start_polling_an_attribute_and_a_command(); } -} testDescription_PollAdminTestSuite__loop_test_start_polling_an_attribute_and_a_command; - -static class TestDescription_PollAdminTestSuite__loop_test_check_if_polling_is_started : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_check_if_polling_is_started() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 515, "test_check_if_polling_is_started" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_check_if_polling_is_started(); } -} testDescription_PollAdminTestSuite__loop_test_check_if_polling_is_started; - -static class TestDescription_PollAdminTestSuite__loop_test_stop_polling_the_attribute_and_the_command : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_stop_polling_the_attribute_and_the_command() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 545, "test_stop_polling_the_attribute_and_the_command" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_stop_polling_the_attribute_and_the_command(); } -} testDescription_PollAdminTestSuite__loop_test_stop_polling_the_attribute_and_the_command; - -static class TestDescription_PollAdminTestSuite__loop_test_start_polling_for_several_devices : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_start_polling_for_several_devices() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 578, "test_start_polling_for_several_devices" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_start_polling_for_several_devices(); } -} testDescription_PollAdminTestSuite__loop_test_start_polling_for_several_devices; - -static class TestDescription_PollAdminTestSuite__loop_test_check_if_polling_for_serveral_devices_is_started : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_check_if_polling_for_serveral_devices_is_started() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 626, "test_check_if_polling_for_serveral_devices_is_started" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_check_if_polling_for_serveral_devices_is_started(); } -} testDescription_PollAdminTestSuite__loop_test_check_if_polling_for_serveral_devices_is_started; - -static class TestDescription_PollAdminTestSuite__loop_test_stop_polling_for_several_devices : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_stop_polling_for_several_devices() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 669, "test_stop_polling_for_several_devices" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_stop_polling_for_several_devices(); } -} testDescription_PollAdminTestSuite__loop_test_stop_polling_for_several_devices; - -static class TestDescription_PollAdminTestSuite__loop_test_device_polling_after_a_restart : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_device_polling_after_a_restart() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 717, "test_device_polling_after_a_restart" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_device_polling_after_a_restart(); } -} testDescription_PollAdminTestSuite__loop_test_device_polling_after_a_restart; - -static class TestDescription_PollAdminTestSuite__loop_test_poll_object_which_returns_an_exception : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_poll_object_which_returns_an_exception() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 801, "test_poll_object_which_returns_an_exception" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_poll_object_which_returns_an_exception(); } -} testDescription_PollAdminTestSuite__loop_test_poll_object_which_returns_an_exception; - -static class TestDescription_PollAdminTestSuite__loop_test_polling_for_several_devices_after_a_ServerRestart : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_polling_for_several_devices_after_a_ServerRestart() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 881, "test_polling_for_several_devices_after_a_ServerRestart" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_polling_for_several_devices_after_a_ServerRestart(); } -} testDescription_PollAdminTestSuite__loop_test_polling_for_several_devices_after_a_ServerRestart; - -static class TestDescription_PollAdminTestSuite__loop_test_start_a_command_externally_triggered : public CxxTest::RealTestDescription { -public: - TestDescription_PollAdminTestSuite__loop_test_start_a_command_externally_triggered() : CxxTest::RealTestDescription( Tests_PollAdminTestSuite__loop, suiteDescription_PollAdminTestSuite__loop, 1040, "test_start_a_command_externally_triggered" ) {} - void runTest() { if ( suite_PollAdminTestSuite__loop ) suite_PollAdminTestSuite__loop->test_start_a_command_externally_triggered(); } -} testDescription_PollAdminTestSuite__loop_test_start_a_command_externally_triggered; - -#include "../../../../new_tests/cxx_dserver_cmd.cpp" - -static DServerCmdTestSuite *suite_DServerCmdTestSuite = 0; - -static CxxTest::List Tests_DServerCmdTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_DServerCmdTestSuite( "../../../../new_tests/cxx_dserver_cmd.cpp", 18, "DServerCmdTestSuite", Tests_DServerCmdTestSuite, suite_DServerCmdTestSuite, 124, 129 ); - -static class TestDescription_DServerCmdTestSuite_test_dserver_class_and_instances_names : public CxxTest::RealTestDescription { -public: - TestDescription_DServerCmdTestSuite_test_dserver_class_and_instances_names() : CxxTest::RealTestDescription( Tests_DServerCmdTestSuite, suiteDescription_DServerCmdTestSuite, 140, "test_dserver_class_and_instances_names" ) {} - void runTest() { if ( suite_DServerCmdTestSuite ) suite_DServerCmdTestSuite->test_dserver_class_and_instances_names(); } -} testDescription_DServerCmdTestSuite_test_dserver_class_and_instances_names; - -static class TestDescription_DServerCmdTestSuite_test_trace_levels_commands : public CxxTest::RealTestDescription { -public: - TestDescription_DServerCmdTestSuite_test_trace_levels_commands() : CxxTest::RealTestDescription( Tests_DServerCmdTestSuite, suiteDescription_DServerCmdTestSuite, 171, "test_trace_levels_commands" ) {} - void runTest() { if ( suite_DServerCmdTestSuite ) suite_DServerCmdTestSuite->test_trace_levels_commands(); } -} testDescription_DServerCmdTestSuite_test_trace_levels_commands; - -static class TestDescription_DServerCmdTestSuite_test_set_output_file_commands : public CxxTest::RealTestDescription { -public: - TestDescription_DServerCmdTestSuite_test_set_output_file_commands() : CxxTest::RealTestDescription( Tests_DServerCmdTestSuite, suiteDescription_DServerCmdTestSuite, 225, "test_set_output_file_commands" ) {} - void runTest() { if ( suite_DServerCmdTestSuite ) suite_DServerCmdTestSuite->test_set_output_file_commands(); } -} testDescription_DServerCmdTestSuite_test_set_output_file_commands; - -static class TestDescription_DServerCmdTestSuite_test_comparing_input_with_output : public CxxTest::RealTestDescription { -public: - TestDescription_DServerCmdTestSuite_test_comparing_input_with_output() : CxxTest::RealTestDescription( Tests_DServerCmdTestSuite, suiteDescription_DServerCmdTestSuite, 300, "test_comparing_input_with_output" ) {} - void runTest() { if ( suite_DServerCmdTestSuite ) suite_DServerCmdTestSuite->test_comparing_input_with_output(); } -} testDescription_DServerCmdTestSuite_test_comparing_input_with_output; - -#include "../../../../new_tests/cxx_dserver_misc.cpp" - -static DServerMiscTestSuite *suite_DServerMiscTestSuite = 0; - -static CxxTest::List Tests_DServerMiscTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_DServerMiscTestSuite( "../../../../new_tests/cxx_dserver_misc.cpp", 17, "DServerMiscTestSuite", Tests_DServerMiscTestSuite, suite_DServerMiscTestSuite, 88, 93 ); - -static class TestDescription_DServerMiscTestSuite_test_State_and_Status_commands : public CxxTest::RealTestDescription { -public: - TestDescription_DServerMiscTestSuite_test_State_and_Status_commands() : CxxTest::RealTestDescription( Tests_DServerMiscTestSuite, suiteDescription_DServerMiscTestSuite, 104, "test_State_and_Status_commands" ) {} - void runTest() { if ( suite_DServerMiscTestSuite ) suite_DServerMiscTestSuite->test_State_and_Status_commands(); } -} testDescription_DServerMiscTestSuite_test_State_and_Status_commands; - -static class TestDescription_DServerMiscTestSuite_test_DevRestart_command_on_the_dserver_device : public CxxTest::RealTestDescription { -public: - TestDescription_DServerMiscTestSuite_test_DevRestart_command_on_the_dserver_device() : CxxTest::RealTestDescription( Tests_DServerMiscTestSuite, suiteDescription_DServerMiscTestSuite, 121, "test_DevRestart_command_on_the_dserver_device" ) {} - void runTest() { if ( suite_DServerMiscTestSuite ) suite_DServerMiscTestSuite->test_DevRestart_command_on_the_dserver_device(); } -} testDescription_DServerMiscTestSuite_test_DevRestart_command_on_the_dserver_device; - -static class TestDescription_DServerMiscTestSuite_test_DevRestart_command_on_classical_device : public CxxTest::RealTestDescription { -public: - TestDescription_DServerMiscTestSuite_test_DevRestart_command_on_classical_device() : CxxTest::RealTestDescription( Tests_DServerMiscTestSuite, suiteDescription_DServerMiscTestSuite, 144, "test_DevRestart_command_on_classical_device" ) {} - void runTest() { if ( suite_DServerMiscTestSuite ) suite_DServerMiscTestSuite->test_DevRestart_command_on_classical_device(); } -} testDescription_DServerMiscTestSuite_test_DevRestart_command_on_classical_device; - -static class TestDescription_DServerMiscTestSuite_test_name_description_state_ans_status_CORBA_attributes : public CxxTest::RealTestDescription { -public: - TestDescription_DServerMiscTestSuite_test_name_description_state_ans_status_CORBA_attributes() : CxxTest::RealTestDescription( Tests_DServerMiscTestSuite, suiteDescription_DServerMiscTestSuite, 175, "test_name_description_state_ans_status_CORBA_attributes" ) {} - void runTest() { if ( suite_DServerMiscTestSuite ) suite_DServerMiscTestSuite->test_name_description_state_ans_status_CORBA_attributes(); } -} testDescription_DServerMiscTestSuite_test_name_description_state_ans_status_CORBA_attributes; - -static class TestDescription_DServerMiscTestSuite_test_ping_the_device : public CxxTest::RealTestDescription { -public: - TestDescription_DServerMiscTestSuite_test_ping_the_device() : CxxTest::RealTestDescription( Tests_DServerMiscTestSuite, suiteDescription_DServerMiscTestSuite, 196, "test_ping_the_device" ) {} - void runTest() { if ( suite_DServerMiscTestSuite ) suite_DServerMiscTestSuite->test_ping_the_device(); } -} testDescription_DServerMiscTestSuite_test_ping_the_device; - -static class TestDescription_DServerMiscTestSuite_test_info_call : public CxxTest::RealTestDescription { -public: - TestDescription_DServerMiscTestSuite_test_info_call() : CxxTest::RealTestDescription( Tests_DServerMiscTestSuite, suiteDescription_DServerMiscTestSuite, 203, "test_info_call" ) {} - void runTest() { if ( suite_DServerMiscTestSuite ) suite_DServerMiscTestSuite->test_info_call(); } -} testDescription_DServerMiscTestSuite_test_info_call; - -#include "../../../../new_tests/cxx_always_hook.cpp" - -static AlwaysHookTestSuite *suite_AlwaysHookTestSuite = 0; - -static CxxTest::List Tests_AlwaysHookTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_AlwaysHookTestSuite( "../../../../new_tests/cxx_always_hook.cpp", 18, "AlwaysHookTestSuite", Tests_AlwaysHookTestSuite, suite_AlwaysHookTestSuite, 129, 134 ); - -static class TestDescription_AlwaysHookTestSuite_test_checking_OILong_command_preceding_the_test : public CxxTest::RealTestDescription { -public: - TestDescription_AlwaysHookTestSuite_test_checking_OILong_command_preceding_the_test() : CxxTest::RealTestDescription( Tests_AlwaysHookTestSuite, suiteDescription_AlwaysHookTestSuite, 145, "test_checking_OILong_command_preceding_the_test" ) {} - void runTest() { if ( suite_AlwaysHookTestSuite ) suite_AlwaysHookTestSuite->test_checking_OILong_command_preceding_the_test(); } -} testDescription_AlwaysHookTestSuite_test_checking_OILong_command_preceding_the_test; - -static class TestDescription_AlwaysHookTestSuite_test_changing_logging_level : public CxxTest::RealTestDescription { -public: - TestDescription_AlwaysHookTestSuite_test_changing_logging_level() : CxxTest::RealTestDescription( Tests_AlwaysHookTestSuite, suiteDescription_AlwaysHookTestSuite, 157, "test_changing_logging_level" ) {} - void runTest() { if ( suite_AlwaysHookTestSuite ) suite_AlwaysHookTestSuite->test_changing_logging_level(); } -} testDescription_AlwaysHookTestSuite_test_changing_logging_level; - -static class TestDescription_AlwaysHookTestSuite_test_comparing_input_with_output : public CxxTest::RealTestDescription { -public: - TestDescription_AlwaysHookTestSuite_test_comparing_input_with_output() : CxxTest::RealTestDescription( Tests_AlwaysHookTestSuite, suiteDescription_AlwaysHookTestSuite, 211, "test_comparing_input_with_output" ) {} - void runTest() { if ( suite_AlwaysHookTestSuite ) suite_AlwaysHookTestSuite->test_comparing_input_with_output(); } -} testDescription_AlwaysHookTestSuite_test_comparing_input_with_output; - -#include "../../../../new_tests/cxx_blackbox.cpp" - -static BlackboxTestSuite *suite_BlackboxTestSuite = 0; - -static CxxTest::List Tests_BlackboxTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_BlackboxTestSuite( "../../../../new_tests/cxx_blackbox.cpp", 21, "BlackboxTestSuite", Tests_BlackboxTestSuite, suite_BlackboxTestSuite, 103, 108 ); - -static class TestDescription_BlackboxTestSuite_test_blackbox_device_feature : public CxxTest::RealTestDescription { -public: - TestDescription_BlackboxTestSuite_test_blackbox_device_feature() : CxxTest::RealTestDescription( Tests_BlackboxTestSuite, suiteDescription_BlackboxTestSuite, 119, "test_blackbox_device_feature" ) {} - void runTest() { if ( suite_BlackboxTestSuite ) suite_BlackboxTestSuite->test_blackbox_device_feature(); } -} testDescription_BlackboxTestSuite_test_blackbox_device_feature; - -#include "../../../../new_tests/cxx_attr_misc.cpp" - -static AttrMiscTestSuite *suite_AttrMiscTestSuite = 0; - -static CxxTest::List Tests_AttrMiscTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_AttrMiscTestSuite( "../../../../new_tests/cxx_attr_misc.cpp", 17, "AttrMiscTestSuite", Tests_AttrMiscTestSuite, suite_AttrMiscTestSuite, 125, 130 ); - -static class TestDescription_AttrMiscTestSuite_test_set_get_alarms : public CxxTest::RealTestDescription { -public: - TestDescription_AttrMiscTestSuite_test_set_get_alarms() : CxxTest::RealTestDescription( Tests_AttrMiscTestSuite, suiteDescription_AttrMiscTestSuite, 143, "test_set_get_alarms" ) {} - void runTest() { if ( suite_AttrMiscTestSuite ) suite_AttrMiscTestSuite->test_set_get_alarms(); } -} testDescription_AttrMiscTestSuite_test_set_get_alarms; - -static class TestDescription_AttrMiscTestSuite_test_set_get_ranges : public CxxTest::RealTestDescription { -public: - TestDescription_AttrMiscTestSuite_test_set_get_ranges() : CxxTest::RealTestDescription( Tests_AttrMiscTestSuite, suiteDescription_AttrMiscTestSuite, 209, "test_set_get_ranges" ) {} - void runTest() { if ( suite_AttrMiscTestSuite ) suite_AttrMiscTestSuite->test_set_get_ranges(); } -} testDescription_AttrMiscTestSuite_test_set_get_ranges; - -static class TestDescription_AttrMiscTestSuite_test_set_get_properties : public CxxTest::RealTestDescription { -public: - TestDescription_AttrMiscTestSuite_test_set_get_properties() : CxxTest::RealTestDescription( Tests_AttrMiscTestSuite, suiteDescription_AttrMiscTestSuite, 257, "test_set_get_properties" ) {} - void runTest() { if ( suite_AttrMiscTestSuite ) suite_AttrMiscTestSuite->test_set_get_properties(); } -} testDescription_AttrMiscTestSuite_test_set_get_properties; - -static class TestDescription_AttrMiscTestSuite_test_read_attribute_exceptions : public CxxTest::RealTestDescription { -public: - TestDescription_AttrMiscTestSuite_test_read_attribute_exceptions() : CxxTest::RealTestDescription( Tests_AttrMiscTestSuite, suiteDescription_AttrMiscTestSuite, 750, "test_read_attribute_exceptions" ) {} - void runTest() { if ( suite_AttrMiscTestSuite ) suite_AttrMiscTestSuite->test_read_attribute_exceptions(); } -} testDescription_AttrMiscTestSuite_test_read_attribute_exceptions; - -static class TestDescription_AttrMiscTestSuite_test_SCALAR_attribute_of_type_different_than_READ : public CxxTest::RealTestDescription { -public: - TestDescription_AttrMiscTestSuite_test_SCALAR_attribute_of_type_different_than_READ() : CxxTest::RealTestDescription( Tests_AttrMiscTestSuite, suiteDescription_AttrMiscTestSuite, 788, "test_SCALAR_attribute_of_type_different_than_READ" ) {} - void runTest() { if ( suite_AttrMiscTestSuite ) suite_AttrMiscTestSuite->test_SCALAR_attribute_of_type_different_than_READ(); } -} testDescription_AttrMiscTestSuite_test_SCALAR_attribute_of_type_different_than_READ; - -static class TestDescription_AttrMiscTestSuite_test_read_attribute_on_write_type_attribute : public CxxTest::RealTestDescription { -public: - TestDescription_AttrMiscTestSuite_test_read_attribute_on_write_type_attribute() : CxxTest::RealTestDescription( Tests_AttrMiscTestSuite, suiteDescription_AttrMiscTestSuite, 850, "test_read_attribute_on_write_type_attribute" ) {} - void runTest() { if ( suite_AttrMiscTestSuite ) suite_AttrMiscTestSuite->test_read_attribute_on_write_type_attribute(); } -} testDescription_AttrMiscTestSuite_test_read_attribute_on_write_type_attribute; - -static class TestDescription_AttrMiscTestSuite_test_read_attribute_on_initialised_write_type_attribute : public CxxTest::RealTestDescription { -public: - TestDescription_AttrMiscTestSuite_test_read_attribute_on_initialised_write_type_attribute() : CxxTest::RealTestDescription( Tests_AttrMiscTestSuite, suiteDescription_AttrMiscTestSuite, 893, "test_read_attribute_on_initialised_write_type_attribute" ) {} - void runTest() { if ( suite_AttrMiscTestSuite ) suite_AttrMiscTestSuite->test_read_attribute_on_initialised_write_type_attribute(); } -} testDescription_AttrMiscTestSuite_test_read_attribute_on_initialised_write_type_attribute; - -static class TestDescription_AttrMiscTestSuite_test_alarm_on_attribute : public CxxTest::RealTestDescription { -public: - TestDescription_AttrMiscTestSuite_test_alarm_on_attribute() : CxxTest::RealTestDescription( Tests_AttrMiscTestSuite, suiteDescription_AttrMiscTestSuite, 941, "test_alarm_on_attribute" ) {} - void runTest() { if ( suite_AttrMiscTestSuite ) suite_AttrMiscTestSuite->test_alarm_on_attribute(); } -} testDescription_AttrMiscTestSuite_test_alarm_on_attribute; - -#include "../../../../new_tests/cxx_attrprop.cpp" - -static AttrPropTestSuite *suite_AttrPropTestSuite = 0; - -static CxxTest::List Tests_AttrPropTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_AttrPropTestSuite( "../../../../new_tests/cxx_attrprop.cpp", 17, "AttrPropTestSuite", Tests_AttrPropTestSuite, suite_AttrPropTestSuite, 62, 67 ); - -static class TestDescription_AttrPropTestSuite_test_AttrProp_template_specialization_for_all_Tango_types : public CxxTest::RealTestDescription { -public: - TestDescription_AttrPropTestSuite_test_AttrProp_template_specialization_for_all_Tango_types() : CxxTest::RealTestDescription( Tests_AttrPropTestSuite, suiteDescription_AttrPropTestSuite, 78, "test_AttrProp_template_specialization_for_all_Tango_types" ) {} - void runTest() { if ( suite_AttrPropTestSuite ) suite_AttrPropTestSuite->test_AttrProp_template_specialization_for_all_Tango_types(); } -} testDescription_AttrPropTestSuite_test_AttrProp_template_specialization_for_all_Tango_types; - -static class TestDescription_AttrPropTestSuite_test_DoubleAttrProp_template_specialization_for_all_Tango_types : public CxxTest::RealTestDescription { -public: - TestDescription_AttrPropTestSuite_test_DoubleAttrProp_template_specialization_for_all_Tango_types() : CxxTest::RealTestDescription( Tests_AttrPropTestSuite, suiteDescription_AttrPropTestSuite, 110, "test_DoubleAttrProp_template_specialization_for_all_Tango_types" ) {} - void runTest() { if ( suite_AttrPropTestSuite ) suite_AttrPropTestSuite->test_DoubleAttrProp_template_specialization_for_all_Tango_types(); } -} testDescription_AttrPropTestSuite_test_DoubleAttrProp_template_specialization_for_all_Tango_types; - -static class TestDescription_AttrPropTestSuite_test_MultiAttrProp_template_specialization_for_all_Tango_types : public CxxTest::RealTestDescription { -public: - TestDescription_AttrPropTestSuite_test_MultiAttrProp_template_specialization_for_all_Tango_types() : CxxTest::RealTestDescription( Tests_AttrPropTestSuite, suiteDescription_AttrPropTestSuite, 129, "test_MultiAttrProp_template_specialization_for_all_Tango_types" ) {} - void runTest() { if ( suite_AttrPropTestSuite ) suite_AttrPropTestSuite->test_MultiAttrProp_template_specialization_for_all_Tango_types(); } -} testDescription_AttrPropTestSuite_test_MultiAttrProp_template_specialization_for_all_Tango_types; - -#include "../../../../new_tests/cxx_attr_write.cpp" - -static AttrWriteTestSuite *suite_AttrWriteTestSuite = 0; - -static CxxTest::List Tests_AttrWriteTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_AttrWriteTestSuite( "../../../../new_tests/cxx_attr_write.cpp", 17, "AttrWriteTestSuite", Tests_AttrWriteTestSuite, suite_AttrWriteTestSuite, 63, 68 ); - -static class TestDescription_AttrWriteTestSuite_test_some_exception_cases : public CxxTest::RealTestDescription { -public: - TestDescription_AttrWriteTestSuite_test_some_exception_cases() : CxxTest::RealTestDescription( Tests_AttrWriteTestSuite, suiteDescription_AttrWriteTestSuite, 79, "test_some_exception_cases" ) {} - void runTest() { if ( suite_AttrWriteTestSuite ) suite_AttrWriteTestSuite->test_some_exception_cases(); } -} testDescription_AttrWriteTestSuite_test_some_exception_cases; - -static class TestDescription_AttrWriteTestSuite_test_write_some_scalar_attributes : public CxxTest::RealTestDescription { -public: - TestDescription_AttrWriteTestSuite_test_write_some_scalar_attributes() : CxxTest::RealTestDescription( Tests_AttrWriteTestSuite, suiteDescription_AttrWriteTestSuite, 114, "test_write_some_scalar_attributes" ) {} - void runTest() { if ( suite_AttrWriteTestSuite ) suite_AttrWriteTestSuite->test_write_some_scalar_attributes(); } -} testDescription_AttrWriteTestSuite_test_write_some_scalar_attributes; - -static class TestDescription_AttrWriteTestSuite_test_memorized_attributes : public CxxTest::RealTestDescription { -public: - TestDescription_AttrWriteTestSuite_test_memorized_attributes() : CxxTest::RealTestDescription( Tests_AttrWriteTestSuite, suiteDescription_AttrWriteTestSuite, 183, "test_memorized_attributes" ) {} - void runTest() { if ( suite_AttrWriteTestSuite ) suite_AttrWriteTestSuite->test_memorized_attributes(); } -} testDescription_AttrWriteTestSuite_test_memorized_attributes; - -#include "../../../../new_tests/cxx_attr_conf.cpp" - -static AttrConfTestSuite *suite_AttrConfTestSuite = 0; - -static CxxTest::List Tests_AttrConfTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_AttrConfTestSuite( "../../../../new_tests/cxx_attr_conf.cpp", 17, "AttrConfTestSuite", Tests_AttrConfTestSuite, suite_AttrConfTestSuite, 67, 72 ); - -static class TestDescription_AttrConfTestSuite_test_some_basic_exception_cases : public CxxTest::RealTestDescription { -public: - TestDescription_AttrConfTestSuite_test_some_basic_exception_cases() : CxxTest::RealTestDescription( Tests_AttrConfTestSuite, suiteDescription_AttrConfTestSuite, 83, "test_some_basic_exception_cases" ) {} - void runTest() { if ( suite_AttrConfTestSuite ) suite_AttrConfTestSuite->test_some_basic_exception_cases(); } -} testDescription_AttrConfTestSuite_test_some_basic_exception_cases; - -static class TestDescription_AttrConfTestSuite_test_get_a_full_lib_default_conf : public CxxTest::RealTestDescription { -public: - TestDescription_AttrConfTestSuite_test_get_a_full_lib_default_conf() : CxxTest::RealTestDescription( Tests_AttrConfTestSuite, suiteDescription_AttrConfTestSuite, 93, "test_get_a_full_lib_default_conf" ) {} - void runTest() { if ( suite_AttrConfTestSuite ) suite_AttrConfTestSuite->test_get_a_full_lib_default_conf(); } -} testDescription_AttrConfTestSuite_test_get_a_full_lib_default_conf; - -static class TestDescription_AttrConfTestSuite_test_get_a_full_user_default_conf : public CxxTest::RealTestDescription { -public: - TestDescription_AttrConfTestSuite_test_get_a_full_user_default_conf() : CxxTest::RealTestDescription( Tests_AttrConfTestSuite, suiteDescription_AttrConfTestSuite, 118, "test_get_a_full_user_default_conf" ) {} - void runTest() { if ( suite_AttrConfTestSuite ) suite_AttrConfTestSuite->test_get_a_full_user_default_conf(); } -} testDescription_AttrConfTestSuite_test_get_a_full_user_default_conf; - -static class TestDescription_AttrConfTestSuite_test_get_a_db_conf_with_some_conf_defined_at_class_level_and_device_level : public CxxTest::RealTestDescription { -public: - TestDescription_AttrConfTestSuite_test_get_a_db_conf_with_some_conf_defined_at_class_level_and_device_level() : CxxTest::RealTestDescription( Tests_AttrConfTestSuite, suiteDescription_AttrConfTestSuite, 153, "test_get_a_db_conf_with_some_conf_defined_at_class_level_and_device_level" ) {} - void runTest() { if ( suite_AttrConfTestSuite ) suite_AttrConfTestSuite->test_get_a_db_conf_with_some_conf_defined_at_class_level_and_device_level(); } -} testDescription_AttrConfTestSuite_test_get_a_db_conf_with_some_conf_defined_at_class_level_and_device_level; - -static class TestDescription_AttrConfTestSuite_test_several_attributes_in_one_call : public CxxTest::RealTestDescription { -public: - TestDescription_AttrConfTestSuite_test_several_attributes_in_one_call() : CxxTest::RealTestDescription( Tests_AttrConfTestSuite, suiteDescription_AttrConfTestSuite, 216, "test_several_attributes_in_one_call" ) {} - void runTest() { if ( suite_AttrConfTestSuite ) suite_AttrConfTestSuite->test_several_attributes_in_one_call(); } -} testDescription_AttrConfTestSuite_test_several_attributes_in_one_call; - -static class TestDescription_AttrConfTestSuite_test_add_one_attribute_on_the_fly_and_get_its_config : public CxxTest::RealTestDescription { -public: - TestDescription_AttrConfTestSuite_test_add_one_attribute_on_the_fly_and_get_its_config() : CxxTest::RealTestDescription( Tests_AttrConfTestSuite, suiteDescription_AttrConfTestSuite, 297, "test_add_one_attribute_on_the_fly_and_get_its_config" ) {} - void runTest() { if ( suite_AttrConfTestSuite ) suite_AttrConfTestSuite->test_add_one_attribute_on_the_fly_and_get_its_config(); } -} testDescription_AttrConfTestSuite_test_add_one_attribute_on_the_fly_and_get_its_config; - -static class TestDescription_AttrConfTestSuite_test_format_prop_for_misc_data_type : public CxxTest::RealTestDescription { -public: - TestDescription_AttrConfTestSuite_test_format_prop_for_misc_data_type() : CxxTest::RealTestDescription( Tests_AttrConfTestSuite, suiteDescription_AttrConfTestSuite, 339, "test_format_prop_for_misc_data_type" ) {} - void runTest() { if ( suite_AttrConfTestSuite ) suite_AttrConfTestSuite->test_format_prop_for_misc_data_type(); } -} testDescription_AttrConfTestSuite_test_format_prop_for_misc_data_type; - -#include "../../../../new_tests/cxx_attr.cpp" - -static AttrTestSuite *suite_AttrTestSuite = 0; - -static CxxTest::List Tests_AttrTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_AttrTestSuite( "../../../../new_tests/cxx_attr.cpp", 17, "AttrTestSuite", Tests_AttrTestSuite, suite_AttrTestSuite, 76, 81 ); - -static class TestDescription_AttrTestSuite_test_one_attribute_at_a_time_for_all_SCALAR_types : public CxxTest::RealTestDescription { -public: - TestDescription_AttrTestSuite_test_one_attribute_at_a_time_for_all_SCALAR_types() : CxxTest::RealTestDescription( Tests_AttrTestSuite, suiteDescription_AttrTestSuite, 92, "test_one_attribute_at_a_time_for_all_SCALAR_types" ) {} - void runTest() { if ( suite_AttrTestSuite ) suite_AttrTestSuite->test_one_attribute_at_a_time_for_all_SCALAR_types(); } -} testDescription_AttrTestSuite_test_one_attribute_at_a_time_for_all_SCALAR_types; - -static class TestDescription_AttrTestSuite_test_several_SCALAR_attributes_in_one_call : public CxxTest::RealTestDescription { -public: - TestDescription_AttrTestSuite_test_several_SCALAR_attributes_in_one_call() : CxxTest::RealTestDescription( Tests_AttrTestSuite, suiteDescription_AttrTestSuite, 135, "test_several_SCALAR_attributes_in_one_call" ) {} - void runTest() { if ( suite_AttrTestSuite ) suite_AttrTestSuite->test_several_SCALAR_attributes_in_one_call(); } -} testDescription_AttrTestSuite_test_several_SCALAR_attributes_in_one_call; - -static class TestDescription_AttrTestSuite_test_one_attribute_at_a_time_for_all_SPECTRUM_types : public CxxTest::RealTestDescription { -public: - TestDescription_AttrTestSuite_test_one_attribute_at_a_time_for_all_SPECTRUM_types() : CxxTest::RealTestDescription( Tests_AttrTestSuite, suiteDescription_AttrTestSuite, 206, "test_one_attribute_at_a_time_for_all_SPECTRUM_types" ) {} - void runTest() { if ( suite_AttrTestSuite ) suite_AttrTestSuite->test_one_attribute_at_a_time_for_all_SPECTRUM_types(); } -} testDescription_AttrTestSuite_test_one_attribute_at_a_time_for_all_SPECTRUM_types; - -static class TestDescription_AttrTestSuite_test_several_SPECTRUM_attributes_in_one_call : public CxxTest::RealTestDescription { -public: - TestDescription_AttrTestSuite_test_several_SPECTRUM_attributes_in_one_call() : CxxTest::RealTestDescription( Tests_AttrTestSuite, suiteDescription_AttrTestSuite, 251, "test_several_SPECTRUM_attributes_in_one_call" ) {} - void runTest() { if ( suite_AttrTestSuite ) suite_AttrTestSuite->test_several_SPECTRUM_attributes_in_one_call(); } -} testDescription_AttrTestSuite_test_several_SPECTRUM_attributes_in_one_call; - -static class TestDescription_AttrTestSuite_test_one_attribute_at_a_time_for_all_IMAGE_types : public CxxTest::RealTestDescription { -public: - TestDescription_AttrTestSuite_test_one_attribute_at_a_time_for_all_IMAGE_types() : CxxTest::RealTestDescription( Tests_AttrTestSuite, suiteDescription_AttrTestSuite, 283, "test_one_attribute_at_a_time_for_all_IMAGE_types" ) {} - void runTest() { if ( suite_AttrTestSuite ) suite_AttrTestSuite->test_one_attribute_at_a_time_for_all_IMAGE_types(); } -} testDescription_AttrTestSuite_test_one_attribute_at_a_time_for_all_IMAGE_types; - -static class TestDescription_AttrTestSuite_test_one_call_with_all_three_types : public CxxTest::RealTestDescription { -public: - TestDescription_AttrTestSuite_test_one_call_with_all_three_types() : CxxTest::RealTestDescription( Tests_AttrTestSuite, suiteDescription_AttrTestSuite, 326, "test_one_call_with_all_three_types" ) {} - void runTest() { if ( suite_AttrTestSuite ) suite_AttrTestSuite->test_one_call_with_all_three_types(); } -} testDescription_AttrTestSuite_test_one_call_with_all_three_types; - -static class TestDescription_AttrTestSuite_test_attributes_written_using_the_set_value_date_and_quality_method : public CxxTest::RealTestDescription { -public: - TestDescription_AttrTestSuite_test_attributes_written_using_the_set_value_date_and_quality_method() : CxxTest::RealTestDescription( Tests_AttrTestSuite, suiteDescription_AttrTestSuite, 367, "test_attributes_written_using_the_set_value_date_and_quality_method" ) {} - void runTest() { if ( suite_AttrTestSuite ) suite_AttrTestSuite->test_attributes_written_using_the_set_value_date_and_quality_method(); } -} testDescription_AttrTestSuite_test_attributes_written_using_the_set_value_date_and_quality_method; - -#include "../../../../new_tests/cxx_misc_util.cpp" - -static MiscUtilTestSuite *suite_MiscUtilTestSuite = 0; - -static CxxTest::List Tests_MiscUtilTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_MiscUtilTestSuite( "../../../../new_tests/cxx_misc_util.cpp", 17, "MiscUtilTestSuite", Tests_MiscUtilTestSuite, suite_MiscUtilTestSuite, 59, 64 ); - -static class TestDescription_MiscUtilTestSuite_test_get_device_list_by_class : public CxxTest::RealTestDescription { -public: - TestDescription_MiscUtilTestSuite_test_get_device_list_by_class() : CxxTest::RealTestDescription( Tests_MiscUtilTestSuite, suiteDescription_MiscUtilTestSuite, 75, "test_get_device_list_by_class" ) {} - void runTest() { if ( suite_MiscUtilTestSuite ) suite_MiscUtilTestSuite->test_get_device_list_by_class(); } -} testDescription_MiscUtilTestSuite_test_get_device_list_by_class; - -static class TestDescription_MiscUtilTestSuite_test_get_device_list_by_class_exception : public CxxTest::RealTestDescription { -public: - TestDescription_MiscUtilTestSuite_test_get_device_list_by_class_exception() : CxxTest::RealTestDescription( Tests_MiscUtilTestSuite, suiteDescription_MiscUtilTestSuite, 96, "test_get_device_list_by_class_exception" ) {} - void runTest() { if ( suite_MiscUtilTestSuite ) suite_MiscUtilTestSuite->test_get_device_list_by_class_exception(); } -} testDescription_MiscUtilTestSuite_test_get_device_list_by_class_exception; - -static class TestDescription_MiscUtilTestSuite_test_get_dserver_device : public CxxTest::RealTestDescription { -public: - TestDescription_MiscUtilTestSuite_test_get_dserver_device() : CxxTest::RealTestDescription( Tests_MiscUtilTestSuite, suiteDescription_MiscUtilTestSuite, 109, "test_get_dserver_device" ) {} - void runTest() { if ( suite_MiscUtilTestSuite ) suite_MiscUtilTestSuite->test_get_dserver_device(); } -} testDescription_MiscUtilTestSuite_test_get_dserver_device; - -static class TestDescription_MiscUtilTestSuite_test_get_device_by_name : public CxxTest::RealTestDescription { -public: - TestDescription_MiscUtilTestSuite_test_get_device_by_name() : CxxTest::RealTestDescription( Tests_MiscUtilTestSuite, suiteDescription_MiscUtilTestSuite, 122, "test_get_device_by_name" ) {} - void runTest() { if ( suite_MiscUtilTestSuite ) suite_MiscUtilTestSuite->test_get_device_by_name(); } -} testDescription_MiscUtilTestSuite_test_get_device_by_name; - -static class TestDescription_MiscUtilTestSuite_test_get_device_by_name_exception : public CxxTest::RealTestDescription { -public: - TestDescription_MiscUtilTestSuite_test_get_device_by_name_exception() : CxxTest::RealTestDescription( Tests_MiscUtilTestSuite, suiteDescription_MiscUtilTestSuite, 134, "test_get_device_by_name_exception" ) {} - void runTest() { if ( suite_MiscUtilTestSuite ) suite_MiscUtilTestSuite->test_get_device_by_name_exception(); } -} testDescription_MiscUtilTestSuite_test_get_device_by_name_exception; - -#include "../../../../new_tests/cxx_templ_cmd.cpp" - -static TemplateCmdTestSuite *suite_TemplateCmdTestSuite = 0; - -static CxxTest::List Tests_TemplateCmdTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_TemplateCmdTestSuite( "../../../../new_tests/cxx_templ_cmd.cpp", 17, "TemplateCmdTestSuite", Tests_TemplateCmdTestSuite, suite_TemplateCmdTestSuite, 77, 82 ); - -static class TestDescription_TemplateCmdTestSuite_test_IOTempl : public CxxTest::RealTestDescription { -public: - TestDescription_TemplateCmdTestSuite_test_IOTempl() : CxxTest::RealTestDescription( Tests_TemplateCmdTestSuite, suiteDescription_TemplateCmdTestSuite, 93, "test_IOTempl" ) {} - void runTest() { if ( suite_TemplateCmdTestSuite ) suite_TemplateCmdTestSuite->test_IOTempl(); } -} testDescription_TemplateCmdTestSuite_test_IOTempl; - -static class TestDescription_TemplateCmdTestSuite_test_IOTemplState : public CxxTest::RealTestDescription { -public: - TestDescription_TemplateCmdTestSuite_test_IOTemplState() : CxxTest::RealTestDescription( Tests_TemplateCmdTestSuite, suiteDescription_TemplateCmdTestSuite, 100, "test_IOTemplState" ) {} - void runTest() { if ( suite_TemplateCmdTestSuite ) suite_TemplateCmdTestSuite->test_IOTemplState(); } -} testDescription_TemplateCmdTestSuite_test_IOTemplState; - -static class TestDescription_TemplateCmdTestSuite_test_IOTemplState_exception : public CxxTest::RealTestDescription { -public: - TestDescription_TemplateCmdTestSuite_test_IOTemplState_exception() : CxxTest::RealTestDescription( Tests_TemplateCmdTestSuite, suiteDescription_TemplateCmdTestSuite, 107, "test_IOTemplState_exception" ) {} - void runTest() { if ( suite_TemplateCmdTestSuite ) suite_TemplateCmdTestSuite->test_IOTemplState_exception(); } -} testDescription_TemplateCmdTestSuite_test_IOTemplState_exception; - -static class TestDescription_TemplateCmdTestSuite_test_IOTemplIn : public CxxTest::RealTestDescription { -public: - TestDescription_TemplateCmdTestSuite_test_IOTemplIn() : CxxTest::RealTestDescription( Tests_TemplateCmdTestSuite, suiteDescription_TemplateCmdTestSuite, 127, "test_IOTemplIn" ) {} - void runTest() { if ( suite_TemplateCmdTestSuite ) suite_TemplateCmdTestSuite->test_IOTemplIn(); } -} testDescription_TemplateCmdTestSuite_test_IOTemplIn; - -static class TestDescription_TemplateCmdTestSuite_test_IOTemplInState : public CxxTest::RealTestDescription { -public: - TestDescription_TemplateCmdTestSuite_test_IOTemplInState() : CxxTest::RealTestDescription( Tests_TemplateCmdTestSuite, suiteDescription_TemplateCmdTestSuite, 137, "test_IOTemplInState" ) {} - void runTest() { if ( suite_TemplateCmdTestSuite ) suite_TemplateCmdTestSuite->test_IOTemplInState(); } -} testDescription_TemplateCmdTestSuite_test_IOTemplInState; - -static class TestDescription_TemplateCmdTestSuite_test_IOTemplInState_exception : public CxxTest::RealTestDescription { -public: - TestDescription_TemplateCmdTestSuite_test_IOTemplInState_exception() : CxxTest::RealTestDescription( Tests_TemplateCmdTestSuite, suiteDescription_TemplateCmdTestSuite, 147, "test_IOTemplInState_exception" ) {} - void runTest() { if ( suite_TemplateCmdTestSuite ) suite_TemplateCmdTestSuite->test_IOTemplInState_exception(); } -} testDescription_TemplateCmdTestSuite_test_IOTemplInState_exception; - -static class TestDescription_TemplateCmdTestSuite_test_IOTemplOut : public CxxTest::RealTestDescription { -public: - TestDescription_TemplateCmdTestSuite_test_IOTemplOut() : CxxTest::RealTestDescription( Tests_TemplateCmdTestSuite, suiteDescription_TemplateCmdTestSuite, 169, "test_IOTemplOut" ) {} - void runTest() { if ( suite_TemplateCmdTestSuite ) suite_TemplateCmdTestSuite->test_IOTemplOut(); } -} testDescription_TemplateCmdTestSuite_test_IOTemplOut; - -static class TestDescription_TemplateCmdTestSuite_test_IOTemplOutState : public CxxTest::RealTestDescription { -public: - TestDescription_TemplateCmdTestSuite_test_IOTemplOutState() : CxxTest::RealTestDescription( Tests_TemplateCmdTestSuite, suiteDescription_TemplateCmdTestSuite, 183, "test_IOTemplOutState" ) {} - void runTest() { if ( suite_TemplateCmdTestSuite ) suite_TemplateCmdTestSuite->test_IOTemplOutState(); } -} testDescription_TemplateCmdTestSuite_test_IOTemplOutState; - -static class TestDescription_TemplateCmdTestSuite_test_IOTemplOutState_exception : public CxxTest::RealTestDescription { -public: - TestDescription_TemplateCmdTestSuite_test_IOTemplOutState_exception() : CxxTest::RealTestDescription( Tests_TemplateCmdTestSuite, suiteDescription_TemplateCmdTestSuite, 197, "test_IOTemplOutState_exception" ) {} - void runTest() { if ( suite_TemplateCmdTestSuite ) suite_TemplateCmdTestSuite->test_IOTemplOutState_exception(); } -} testDescription_TemplateCmdTestSuite_test_IOTemplOutState_exception; - -static class TestDescription_TemplateCmdTestSuite_test_IOTemplInOut : public CxxTest::RealTestDescription { -public: - TestDescription_TemplateCmdTestSuite_test_IOTemplInOut() : CxxTest::RealTestDescription( Tests_TemplateCmdTestSuite, suiteDescription_TemplateCmdTestSuite, 217, "test_IOTemplInOut" ) {} - void runTest() { if ( suite_TemplateCmdTestSuite ) suite_TemplateCmdTestSuite->test_IOTemplInOut(); } -} testDescription_TemplateCmdTestSuite_test_IOTemplInOut; - -static class TestDescription_TemplateCmdTestSuite_test_IOTemplInOutState : public CxxTest::RealTestDescription { -public: - TestDescription_TemplateCmdTestSuite_test_IOTemplInOutState() : CxxTest::RealTestDescription( Tests_TemplateCmdTestSuite, suiteDescription_TemplateCmdTestSuite, 231, "test_IOTemplInOutState" ) {} - void runTest() { if ( suite_TemplateCmdTestSuite ) suite_TemplateCmdTestSuite->test_IOTemplInOutState(); } -} testDescription_TemplateCmdTestSuite_test_IOTemplInOutState; - -static class TestDescription_TemplateCmdTestSuite_test_IOTemplInOutState_exception : public CxxTest::RealTestDescription { -public: - TestDescription_TemplateCmdTestSuite_test_IOTemplInOutState_exception() : CxxTest::RealTestDescription( Tests_TemplateCmdTestSuite, suiteDescription_TemplateCmdTestSuite, 245, "test_IOTemplInOutState_exception" ) {} - void runTest() { if ( suite_TemplateCmdTestSuite ) suite_TemplateCmdTestSuite->test_IOTemplInOutState_exception(); } -} testDescription_TemplateCmdTestSuite_test_IOTemplInOutState_exception; - -#include "../../../../new_tests/cxx_exception.cpp" - -static ExceptionTestSuite *suite_ExceptionTestSuite = 0; - -static CxxTest::List Tests_ExceptionTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_ExceptionTestSuite( "../../../../new_tests/cxx_exception.cpp", 17, "ExceptionTestSuite", Tests_ExceptionTestSuite, suite_ExceptionTestSuite, 76, 81 ); - -static class TestDescription_ExceptionTestSuite_test_throw_exception_command : public CxxTest::RealTestDescription { -public: - TestDescription_ExceptionTestSuite_test_throw_exception_command() : CxxTest::RealTestDescription( Tests_ExceptionTestSuite, suiteDescription_ExceptionTestSuite, 92, "test_throw_exception_command" ) {} - void runTest() { if ( suite_ExceptionTestSuite ) suite_ExceptionTestSuite->test_throw_exception_command(); } -} testDescription_ExceptionTestSuite_test_throw_exception_command; - -static class TestDescription_ExceptionTestSuite_test_throw_exception_with_several_levels : public CxxTest::RealTestDescription { -public: - TestDescription_ExceptionTestSuite_test_throw_exception_with_several_levels() : CxxTest::RealTestDescription( Tests_ExceptionTestSuite, suiteDescription_ExceptionTestSuite, 108, "test_throw_exception_with_several_levels" ) {} - void runTest() { if ( suite_ExceptionTestSuite ) suite_ExceptionTestSuite->test_throw_exception_with_several_levels(); } -} testDescription_ExceptionTestSuite_test_throw_exception_with_several_levels; - -static class TestDescription_ExceptionTestSuite_test_command_not_found_exception : public CxxTest::RealTestDescription { -public: - TestDescription_ExceptionTestSuite_test_command_not_found_exception() : CxxTest::RealTestDescription( Tests_ExceptionTestSuite, suiteDescription_ExceptionTestSuite, 132, "test_command_not_found_exception" ) {} - void runTest() { if ( suite_ExceptionTestSuite ) suite_ExceptionTestSuite->test_command_not_found_exception(); } -} testDescription_ExceptionTestSuite_test_command_not_found_exception; - -static class TestDescription_ExceptionTestSuite_test_command_not_allowed_in_this_state_exception : public CxxTest::RealTestDescription { -public: - TestDescription_ExceptionTestSuite_test_command_not_allowed_in_this_state_exception() : CxxTest::RealTestDescription( Tests_ExceptionTestSuite, suiteDescription_ExceptionTestSuite, 141, "test_command_not_allowed_in_this_state_exception" ) {} - void runTest() { if ( suite_ExceptionTestSuite ) suite_ExceptionTestSuite->test_command_not_allowed_in_this_state_exception(); } -} testDescription_ExceptionTestSuite_test_command_not_allowed_in_this_state_exception; - -#include "../../../../new_tests/cxx_cmd_query.cpp" - -static CmdQueryTestSuite *suite_CmdQueryTestSuite = 0; - -static CxxTest::List Tests_CmdQueryTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_CmdQueryTestSuite( "../../../../new_tests/cxx_cmd_query.cpp", 17, "CmdQueryTestSuite", Tests_CmdQueryTestSuite, suite_CmdQueryTestSuite, 64, 69 ); - -static class TestDescription_CmdQueryTestSuite_test_command_list_query : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 87, "test_command_list_query" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query(); } -} testDescription_CmdQueryTestSuite_test_command_list_query; - -static class TestDescription_CmdQueryTestSuite_test_command_Status : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_Status() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 95, "test_command_Status" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_Status(); } -} testDescription_CmdQueryTestSuite_test_command_Status; - -static class TestDescription_CmdQueryTestSuite_test_fake_command : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_fake_command() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 108, "test_fake_command" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_fake_command(); } -} testDescription_CmdQueryTestSuite_test_fake_command; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_AddLoggingTarget : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_AddLoggingTarget() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 117, "test_command_list_query_AddLoggingTarget" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_AddLoggingTarget(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_AddLoggingTarget; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_AddObjPolling : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_AddObjPolling() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 130, "test_command_list_query_AddObjPolling" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_AddObjPolling(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_AddObjPolling; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_DevLockStatus : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_DevLockStatus() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 143, "test_command_list_query_DevLockStatus" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_DevLockStatus(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_DevLockStatus; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_DevPollStatus : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_DevPollStatus() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 156, "test_command_list_query_DevPollStatus" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_DevPollStatus(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_DevPollStatus; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_DevRestart : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_DevRestart() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 169, "test_command_list_query_DevRestart" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_DevRestart(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_DevRestart; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_EventConfirmSubscriptionChange : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_EventConfirmSubscriptionChange() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 182, "test_command_list_query_EventConfirmSubscriptionChange" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_EventConfirmSubscriptionChange(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_EventConfirmSubscriptionChange; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_EventSubscriptionChange : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_EventSubscriptionChange() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 195, "test_command_list_query_EventSubscriptionChange" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_EventSubscriptionChange(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_EventSubscriptionChange; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_GetLoggingLevel : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_GetLoggingLevel() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 208, "test_command_list_query_GetLoggingLevel" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_GetLoggingLevel(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_GetLoggingLevel; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_GetLoggingTarget : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_GetLoggingTarget() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 221, "test_command_list_query_GetLoggingTarget" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_GetLoggingTarget(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_GetLoggingTarget; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_Init : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_Init() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 234, "test_command_list_query_Init" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_Init(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_Init; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_Kill : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_Kill() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 247, "test_command_list_query_Kill" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_Kill(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_Kill; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_LockDevice : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_LockDevice() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 260, "test_command_list_query_LockDevice" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_LockDevice(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_LockDevice; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_PolledDevice : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_PolledDevice() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 273, "test_command_list_query_PolledDevice" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_PolledDevice(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_PolledDevice; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_QueryClass : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_QueryClass() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 286, "test_command_list_query_QueryClass" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_QueryClass(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_QueryClass; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_QueryDevice : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_QueryDevice() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 299, "test_command_list_query_QueryDevice" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_QueryDevice(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_QueryDevice; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_QuerySubDevice : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_QuerySubDevice() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 312, "test_command_list_query_QuerySubDevice" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_QuerySubDevice(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_QuerySubDevice; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_QueryWizardClassProperty : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_QueryWizardClassProperty() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 325, "test_command_list_query_QueryWizardClassProperty" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_QueryWizardClassProperty(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_QueryWizardClassProperty; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_QueryWizardDevProperty : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_QueryWizardDevProperty() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 338, "test_command_list_query_QueryWizardDevProperty" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_QueryWizardDevProperty(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_QueryWizardDevProperty; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_ReLockDevices : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_ReLockDevices() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 351, "test_command_list_query_ReLockDevices" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_ReLockDevices(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_ReLockDevices; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_RemObjPolling : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_RemObjPolling() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 364, "test_command_list_query_RemObjPolling" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_RemObjPolling(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_RemObjPolling; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_RemoveLoggingTarget : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_RemoveLoggingTarget() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 377, "test_command_list_query_RemoveLoggingTarget" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_RemoveLoggingTarget(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_RemoveLoggingTarget; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_RestartServer : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_RestartServer() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 390, "test_command_list_query_RestartServer" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_RestartServer(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_RestartServer; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_SetLoggingLevel : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_SetLoggingLevel() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 403, "test_command_list_query_SetLoggingLevel" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_SetLoggingLevel(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_SetLoggingLevel; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_StartLogging : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_StartLogging() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 416, "test_command_list_query_StartLogging" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_StartLogging(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_StartLogging; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_StartPolling : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_StartPolling() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 429, "test_command_list_query_StartPolling" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_StartPolling(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_StartPolling; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_State : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_State() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 442, "test_command_list_query_State" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_State(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_State; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_Status : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_Status() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 455, "test_command_list_query_Status" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_Status(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_Status; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_StopLogging : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_StopLogging() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 468, "test_command_list_query_StopLogging" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_StopLogging(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_StopLogging; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_StopPolling : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_StopPolling() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 481, "test_command_list_query_StopPolling" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_StopPolling(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_StopPolling; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_UnLockDevice : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_UnLockDevice() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 494, "test_command_list_query_UnLockDevice" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_UnLockDevice(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_UnLockDevice; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_list_query_UpdObjPollingPeriod : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_list_query_UpdObjPollingPeriod() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 507, "test_command_list_query_list_query_UpdObjPollingPeriod" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_list_query_UpdObjPollingPeriod(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_list_query_UpdObjPollingPeriod; - -static class TestDescription_CmdQueryTestSuite_test_command_list_query_ZMQEventSubscriptionChange : public CxxTest::RealTestDescription { -public: - TestDescription_CmdQueryTestSuite_test_command_list_query_ZMQEventSubscriptionChange() : CxxTest::RealTestDescription( Tests_CmdQueryTestSuite, suiteDescription_CmdQueryTestSuite, 520, "test_command_list_query_ZMQEventSubscriptionChange" ) {} - void runTest() { if ( suite_CmdQueryTestSuite ) suite_CmdQueryTestSuite->test_command_list_query_ZMQEventSubscriptionChange(); } -} testDescription_CmdQueryTestSuite_test_command_list_query_ZMQEventSubscriptionChange; - -#include "../../../../new_tests/cxx_seq_vec.cpp" - -static SeqVecTestSuite *suite_SeqVecTestSuite = 0; - -static CxxTest::List Tests_SeqVecTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_SeqVecTestSuite( "../../../../new_tests/cxx_seq_vec.cpp", 17, "SeqVecTestSuite", Tests_SeqVecTestSuite, suite_SeqVecTestSuite, 59, 64 ); - -static class TestDescription_SeqVecTestSuite_test_IOSeqVecChar : public CxxTest::RealTestDescription { -public: - TestDescription_SeqVecTestSuite_test_IOSeqVecChar() : CxxTest::RealTestDescription( Tests_SeqVecTestSuite, suiteDescription_SeqVecTestSuite, 75, "test_IOSeqVecChar" ) {} - void runTest() { if ( suite_SeqVecTestSuite ) suite_SeqVecTestSuite->test_IOSeqVecChar(); } -} testDescription_SeqVecTestSuite_test_IOSeqVecChar; - -static class TestDescription_SeqVecTestSuite_test_IOSeqVecShort : public CxxTest::RealTestDescription { -public: - TestDescription_SeqVecTestSuite_test_IOSeqVecShort() : CxxTest::RealTestDescription( Tests_SeqVecTestSuite, suiteDescription_SeqVecTestSuite, 97, "test_IOSeqVecShort" ) {} - void runTest() { if ( suite_SeqVecTestSuite ) suite_SeqVecTestSuite->test_IOSeqVecShort(); } -} testDescription_SeqVecTestSuite_test_IOSeqVecShort; - -static class TestDescription_SeqVecTestSuite_test_IOSeqVecLong : public CxxTest::RealTestDescription { -public: - TestDescription_SeqVecTestSuite_test_IOSeqVecLong() : CxxTest::RealTestDescription( Tests_SeqVecTestSuite, suiteDescription_SeqVecTestSuite, 120, "test_IOSeqVecLong" ) {} - void runTest() { if ( suite_SeqVecTestSuite ) suite_SeqVecTestSuite->test_IOSeqVecLong(); } -} testDescription_SeqVecTestSuite_test_IOSeqVecLong; - -static class TestDescription_SeqVecTestSuite_test_IOSeqVecFloat : public CxxTest::RealTestDescription { -public: - TestDescription_SeqVecTestSuite_test_IOSeqVecFloat() : CxxTest::RealTestDescription( Tests_SeqVecTestSuite, suiteDescription_SeqVecTestSuite, 140, "test_IOSeqVecFloat" ) {} - void runTest() { if ( suite_SeqVecTestSuite ) suite_SeqVecTestSuite->test_IOSeqVecFloat(); } -} testDescription_SeqVecTestSuite_test_IOSeqVecFloat; - -static class TestDescription_SeqVecTestSuite_test_IOSeqVecDouble : public CxxTest::RealTestDescription { -public: - TestDescription_SeqVecTestSuite_test_IOSeqVecDouble() : CxxTest::RealTestDescription( Tests_SeqVecTestSuite, suiteDescription_SeqVecTestSuite, 162, "test_IOSeqVecDouble" ) {} - void runTest() { if ( suite_SeqVecTestSuite ) suite_SeqVecTestSuite->test_IOSeqVecDouble(); } -} testDescription_SeqVecTestSuite_test_IOSeqVecDouble; - -static class TestDescription_SeqVecTestSuite_test_IOSeqVecUShort : public CxxTest::RealTestDescription { -public: - TestDescription_SeqVecTestSuite_test_IOSeqVecUShort() : CxxTest::RealTestDescription( Tests_SeqVecTestSuite, suiteDescription_SeqVecTestSuite, 183, "test_IOSeqVecUShort" ) {} - void runTest() { if ( suite_SeqVecTestSuite ) suite_SeqVecTestSuite->test_IOSeqVecUShort(); } -} testDescription_SeqVecTestSuite_test_IOSeqVecUShort; - -static class TestDescription_SeqVecTestSuite_test_IOSeqVecULong : public CxxTest::RealTestDescription { -public: - TestDescription_SeqVecTestSuite_test_IOSeqVecULong() : CxxTest::RealTestDescription( Tests_SeqVecTestSuite, suiteDescription_SeqVecTestSuite, 208, "test_IOSeqVecULong" ) {} - void runTest() { if ( suite_SeqVecTestSuite ) suite_SeqVecTestSuite->test_IOSeqVecULong(); } -} testDescription_SeqVecTestSuite_test_IOSeqVecULong; - -static class TestDescription_SeqVecTestSuite_test_IOSeqVecString : public CxxTest::RealTestDescription { -public: - TestDescription_SeqVecTestSuite_test_IOSeqVecString() : CxxTest::RealTestDescription( Tests_SeqVecTestSuite, suiteDescription_SeqVecTestSuite, 229, "test_IOSeqVecString" ) {} - void runTest() { if ( suite_SeqVecTestSuite ) suite_SeqVecTestSuite->test_IOSeqVecString(); } -} testDescription_SeqVecTestSuite_test_IOSeqVecString; - -#include "../../../../new_tests/cxx_test_state_on.cpp" - -static TestStateOnTestSuite *suite_TestStateOnTestSuite = 0; - -static CxxTest::List Tests_TestStateOnTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_TestStateOnTestSuite( "../../../../new_tests/cxx_test_state_on.cpp", 17, "TestStateOnTestSuite", Tests_TestStateOnTestSuite, suite_TestStateOnTestSuite, 59, 64 ); - -static class TestDescription_TestStateOnTestSuite_test_test_state_on : public CxxTest::RealTestDescription { -public: - TestDescription_TestStateOnTestSuite_test_test_state_on() : CxxTest::RealTestDescription( Tests_TestStateOnTestSuite, suiteDescription_TestStateOnTestSuite, 75, "test_test_state_on" ) {} - void runTest() { if ( suite_TestStateOnTestSuite ) suite_TestStateOnTestSuite->test_test_state_on(); } -} testDescription_TestStateOnTestSuite_test_test_state_on; - -#include "../../../../new_tests/cxx_misc.cpp" - -static MiscTestSuite *suite_MiscTestSuite = 0; - -static CxxTest::List Tests_MiscTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_MiscTestSuite( "../../../../new_tests/cxx_misc.cpp", 17, "MiscTestSuite", Tests_MiscTestSuite, suite_MiscTestSuite, 92, 97 ); - -static class TestDescription_MiscTestSuite_test_DevState_and_DevStatus_commands : public CxxTest::RealTestDescription { -public: - TestDescription_MiscTestSuite_test_DevState_and_DevStatus_commands() : CxxTest::RealTestDescription( Tests_MiscTestSuite, suiteDescription_MiscTestSuite, 108, "test_DevState_and_DevStatus_commands" ) {} - void runTest() { if ( suite_MiscTestSuite ) suite_MiscTestSuite->test_DevState_and_DevStatus_commands(); } -} testDescription_MiscTestSuite_test_DevState_and_DevStatus_commands; - -static class TestDescription_MiscTestSuite_test_DevRestart_command : public CxxTest::RealTestDescription { -public: - TestDescription_MiscTestSuite_test_DevRestart_command() : CxxTest::RealTestDescription( Tests_MiscTestSuite, suiteDescription_MiscTestSuite, 124, "test_DevRestart_command" ) {} - void runTest() { if ( suite_MiscTestSuite ) suite_MiscTestSuite->test_DevRestart_command(); } -} testDescription_MiscTestSuite_test_DevRestart_command; - -static class TestDescription_MiscTestSuite_test_name_description_state_and_status_read_as_CORBA_attributes : public CxxTest::RealTestDescription { -public: - TestDescription_MiscTestSuite_test_name_description_state_and_status_read_as_CORBA_attributes() : CxxTest::RealTestDescription( Tests_MiscTestSuite, suiteDescription_MiscTestSuite, 144, "test_name_description_state_and_status_read_as_CORBA_attributes" ) {} - void runTest() { if ( suite_MiscTestSuite ) suite_MiscTestSuite->test_name_description_state_and_status_read_as_CORBA_attributes(); } -} testDescription_MiscTestSuite_test_name_description_state_and_status_read_as_CORBA_attributes; - -static class TestDescription_MiscTestSuite_test_ping_the_device : public CxxTest::RealTestDescription { -public: - TestDescription_MiscTestSuite_test_ping_the_device() : CxxTest::RealTestDescription( Tests_MiscTestSuite, suiteDescription_MiscTestSuite, 164, "test_ping_the_device" ) {} - void runTest() { if ( suite_MiscTestSuite ) suite_MiscTestSuite->test_ping_the_device(); } -} testDescription_MiscTestSuite_test_ping_the_device; - -static class TestDescription_MiscTestSuite_test_info_call : public CxxTest::RealTestDescription { -public: - TestDescription_MiscTestSuite_test_info_call() : CxxTest::RealTestDescription( Tests_MiscTestSuite, suiteDescription_MiscTestSuite, 171, "test_info_call" ) {} - void runTest() { if ( suite_MiscTestSuite ) suite_MiscTestSuite->test_info_call(); } -} testDescription_MiscTestSuite_test_info_call; - -#include "../../../../new_tests/cxx_cmd_types.cpp" - -static CmdTypesTestSuite *suite_CmdTypesTestSuite = 0; - -static CxxTest::List Tests_CmdTypesTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_CmdTypesTestSuite( "../../../../new_tests/cxx_cmd_types.cpp", 17, "CmdTypesTestSuite", Tests_CmdTypesTestSuite, suite_CmdTypesTestSuite, 61, 66 ); - -static class TestDescription_CmdTypesTestSuite_test_Scalar_Short : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Scalar_Short() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 86, "test_Scalar_Short" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Scalar_Short(); } -} testDescription_CmdTypesTestSuite_test_Scalar_Short; - -static class TestDescription_CmdTypesTestSuite_test_Scalar_Short_DevEncoded_2__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Scalar_Short_DevEncoded_2__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 125, "test_Scalar_Short_DevEncoded_2__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Scalar_Short_DevEncoded_2__loop(); } -} testDescription_CmdTypesTestSuite_test_Scalar_Short_DevEncoded_2__loop; - -static class TestDescription_CmdTypesTestSuite_test_Scalar_Long__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Scalar_Long__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 155, "test_Scalar_Long__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Scalar_Long__loop(); } -} testDescription_CmdTypesTestSuite_test_Scalar_Long__loop; - -static class TestDescription_CmdTypesTestSuite_test_Scalar_Double__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Scalar_Double__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 184, "test_Scalar_Double__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Scalar_Double__loop(); } -} testDescription_CmdTypesTestSuite_test_Scalar_Double__loop; - -static class TestDescription_CmdTypesTestSuite_test_Scalar_String__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Scalar_String__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 203, "test_Scalar_String__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Scalar_String__loop(); } -} testDescription_CmdTypesTestSuite_test_Scalar_String__loop; - -static class TestDescription_CmdTypesTestSuite_test_Scalar_Float__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Scalar_Float__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 222, "test_Scalar_Float__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Scalar_Float__loop(); } -} testDescription_CmdTypesTestSuite_test_Scalar_Float__loop; - -static class TestDescription_CmdTypesTestSuite_test_Scalar_Boolean__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Scalar_Boolean__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 241, "test_Scalar_Boolean__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Scalar_Boolean__loop(); } -} testDescription_CmdTypesTestSuite_test_Scalar_Boolean__loop; - -static class TestDescription_CmdTypesTestSuite_test_Scalar_Unsigned_Short__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Scalar_Unsigned_Short__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 260, "test_Scalar_Unsigned_Short__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Scalar_Unsigned_Short__loop(); } -} testDescription_CmdTypesTestSuite_test_Scalar_Unsigned_Short__loop; - -static class TestDescription_CmdTypesTestSuite_test_Scalar_Unsigned_Char__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Scalar_Unsigned_Char__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 279, "test_Scalar_Unsigned_Char__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Scalar_Unsigned_Char__loop(); } -} testDescription_CmdTypesTestSuite_test_Scalar_Unsigned_Char__loop; - -static class TestDescription_CmdTypesTestSuite_test_Scalar_Long64__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Scalar_Long64__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 298, "test_Scalar_Long64__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Scalar_Long64__loop(); } -} testDescription_CmdTypesTestSuite_test_Scalar_Long64__loop; - -static class TestDescription_CmdTypesTestSuite_test_Scalar_Unsigned_Long__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Scalar_Unsigned_Long__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 324, "test_Scalar_Unsigned_Long__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Scalar_Unsigned_Long__loop(); } -} testDescription_CmdTypesTestSuite_test_Scalar_Unsigned_Long__loop; - -static class TestDescription_CmdTypesTestSuite_test_Scalar_Unsigned_Long64__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Scalar_Unsigned_Long64__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 345, "test_Scalar_Unsigned_Long64__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Scalar_Unsigned_Long64__loop(); } -} testDescription_CmdTypesTestSuite_test_Scalar_Unsigned_Long64__loop; - -static class TestDescription_CmdTypesTestSuite_test_Scalar_State__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Scalar_State__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 366, "test_Scalar_State__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Scalar_State__loop(); } -} testDescription_CmdTypesTestSuite_test_Scalar_State__loop; - -static class TestDescription_CmdTypesTestSuite_test_Scalar_DevEncoded__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Scalar_DevEncoded__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 396, "test_Scalar_DevEncoded__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Scalar_DevEncoded__loop(); } -} testDescription_CmdTypesTestSuite_test_Scalar_DevEncoded__loop; - -static class TestDescription_CmdTypesTestSuite_test_Scalar_DevEncoded_JPEG__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Scalar_DevEncoded_JPEG__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 427, "test_Scalar_DevEncoded_JPEG__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Scalar_DevEncoded_JPEG__loop(); } -} testDescription_CmdTypesTestSuite_test_Scalar_DevEncoded_JPEG__loop; - -static class TestDescription_CmdTypesTestSuite_test_Thirteen_in_one_call__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Thirteen_in_one_call__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 457, "test_Thirteen_in_one_call__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Thirteen_in_one_call__loop(); } -} testDescription_CmdTypesTestSuite_test_Thirteen_in_one_call__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Short__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Short__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 543, "test_Spectrum_Short__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Short__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Short__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Long__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Long__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 571, "test_Spectrum_Long__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Long__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Long__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Double__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Double__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 600, "test_Spectrum_Double__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Double__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Double__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_String__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_String__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 624, "test_Spectrum_String__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_String__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_String__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Float__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Float__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 646, "test_Spectrum_Float__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Float__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Float__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Boolean__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Boolean__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 669, "test_Spectrum_Boolean__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Boolean__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Boolean__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Short__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Short__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 698, "test_Spectrum_Unsigned_Short__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Unsigned_Short__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Short__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Char__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Char__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 720, "test_Spectrum_Unsigned_Char__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Unsigned_Char__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Char__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Long64__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Long64__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 746, "test_Spectrum_Long64__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Long64__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Long64__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Long__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Long__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 770, "test_Spectrum_Unsigned_Long__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Unsigned_Long__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Long__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Long64__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Long64__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 794, "test_Spectrum_Unsigned_Long64__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Unsigned_Long64__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Long64__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_State__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_State__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 818, "test_Spectrum_State__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_State__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_State__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Short_DevVarShortArray__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Short_DevVarShortArray__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 846, "test_Spectrum_Short_DevVarShortArray__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Short_DevVarShortArray__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Short_DevVarShortArray__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Long_DevVarLongArray__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Long_DevVarLongArray__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 870, "test_Spectrum_Long_DevVarLongArray__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Long_DevVarLongArray__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Long_DevVarLongArray__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Double_DevVarDoubleArray__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Double_DevVarDoubleArray__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 894, "test_Spectrum_Double_DevVarDoubleArray__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Double_DevVarDoubleArray__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Double_DevVarDoubleArray__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_String_DevVarStringArray__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_String_DevVarStringArray__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 916, "test_Spectrum_String_DevVarStringArray__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_String_DevVarStringArray__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_String_DevVarStringArray__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Float_DevVarFloatArray__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Float_DevVarFloatArray__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 938, "test_Spectrum_Float_DevVarFloatArray__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Float_DevVarFloatArray__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Float_DevVarFloatArray__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Boolean_DevVarBooleanArray__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Boolean_DevVarBooleanArray__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 961, "test_Spectrum_Boolean_DevVarBooleanArray__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Boolean_DevVarBooleanArray__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Boolean_DevVarBooleanArray__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Short_DevVarUShortArray__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Short_DevVarUShortArray__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 989, "test_Spectrum_Unsigned_Short_DevVarUShortArray__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Unsigned_Short_DevVarUShortArray__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Short_DevVarUShortArray__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Char_DevVarUCharArray__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Char_DevVarUCharArray__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 1011, "test_Spectrum_Unsigned_Char_DevVarUCharArray__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Unsigned_Char_DevVarUCharArray__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Char_DevVarUCharArray__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Long64_DevVarLong64Array__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Long64_DevVarLong64Array__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 1037, "test_Spectrum_Long64_DevVarLong64Array__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Long64_DevVarLong64Array__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Long64_DevVarLong64Array__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Long_DevVarULongArray__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Long_DevVarULongArray__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 1063, "test_Spectrum_Unsigned_Long_DevVarULongArray__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Unsigned_Long_DevVarULongArray__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Long_DevVarULongArray__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Long64_DevVarULong64Array__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Long64_DevVarULong64Array__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 1089, "test_Spectrum_Unsigned_Long64_DevVarULong64Array__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_Unsigned_Long64_DevVarULong64Array__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_Unsigned_Long64_DevVarULong64Array__loop; - -static class TestDescription_CmdTypesTestSuite_test_Spectrum_State_DevVarStateArray__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Spectrum_State_DevVarStateArray__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 1115, "test_Spectrum_State_DevVarStateArray__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Spectrum_State_DevVarStateArray__loop(); } -} testDescription_CmdTypesTestSuite_test_Spectrum_State_DevVarStateArray__loop; - -static class TestDescription_CmdTypesTestSuite_test_Image_Short_DevVarShortArray__loop : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Image_Short_DevVarShortArray__loop() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 1143, "test_Image_Short_DevVarShortArray__loop" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Image_Short_DevVarShortArray__loop(); } -} testDescription_CmdTypesTestSuite_test_Image_Short_DevVarShortArray__loop; - -static class TestDescription_CmdTypesTestSuite_test_Exception_Error_for_unknown_attribute_data_format : public CxxTest::RealTestDescription { -public: - TestDescription_CmdTypesTestSuite_test_Exception_Error_for_unknown_attribute_data_format() : CxxTest::RealTestDescription( Tests_CmdTypesTestSuite, suiteDescription_CmdTypesTestSuite, 1169, "test_Exception_Error_for_unknown_attribute_data_format" ) {} - void runTest() { if ( suite_CmdTypesTestSuite ) suite_CmdTypesTestSuite->test_Exception_Error_for_unknown_attribute_data_format(); } -} testDescription_CmdTypesTestSuite_test_Exception_Error_for_unknown_attribute_data_format; - -#include "../../../../new_tests/cxx_group.cpp" - -static GroupTestSuite *suite_GroupTestSuite = 0; - -static CxxTest::List Tests_GroupTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_GroupTestSuite( "../../../../new_tests/cxx_group.cpp", 18, "GroupTestSuite", Tests_GroupTestSuite, suite_GroupTestSuite, 87, 92 ); - -static class TestDescription_GroupTestSuite_test_miscellaneous : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_miscellaneous() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 103, "test_miscellaneous" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_miscellaneous(); } -} testDescription_GroupTestSuite_test_miscellaneous; - -static class TestDescription_GroupTestSuite_test_synchronous_command_with_forwarding_and_no_arguments : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_synchronous_command_with_forwarding_and_no_arguments() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 184, "test_synchronous_command_with_forwarding_and_no_arguments" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_synchronous_command_with_forwarding_and_no_arguments(); } -} testDescription_GroupTestSuite_test_synchronous_command_with_forwarding_and_no_arguments; - -static class TestDescription_GroupTestSuite_test_asynchronous_command_with_forwarding_and_no_arguments : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_asynchronous_command_with_forwarding_and_no_arguments() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 210, "test_asynchronous_command_with_forwarding_and_no_arguments" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_asynchronous_command_with_forwarding_and_no_arguments(); } -} testDescription_GroupTestSuite_test_asynchronous_command_with_forwarding_and_no_arguments; - -static class TestDescription_GroupTestSuite_test_synchronous_command_with_no_forwarding_and_no_arguments : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_synchronous_command_with_no_forwarding_and_no_arguments() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 226, "test_synchronous_command_with_no_forwarding_and_no_arguments" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_synchronous_command_with_no_forwarding_and_no_arguments(); } -} testDescription_GroupTestSuite_test_synchronous_command_with_no_forwarding_and_no_arguments; - -static class TestDescription_GroupTestSuite_test_asynchronous_command_with_no_forwarding_and_no_arguments : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_asynchronous_command_with_no_forwarding_and_no_arguments() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 241, "test_asynchronous_command_with_no_forwarding_and_no_arguments" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_asynchronous_command_with_no_forwarding_and_no_arguments(); } -} testDescription_GroupTestSuite_test_asynchronous_command_with_no_forwarding_and_no_arguments; - -static class TestDescription_GroupTestSuite_test_synchronous_command_with_forwarding_and_one_argument : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_synchronous_command_with_forwarding_and_one_argument() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 257, "test_synchronous_command_with_forwarding_and_one_argument" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_synchronous_command_with_forwarding_and_one_argument(); } -} testDescription_GroupTestSuite_test_synchronous_command_with_forwarding_and_one_argument; - -static class TestDescription_GroupTestSuite_test_asynchronous_command_with_forwarding_and_one_argument : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_asynchronous_command_with_forwarding_and_one_argument() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 274, "test_asynchronous_command_with_forwarding_and_one_argument" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_asynchronous_command_with_forwarding_and_one_argument(); } -} testDescription_GroupTestSuite_test_asynchronous_command_with_forwarding_and_one_argument; - -static class TestDescription_GroupTestSuite_test_synchronous_command_with_forwarding_and_several_arguments : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_synchronous_command_with_forwarding_and_several_arguments() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 292, "test_synchronous_command_with_forwarding_and_several_arguments" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_synchronous_command_with_forwarding_and_several_arguments(); } -} testDescription_GroupTestSuite_test_synchronous_command_with_forwarding_and_several_arguments; - -static class TestDescription_GroupTestSuite_test_asynchronous_command_with_forwarding_and_several_arguments : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_asynchronous_command_with_forwarding_and_several_arguments() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 313, "test_asynchronous_command_with_forwarding_and_several_arguments" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_asynchronous_command_with_forwarding_and_several_arguments(); } -} testDescription_GroupTestSuite_test_asynchronous_command_with_forwarding_and_several_arguments; - -static class TestDescription_GroupTestSuite_test_synchronous_command_with_forwarding_and_several_DeviceData_arguments : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_synchronous_command_with_forwarding_and_several_DeviceData_arguments() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 335, "test_synchronous_command_with_forwarding_and_several_DeviceData_arguments" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_synchronous_command_with_forwarding_and_several_DeviceData_arguments(); } -} testDescription_GroupTestSuite_test_synchronous_command_with_forwarding_and_several_DeviceData_arguments; - -static class TestDescription_GroupTestSuite_test_asynchronous_command_with_forwarding_and_several_DeviceData_arguments : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_asynchronous_command_with_forwarding_and_several_DeviceData_arguments() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 360, "test_asynchronous_command_with_forwarding_and_several_DeviceData_arguments" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_asynchronous_command_with_forwarding_and_several_DeviceData_arguments(); } -} testDescription_GroupTestSuite_test_asynchronous_command_with_forwarding_and_several_DeviceData_arguments; - -static class TestDescription_GroupTestSuite_test_synchronous_command_with_forwarding_and_wrong_number_of_arguments : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_synchronous_command_with_forwarding_and_wrong_number_of_arguments() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 394, "test_synchronous_command_with_forwarding_and_wrong_number_of_arguments" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_synchronous_command_with_forwarding_and_wrong_number_of_arguments(); } -} testDescription_GroupTestSuite_test_synchronous_command_with_forwarding_and_wrong_number_of_arguments; - -static class TestDescription_GroupTestSuite_test_synchronous_command_throwing_exception_mode_on : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_synchronous_command_throwing_exception_mode_on() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 406, "test_synchronous_command_throwing_exception_mode_on" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_synchronous_command_throwing_exception_mode_on(); } -} testDescription_GroupTestSuite_test_synchronous_command_throwing_exception_mode_on; - -static class TestDescription_GroupTestSuite_test_synchronous_command_throwing_exception_mode_off : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_synchronous_command_throwing_exception_mode_off() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 427, "test_synchronous_command_throwing_exception_mode_off" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_synchronous_command_throwing_exception_mode_off(); } -} testDescription_GroupTestSuite_test_synchronous_command_throwing_exception_mode_off; - -static class TestDescription_GroupTestSuite_test_read_attribute_synchronously : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_read_attribute_synchronously() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 444, "test_read_attribute_synchronously" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_read_attribute_synchronously(); } -} testDescription_GroupTestSuite_test_read_attribute_synchronously; - -static class TestDescription_GroupTestSuite_test_read_attribute_asynchronously : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_read_attribute_asynchronously() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 470, "test_read_attribute_asynchronously" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_read_attribute_asynchronously(); } -} testDescription_GroupTestSuite_test_read_attribute_asynchronously; - -static class TestDescription_GroupTestSuite_test_read_several_attributes_synchronously : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_read_several_attributes_synchronously() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 486, "test_read_several_attributes_synchronously" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_read_several_attributes_synchronously(); } -} testDescription_GroupTestSuite_test_read_several_attributes_synchronously; - -static class TestDescription_GroupTestSuite_test_read_attribute_synchronously_throwing_exception_mode_on : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_read_attribute_synchronously_throwing_exception_mode_on() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 529, "test_read_attribute_synchronously_throwing_exception_mode_on" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_read_attribute_synchronously_throwing_exception_mode_on(); } -} testDescription_GroupTestSuite_test_read_attribute_synchronously_throwing_exception_mode_on; - -static class TestDescription_GroupTestSuite_test_read_attribute_synchronously_throwing_exception_mode_off : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_read_attribute_synchronously_throwing_exception_mode_off() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 550, "test_read_attribute_synchronously_throwing_exception_mode_off" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_read_attribute_synchronously_throwing_exception_mode_off(); } -} testDescription_GroupTestSuite_test_read_attribute_synchronously_throwing_exception_mode_off; - -static class TestDescription_GroupTestSuite_test_write_attribute_synchronously_one_value : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_write_attribute_synchronously_one_value() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 567, "test_write_attribute_synchronously_one_value" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_write_attribute_synchronously_one_value(); } -} testDescription_GroupTestSuite_test_write_attribute_synchronously_one_value; - -static class TestDescription_GroupTestSuite_test_write_attribute_asynchronously_one_value : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_write_attribute_asynchronously_one_value() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 608, "test_write_attribute_asynchronously_one_value" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_write_attribute_asynchronously_one_value(); } -} testDescription_GroupTestSuite_test_write_attribute_asynchronously_one_value; - -static class TestDescription_GroupTestSuite_test_write_attribute_synchronously_several_values : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_write_attribute_synchronously_several_values() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 650, "test_write_attribute_synchronously_several_values" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_write_attribute_synchronously_several_values(); } -} testDescription_GroupTestSuite_test_write_attribute_synchronously_several_values; - -static class TestDescription_GroupTestSuite_test_write_attribute_asynchronously_several_values : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_write_attribute_asynchronously_several_values() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 695, "test_write_attribute_asynchronously_several_values" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_write_attribute_asynchronously_several_values(); } -} testDescription_GroupTestSuite_test_write_attribute_asynchronously_several_values; - -static class TestDescription_GroupTestSuite_test_write_attribute_synchronously_several_DeviceAttribute_values : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_write_attribute_synchronously_several_DeviceAttribute_values() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 741, "test_write_attribute_synchronously_several_DeviceAttribute_values" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_write_attribute_synchronously_several_DeviceAttribute_values(); } -} testDescription_GroupTestSuite_test_write_attribute_synchronously_several_DeviceAttribute_values; - -static class TestDescription_GroupTestSuite_test_write_attribute_asynchronously_several_DeviceAttribute_values : public CxxTest::RealTestDescription { -public: - TestDescription_GroupTestSuite_test_write_attribute_asynchronously_several_DeviceAttribute_values() : CxxTest::RealTestDescription( Tests_GroupTestSuite, suiteDescription_GroupTestSuite, 787, "test_write_attribute_asynchronously_several_DeviceAttribute_values" ) {} - void runTest() { if ( suite_GroupTestSuite ) suite_GroupTestSuite->test_write_attribute_asynchronously_several_DeviceAttribute_values(); } -} testDescription_GroupTestSuite_test_write_attribute_asynchronously_several_DeviceAttribute_values; - -#include "../../../../new_tests/cxx_encoded.cpp" - -static EncodedTestSuite *suite_EncodedTestSuite = 0; - -static CxxTest::List Tests_EncodedTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_EncodedTestSuite( "../../../../new_tests/cxx_encoded.cpp", 18, "EncodedTestSuite", Tests_EncodedTestSuite, suite_EncodedTestSuite, 62, 67 ); - -static class TestDescription_EncodedTestSuite_test_Miscellaneous_inserters_and_extracters_for_DeviceData : public CxxTest::RealTestDescription { -public: - TestDescription_EncodedTestSuite_test_Miscellaneous_inserters_and_extracters_for_DeviceData() : CxxTest::RealTestDescription( Tests_EncodedTestSuite, suiteDescription_EncodedTestSuite, 79, "test_Miscellaneous_inserters_and_extracters_for_DeviceData" ) {} - void runTest() { if ( suite_EncodedTestSuite ) suite_EncodedTestSuite->test_Miscellaneous_inserters_and_extracters_for_DeviceData(); } -} testDescription_EncodedTestSuite_test_Miscellaneous_inserters_and_extracters_for_DeviceData; - -static class TestDescription_EncodedTestSuite_test_Miscellaneous_inserters_and_extracters_for_DeviceAttribute : public CxxTest::RealTestDescription { -public: - TestDescription_EncodedTestSuite_test_Miscellaneous_inserters_and_extracters_for_DeviceAttribute() : CxxTest::RealTestDescription( Tests_EncodedTestSuite, suiteDescription_EncodedTestSuite, 160, "test_Miscellaneous_inserters_and_extracters_for_DeviceAttribute" ) {} - void runTest() { if ( suite_EncodedTestSuite ) suite_EncodedTestSuite->test_Miscellaneous_inserters_and_extracters_for_DeviceAttribute(); } -} testDescription_EncodedTestSuite_test_Miscellaneous_inserters_and_extracters_for_DeviceAttribute; - -#include "../../../../new_tests/cxx_database.cpp" - -static DatabaseTestSuite *suite_DatabaseTestSuite = 0; - -static CxxTest::List Tests_DatabaseTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_DatabaseTestSuite( "../../../../new_tests/cxx_database.cpp", 18, "DatabaseTestSuite", Tests_DatabaseTestSuite, suite_DatabaseTestSuite, 69, 74 ); - -static class TestDescription_DatabaseTestSuite_test_get_device_info : public CxxTest::RealTestDescription { -public: - TestDescription_DatabaseTestSuite_test_get_device_info() : CxxTest::RealTestDescription( Tests_DatabaseTestSuite, suiteDescription_DatabaseTestSuite, 86, "test_get_device_info" ) {} - void runTest() { if ( suite_DatabaseTestSuite ) suite_DatabaseTestSuite->test_get_device_info(); } -} testDescription_DatabaseTestSuite_test_get_device_info; - -static class TestDescription_DatabaseTestSuite_test_device_alias_calls : public CxxTest::RealTestDescription { -public: - TestDescription_DatabaseTestSuite_test_device_alias_calls() : CxxTest::RealTestDescription( Tests_DatabaseTestSuite, suiteDescription_DatabaseTestSuite, 107, "test_device_alias_calls" ) {} - void runTest() { if ( suite_DatabaseTestSuite ) suite_DatabaseTestSuite->test_device_alias_calls(); } -} testDescription_DatabaseTestSuite_test_device_alias_calls; - -static class TestDescription_DatabaseTestSuite_test_attribute_alias_calls : public CxxTest::RealTestDescription { -public: - TestDescription_DatabaseTestSuite_test_attribute_alias_calls() : CxxTest::RealTestDescription( Tests_DatabaseTestSuite, suiteDescription_DatabaseTestSuite, 120, "test_attribute_alias_calls" ) {} - void runTest() { if ( suite_DatabaseTestSuite ) suite_DatabaseTestSuite->test_attribute_alias_calls(); } -} testDescription_DatabaseTestSuite_test_attribute_alias_calls; - -#include "../../../../new_tests/cxx_mem_attr.cpp" - -static MemAttrTestSuite *suite_MemAttrTestSuite = 0; - -static CxxTest::List Tests_MemAttrTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_MemAttrTestSuite( "../../../../new_tests/cxx_mem_attr.cpp", 20, "MemAttrTestSuite", Tests_MemAttrTestSuite, suite_MemAttrTestSuite, 75, 80 ); - -static class TestDescription_MemAttrTestSuite_test_One_memorized_attribute_failing_during_init_cmd : public CxxTest::RealTestDescription { -public: - TestDescription_MemAttrTestSuite_test_One_memorized_attribute_failing_during_init_cmd() : CxxTest::RealTestDescription( Tests_MemAttrTestSuite, suiteDescription_MemAttrTestSuite, 91, "test_One_memorized_attribute_failing_during_init_cmd" ) {} - void runTest() { if ( suite_MemAttrTestSuite ) suite_MemAttrTestSuite->test_One_memorized_attribute_failing_during_init_cmd(); } -} testDescription_MemAttrTestSuite_test_One_memorized_attribute_failing_during_init_cmd; - -#include "../../../../new_tests/cxx_write_attr_hard.cpp" - -static WriteAttrHardware *suite_WriteAttrHardware = 0; - -static CxxTest::List Tests_WriteAttrHardware = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_WriteAttrHardware( "../../../../new_tests/cxx_write_attr_hard.cpp", 17, "WriteAttrHardware", Tests_WriteAttrHardware, suite_WriteAttrHardware, 90, 95 ); - -static class TestDescription_WriteAttrHardware_test_DevFailed_from_write_attr_hardware : public CxxTest::RealTestDescription { -public: - TestDescription_WriteAttrHardware_test_DevFailed_from_write_attr_hardware() : CxxTest::RealTestDescription( Tests_WriteAttrHardware, suiteDescription_WriteAttrHardware, 106, "test_DevFailed_from_write_attr_hardware" ) {} - void runTest() { if ( suite_WriteAttrHardware ) suite_WriteAttrHardware->test_DevFailed_from_write_attr_hardware(); } -} testDescription_WriteAttrHardware_test_DevFailed_from_write_attr_hardware; - -static class TestDescription_WriteAttrHardware_test_MultiDevFailed_from_name_thrown_by_write_attr_hardware : public CxxTest::RealTestDescription { -public: - TestDescription_WriteAttrHardware_test_MultiDevFailed_from_name_thrown_by_write_attr_hardware() : CxxTest::RealTestDescription( Tests_WriteAttrHardware, suiteDescription_WriteAttrHardware, 176, "test_MultiDevFailed_from_name_thrown_by_write_attr_hardware" ) {} - void runTest() { if ( suite_WriteAttrHardware ) suite_WriteAttrHardware->test_MultiDevFailed_from_name_thrown_by_write_attr_hardware(); } -} testDescription_WriteAttrHardware_test_MultiDevFailed_from_name_thrown_by_write_attr_hardware; - -static class TestDescription_WriteAttrHardware_test_MultiDevFailed_from_ind_thrown_by_write_attr_hardware : public CxxTest::RealTestDescription { -public: - TestDescription_WriteAttrHardware_test_MultiDevFailed_from_ind_thrown_by_write_attr_hardware() : CxxTest::RealTestDescription( Tests_WriteAttrHardware, suiteDescription_WriteAttrHardware, 231, "test_MultiDevFailed_from_ind_thrown_by_write_attr_hardware" ) {} - void runTest() { if ( suite_WriteAttrHardware ) suite_WriteAttrHardware->test_MultiDevFailed_from_ind_thrown_by_write_attr_hardware(); } -} testDescription_WriteAttrHardware_test_MultiDevFailed_from_ind_thrown_by_write_attr_hardware; - -#include "../../../../new_tests/cxx_enum_att.cpp" - -static EnumAttTestSuite *suite_EnumAttTestSuite = 0; - -static CxxTest::List Tests_EnumAttTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_EnumAttTestSuite( "../../../../new_tests/cxx_enum_att.cpp", 18, "EnumAttTestSuite", Tests_EnumAttTestSuite, suite_EnumAttTestSuite, 106, 111 ); - -static class TestDescription_EnumAttTestSuite_test_enum_attribute_configuration : public CxxTest::RealTestDescription { -public: - TestDescription_EnumAttTestSuite_test_enum_attribute_configuration() : CxxTest::RealTestDescription( Tests_EnumAttTestSuite, suiteDescription_EnumAttTestSuite, 122, "test_enum_attribute_configuration" ) {} - void runTest() { if ( suite_EnumAttTestSuite ) suite_EnumAttTestSuite->test_enum_attribute_configuration(); } -} testDescription_EnumAttTestSuite_test_enum_attribute_configuration; - -static class TestDescription_EnumAttTestSuite_test_enum_attribute_reading : public CxxTest::RealTestDescription { -public: - TestDescription_EnumAttTestSuite_test_enum_attribute_reading() : CxxTest::RealTestDescription( Tests_EnumAttTestSuite, suiteDescription_EnumAttTestSuite, 221, "test_enum_attribute_reading" ) {} - void runTest() { if ( suite_EnumAttTestSuite ) suite_EnumAttTestSuite->test_enum_attribute_reading(); } -} testDescription_EnumAttTestSuite_test_enum_attribute_reading; - -static class TestDescription_EnumAttTestSuite_test_enum_attribute_writing : public CxxTest::RealTestDescription { -public: - TestDescription_EnumAttTestSuite_test_enum_attribute_writing() : CxxTest::RealTestDescription( Tests_EnumAttTestSuite, suiteDescription_EnumAttTestSuite, 249, "test_enum_attribute_writing" ) {} - void runTest() { if ( suite_EnumAttTestSuite ) suite_EnumAttTestSuite->test_enum_attribute_writing(); } -} testDescription_EnumAttTestSuite_test_enum_attribute_writing; - -static class TestDescription_EnumAttTestSuite_test_enum_attribute_write_read : public CxxTest::RealTestDescription { -public: - TestDescription_EnumAttTestSuite_test_enum_attribute_write_read() : CxxTest::RealTestDescription( Tests_EnumAttTestSuite, suiteDescription_EnumAttTestSuite, 292, "test_enum_attribute_write_read" ) {} - void runTest() { if ( suite_EnumAttTestSuite ) suite_EnumAttTestSuite->test_enum_attribute_write_read(); } -} testDescription_EnumAttTestSuite_test_enum_attribute_write_read; - -static class TestDescription_EnumAttTestSuite_test_enum_attribute_memorized : public CxxTest::RealTestDescription { -public: - TestDescription_EnumAttTestSuite_test_enum_attribute_memorized() : CxxTest::RealTestDescription( Tests_EnumAttTestSuite, suiteDescription_EnumAttTestSuite, 310, "test_enum_attribute_memorized" ) {} - void runTest() { if ( suite_EnumAttTestSuite ) suite_EnumAttTestSuite->test_enum_attribute_memorized(); } -} testDescription_EnumAttTestSuite_test_enum_attribute_memorized; - -static class TestDescription_EnumAttTestSuite_test_enum_attribute_polling : public CxxTest::RealTestDescription { -public: - TestDescription_EnumAttTestSuite_test_enum_attribute_polling() : CxxTest::RealTestDescription( Tests_EnumAttTestSuite, suiteDescription_EnumAttTestSuite, 339, "test_enum_attribute_polling" ) {} - void runTest() { if ( suite_EnumAttTestSuite ) suite_EnumAttTestSuite->test_enum_attribute_polling(); } -} testDescription_EnumAttTestSuite_test_enum_attribute_polling; - -static class TestDescription_EnumAttTestSuite_test_dynamic_attribute_of_enum_type : public CxxTest::RealTestDescription { -public: - TestDescription_EnumAttTestSuite_test_dynamic_attribute_of_enum_type() : CxxTest::RealTestDescription( Tests_EnumAttTestSuite, suiteDescription_EnumAttTestSuite, 407, "test_dynamic_attribute_of_enum_type" ) {} - void runTest() { if ( suite_EnumAttTestSuite ) suite_EnumAttTestSuite->test_dynamic_attribute_of_enum_type(); } -} testDescription_EnumAttTestSuite_test_dynamic_attribute_of_enum_type; - -static class TestDescription_EnumAttTestSuite_test_Dyn_enum : public CxxTest::RealTestDescription { -public: - TestDescription_EnumAttTestSuite_test_Dyn_enum() : CxxTest::RealTestDescription( Tests_EnumAttTestSuite, suiteDescription_EnumAttTestSuite, 425, "test_Dyn_enum" ) {} - void runTest() { if ( suite_EnumAttTestSuite ) suite_EnumAttTestSuite->test_Dyn_enum(); } -} testDescription_EnumAttTestSuite_test_Dyn_enum; - -#include "../../../../new_tests/cxx_fwd_att.cpp" - -static FwdAttTestSuite *suite_FwdAttTestSuite = 0; - -static CxxTest::List Tests_FwdAttTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_FwdAttTestSuite( "../../../../new_tests/cxx_fwd_att.cpp", 18, "FwdAttTestSuite", Tests_FwdAttTestSuite, suite_FwdAttTestSuite, 159, 164 ); - -static class TestDescription_FwdAttTestSuite_test_error_case_in_forwarded_attribute_configuration : public CxxTest::RealTestDescription { -public: - TestDescription_FwdAttTestSuite_test_error_case_in_forwarded_attribute_configuration() : CxxTest::RealTestDescription( Tests_FwdAttTestSuite, suiteDescription_FwdAttTestSuite, 175, "test_error_case_in_forwarded_attribute_configuration" ) {} - void runTest() { if ( suite_FwdAttTestSuite ) suite_FwdAttTestSuite->test_error_case_in_forwarded_attribute_configuration(); } -} testDescription_FwdAttTestSuite_test_error_case_in_forwarded_attribute_configuration; - -static class TestDescription_FwdAttTestSuite_test_reading_forwarded_attribute : public CxxTest::RealTestDescription { -public: - TestDescription_FwdAttTestSuite_test_reading_forwarded_attribute() : CxxTest::RealTestDescription( Tests_FwdAttTestSuite, suiteDescription_FwdAttTestSuite, 256, "test_reading_forwarded_attribute" ) {} - void runTest() { if ( suite_FwdAttTestSuite ) suite_FwdAttTestSuite->test_reading_forwarded_attribute(); } -} testDescription_FwdAttTestSuite_test_reading_forwarded_attribute; - -static class TestDescription_FwdAttTestSuite_test_writing_forwarded_attribute : public CxxTest::RealTestDescription { -public: - TestDescription_FwdAttTestSuite_test_writing_forwarded_attribute() : CxxTest::RealTestDescription( Tests_FwdAttTestSuite, suiteDescription_FwdAttTestSuite, 306, "test_writing_forwarded_attribute" ) {} - void runTest() { if ( suite_FwdAttTestSuite ) suite_FwdAttTestSuite->test_writing_forwarded_attribute(); } -} testDescription_FwdAttTestSuite_test_writing_forwarded_attribute; - -static class TestDescription_FwdAttTestSuite_test_data_propagation : public CxxTest::RealTestDescription { -public: - TestDescription_FwdAttTestSuite_test_data_propagation() : CxxTest::RealTestDescription( Tests_FwdAttTestSuite, suiteDescription_FwdAttTestSuite, 375, "test_data_propagation" ) {} - void runTest() { if ( suite_FwdAttTestSuite ) suite_FwdAttTestSuite->test_data_propagation(); } -} testDescription_FwdAttTestSuite_test_data_propagation; - -static class TestDescription_FwdAttTestSuite_test_attribute_configuration : public CxxTest::RealTestDescription { -public: - TestDescription_FwdAttTestSuite_test_attribute_configuration() : CxxTest::RealTestDescription( Tests_FwdAttTestSuite, suiteDescription_FwdAttTestSuite, 421, "test_attribute_configuration" ) {} - void runTest() { if ( suite_FwdAttTestSuite ) suite_FwdAttTestSuite->test_attribute_configuration(); } -} testDescription_FwdAttTestSuite_test_attribute_configuration; - -static class TestDescription_FwdAttTestSuite_test_attribute_configuration_propagation : public CxxTest::RealTestDescription { -public: - TestDescription_FwdAttTestSuite_test_attribute_configuration_propagation() : CxxTest::RealTestDescription( Tests_FwdAttTestSuite, suiteDescription_FwdAttTestSuite, 522, "test_attribute_configuration_propagation" ) {} - void runTest() { if ( suite_FwdAttTestSuite ) suite_FwdAttTestSuite->test_attribute_configuration_propagation(); } -} testDescription_FwdAttTestSuite_test_attribute_configuration_propagation; - -static class TestDescription_FwdAttTestSuite_test_label_is_local : public CxxTest::RealTestDescription { -public: - TestDescription_FwdAttTestSuite_test_label_is_local() : CxxTest::RealTestDescription( Tests_FwdAttTestSuite, suiteDescription_FwdAttTestSuite, 552, "test_label_is_local" ) {} - void runTest() { if ( suite_FwdAttTestSuite ) suite_FwdAttTestSuite->test_label_is_local(); } -} testDescription_FwdAttTestSuite_test_label_is_local; - -static class TestDescription_FwdAttTestSuite_test_write_read_on_forwarded_attribute : public CxxTest::RealTestDescription { -public: - TestDescription_FwdAttTestSuite_test_write_read_on_forwarded_attribute() : CxxTest::RealTestDescription( Tests_FwdAttTestSuite, suiteDescription_FwdAttTestSuite, 581, "test_write_read_on_forwarded_attribute" ) {} - void runTest() { if ( suite_FwdAttTestSuite ) suite_FwdAttTestSuite->test_write_read_on_forwarded_attribute(); } -} testDescription_FwdAttTestSuite_test_write_read_on_forwarded_attribute; - -static class TestDescription_FwdAttTestSuite_test_polling_on_a_forwarded_attribute : public CxxTest::RealTestDescription { -public: - TestDescription_FwdAttTestSuite_test_polling_on_a_forwarded_attribute() : CxxTest::RealTestDescription( Tests_FwdAttTestSuite, suiteDescription_FwdAttTestSuite, 600, "test_polling_on_a_forwarded_attribute" ) {} - void runTest() { if ( suite_FwdAttTestSuite ) suite_FwdAttTestSuite->test_polling_on_a_forwarded_attribute(); } -} testDescription_FwdAttTestSuite_test_polling_on_a_forwarded_attribute; - -static class TestDescription_FwdAttTestSuite_test_event_on_a_forwarded_attribute : public CxxTest::RealTestDescription { -public: - TestDescription_FwdAttTestSuite_test_event_on_a_forwarded_attribute() : CxxTest::RealTestDescription( Tests_FwdAttTestSuite, suiteDescription_FwdAttTestSuite, 690, "test_event_on_a_forwarded_attribute" ) {} - void runTest() { if ( suite_FwdAttTestSuite ) suite_FwdAttTestSuite->test_event_on_a_forwarded_attribute(); } -} testDescription_FwdAttTestSuite_test_event_on_a_forwarded_attribute; - -static class TestDescription_FwdAttTestSuite_test_locking_device_with_forwarded_attribute : public CxxTest::RealTestDescription { -public: - TestDescription_FwdAttTestSuite_test_locking_device_with_forwarded_attribute() : CxxTest::RealTestDescription( Tests_FwdAttTestSuite, suiteDescription_FwdAttTestSuite, 746, "test_locking_device_with_forwarded_attribute" ) {} - void runTest() { if ( suite_FwdAttTestSuite ) suite_FwdAttTestSuite->test_locking_device_with_forwarded_attribute(); } -} testDescription_FwdAttTestSuite_test_locking_device_with_forwarded_attribute; - -#include "../../../../new_tests/cxx_z00_dyn_cmd.cpp" - -static DynCmdTestSuite *suite_DynCmdTestSuite = 0; - -static CxxTest::List Tests_DynCmdTestSuite = { 0, 0 }; -CxxTest::DynamicSuiteDescription suiteDescription_DynCmdTestSuite( "../../../../new_tests/cxx_z00_dyn_cmd.cpp", 17, "DynCmdTestSuite", Tests_DynCmdTestSuite, suite_DynCmdTestSuite, 67, 72 ); - -static class TestDescription_DynCmdTestSuite_test_dynamic_command_at_class_level : public CxxTest::RealTestDescription { -public: - TestDescription_DynCmdTestSuite_test_dynamic_command_at_class_level() : CxxTest::RealTestDescription( Tests_DynCmdTestSuite, suiteDescription_DynCmdTestSuite, 83, "test_dynamic_command_at_class_level" ) {} - void runTest() { if ( suite_DynCmdTestSuite ) suite_DynCmdTestSuite->test_dynamic_command_at_class_level(); } -} testDescription_DynCmdTestSuite_test_dynamic_command_at_class_level; - -static class TestDescription_DynCmdTestSuite_test_dynamic_command_at_device_level : public CxxTest::RealTestDescription { -public: - TestDescription_DynCmdTestSuite_test_dynamic_command_at_device_level() : CxxTest::RealTestDescription( Tests_DynCmdTestSuite, suiteDescription_DynCmdTestSuite, 140, "test_dynamic_command_at_device_level" ) {} - void runTest() { if ( suite_DynCmdTestSuite ) suite_DynCmdTestSuite->test_dynamic_command_at_device_level(); } -} testDescription_DynCmdTestSuite_test_dynamic_command_at_device_level; - -#include diff --git a/cpp_test_suite/win64/vc10/test_suite/runner/runner.vcxproj b/cpp_test_suite/win64/vc10/test_suite/runner/runner.vcxproj deleted file mode 100644 index d2aecddd4..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/runner/runner.vcxproj +++ /dev/null @@ -1,179 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {94D774D1-1403-4F01-AD70-1337438E970B} - runner2 - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - runner - false - - - - ..\..\..\..\build_runner.bat - - - Disabled - ..\..\..\..\cxxtest\include\;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreaded - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - ..\..\..\..\build_runner.bat - - - Disabled - ..\..\..\..\cxxtest\include\;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreaded - - - Level3 - ProgramDatabase - - - true - Console - - - - - ..\..\..\..\build_runner.bat - - - Disabled - true - ..\..\..\..\cxxtest\include\;..\..\..\..\new_tests\;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - %(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - ..\..\..\..\build_runner.bat - - - Disabled - true - ..\..\..\..\cxxtest\include\;..\..\..\..\new_tests\;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - %(AdditionalLibraryDirectories) - false - Console - true - true - - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/scan/scan.vcxproj b/cpp_test_suite/win64/vc10/test_suite/scan/scan.vcxproj deleted file mode 100644 index 1a5dc20cd..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/scan/scan.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {5DD390AE-DCDE-4B18-BEDF-6EE21B5DD6AC} - scan - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - scan - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/server_event/server_event.vcxproj b/cpp_test_suite/win64/vc10/test_suite/server_event/server_event.vcxproj deleted file mode 100644 index 9e337559c..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/server_event/server_event.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {AA03D1D3-E62E-491E-BED6-7A5851879382} - server_event - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - server_event - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/size/size.vcxproj b/cpp_test_suite/win64/vc10/test_suite/size/size.vcxproj deleted file mode 100644 index eeb262e57..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/size/size.vcxproj +++ /dev/null @@ -1,156 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {7E906AB3-8ED0-4462-8E31-0E7D5C291806} - size - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - false - false - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/state_attr/state_attr.vcxproj b/cpp_test_suite/win64/vc10/test_suite/state_attr/state_attr.vcxproj deleted file mode 100644 index f05ea0a91..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/state_attr/state_attr.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {F756059A-654F-40ED-8BA0-F478B7CBF1CF} - state_attr - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - state_attr - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/state_event/state_event.vcxproj b/cpp_test_suite/win64/vc10/test_suite/state_event/state_event.vcxproj deleted file mode 100644 index 9fecc24f2..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/state_event/state_event.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {3E45FEB0-8CB6-42BC-BEF2-B7484198359A} - state_event - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - state_event - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/stateless_sub/stateless_sub.vcxproj b/cpp_test_suite/win64/vc10/test_suite/stateless_sub/stateless_sub.vcxproj deleted file mode 100644 index d83cae321..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/stateless_sub/stateless_sub.vcxproj +++ /dev/null @@ -1,154 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {4BDF04F0-C19E-42E4-837C-B63EECA8D651} - Win32Proj - stateless_sub - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - false - true - Unicode - Windows7.1SDK - - - Application - false - true - Unicode - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - $(PREFIX)\win64\bin\ - stateless_sub - - - false - $(PREFIX)\win64\bin\ - stateless_sub - $(Configuration)\ - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level2 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - Level2 - - - Disabled - true - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - false - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/sub_dev/sub_dev.vcxproj b/cpp_test_suite/win64/vc10/test_suite/sub_dev/sub_dev.vcxproj deleted file mode 100644 index c910f23cf..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/sub_dev/sub_dev.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {E3CF6E9E-2DA5-4EB6-9529-95BF2761A9CC} - sub_dev - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - sub_dev - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/syntax/syntax.vcxproj b/cpp_test_suite/win64/vc10/test_suite/syntax/syntax.vcxproj deleted file mode 100644 index 7822ced91..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/syntax/syntax.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {4C874FC5-474A-4B12-8A56-61A53CC055DC} - syntax - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - syntax - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/test_suite.sln b/cpp_test_suite/win64/vc10/test_suite/test_suite.sln deleted file mode 100644 index 30fa051df..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/test_suite.sln +++ /dev/null @@ -1,829 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Poll", "Poll\Poll.vcxproj", "{5CF0AD69-352A-4827-AD4B-DE629E1B4E78}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StopPoll", "StopPoll\StopPoll.vcxproj", "{E37BBC67-2308-4B63-B961-71519FB9F279}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "new_devproxy", "new_devproxy\new_devproxy.vcxproj", "{C01D8845-2CDF-43E3-BEE8-91896629E064}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multiple_new", "multiple_new\multiple_new.vcxproj", "{B70EC07A-24E8-44F0-8CE6-49AC2760470F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reconnect", "reconnect\reconnect.vcxproj", "{7ECEF870-A73D-4FFA-9248-4E14C528FC81}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmd_inout", "cmd_inout\cmd_inout.vcxproj", "{B011952D-D686-4A1B-92A9-F457B8444154}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "read_attr", "read_attr\read_attr.vcxproj", "{CE6EC813-919B-4257-A4B6-EC94A1FDABCD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmd_types", "cmd_types\cmd_types.vcxproj", "{290BA60F-09D9-4BCA-8403-94EDCB899E53}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attr_types", "attr_types\attr_types.vcxproj", "{DC4473DB-EAEA-4DC7-BB6F-1CA2DF5F2F3B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "misc_devdata", "misc-devdata\misc-devdata.vcxproj", "{A2E9C810-2935-4805-8792-496A0ED10839}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "misc_devattr", "misc_devattr\misc_devattr.vcxproj", "{4CD9F188-97C9-4C1F-AC7B-1666D5FAE3C3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "misc_devproxy", "misc_devproxy\misc_devproxy.vcxproj", "{D6F15615-2C92-4CFE-B548-9506ECFD73AB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "write_attr", "write_attr\write_attr.vcxproj", "{7EE9A9E4-78AE-4B6D-8F7C-DADB9FE90E7A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_devproxy", "copy_devproxy\copy_devproxy.vcxproj", "{37D0C9C1-31C0-467F-9310-DAF494377E95}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj_prop", "obj_prop\obj_prop.vcxproj", "{700AD2FC-90D2-480C-B059-15DCA0F8D894}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "read_hist", "read_host\read_host.vcxproj", "{3CBAF461-838E-4225-A24C-21BD8E4FE551}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "poll_met", "poll_met\poll_met.vcxproj", "{1491287C-D235-4BE7-A534-33055C88E59C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "poll_except", "poll_except\poll_except.vcxproj", "{D58946D1-C6C3-4AE2-86C5-9C53B11E027E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "poll_attr", "poll_attr\poll_attr.vcxproj", "{C0BF9611-7DFA-4782-99FA-661C29977CD1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "print_data", "print_data\print_data.vcxproj", "{BDB9FBC2-8DB1-46F2-AF29-96D975120A76}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "print_data_hist", "print_data_hist\print_data_hist.vcxproj", "{870C3E28-A769-4F95-B6DA-7CD45CDB780C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "syntax", "syntax\syntax.vcxproj", "{4C874FC5-474A-4B12-8A56-61A53CC055DC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "size", "size\size.vcxproj", "{7E906AB3-8ED0-4462-8E31-0E7D5C291806}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attr_proxy", "attr_proxy\attr_proxy.vcxproj", "{2571DAA6-742A-49F1-875C-8E3EF9F52EF9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "read_hist_ext", "read_hist_ext\read_hist_ext.vcxproj", "{1B4C4DA3-65F5-4D17-B082-BD2F6CAAD6C0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "write_attr_3", "write_attr_3\write_attr_3.vcxproj", "{08D23250-240C-4025-8649-EC441171A51D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring_depth", "ring_depth\ring_depth.vcxproj", "{23F9A2ED-D02F-410B-9004-8CC9E642EE01}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attr_misc", "attr_misc\attr_misc.vcxproj", "{2640C5A4-7B5E-4159-AF46-8D012582A70A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "state_attr", "state_attr\state_attr.vcxproj", "{F756059A-654F-40ED-8BA0-F478B7CBF1CF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rds", "rds\rds.vcxproj", "{D136A855-85D8-4D29-99C9-AE7D5D6EA738}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mem_att", "mem_att\mem_att.vcxproj", "{B2D73C70-66F2-4BB8-92A4-111C44DAA3DB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attr_manip", "attr_manip\attr_manip.vcxproj", "{8594FBDD-2938-49E0-AF5B-F524ABEE5C0F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prop_list", "prop_list\prop_list.vcxproj", "{2C333947-5663-4717-BB41-39804C4EDBCA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ds_cache", "ds_cache\ds_cache.vcxproj", "{19B05026-7732-4FEC-A85C-8C6BC339D761}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sub_dev", "sub_dev\sub_dev.vcxproj", "{E3CF6E9E-2DA5-4EB6-9529-95BF2761A9CC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "locked_device", "locked_device\locked_device.vcxproj", "{683BBC0B-FE1D-4C1C-867A-C1EF384E9848}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lock", "lock\lock.vcxproj", "{8A319852-91A7-4339-9C03-F4D355614454}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "restart_device", "restart_device\restart_device.vcxproj", "{2E5B889E-72C7-45F8-9611-9687A706D327}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unlock", "unlock\unlock.vcxproj", "{ECF3BF91-AE61-42AC-B3F2-FBCE55589B0C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "allowed_cmd", "allowed_cmd\allowed_cmd.vcxproj", "{AAD01C98-3B8F-495F-A070-80A97A9AEAE2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w_r_attr", "w_r_attr\w_r_attr.vcxproj", "{94F286EB-0016-4205-8B39-25EDB17C9E0C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "acc_right", "acc_right\acc_right.vcxproj", "{937982FD-CB54-40B7-9A95-638F97AC6C81}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConfEventBugClient", "ConfEventBugClient\ConfEventBugClient.vcxproj", "{3D404CC8-162C-46D5-8910-AB54DE545FC5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "att_conf", "att_conf\att_conf.vcxproj", "{514E32B7-43FA-4CC8-A87C-540F4E0AF768}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_cmd", "asyn_cmd\asyn_cmd.vcxproj", "{34BA4CE1-613B-42E0-8399-761DD96FD595}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_attr", "asyn_attr\asyn_attr.vcxproj", "{C7621A8E-AB31-4D98-B995-90A99D2D7B45}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_attr_multi", "asyn_attr_multi\asyn_attr_multi.vcxproj", "{B29EA00F-7420-43C0-B7BB-DF1F8AEF1C94}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_write_attr", "asyn_write_attr\asyn_write_attr.vcxproj", "{649B6A2C-A3E4-48B6-AF27-D29532356A6B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_write_attr_multi", "asyn_write_attr_multi\asyn_write_attr_multi.vcxproj", "{928D4E54-26B5-4B24-A1C4-4775BC0BE76C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_cb", "asyn_cb\asyn_cb.vcxproj", "{E8AE8FF7-54BB-43EC-ACFD-45E70B73A2C9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_cb2", "asyn_cb2\asyn_cb2.vcxproj", "{469D0696-C16C-4EC5-819F-C07E0F384285}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_cb_cmd", "asyn_cb_cmd\asyn_cb_cmd.vcxproj", "{EEE171FE-9C9D-4552-BF21-2BAA5DAEDFF6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_attr_cb", "asyn_attr_cb\asyn_attr_cb.vcxproj", "{5008C2DB-FA43-4E2A-B03A-C60F43FAAC1C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_write_cb", "asyn_write_cb\asyn_write_cb.vcxproj", "{DF6060F0-C235-4E8E-AF43-D3385A506A2F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyn_thread", "asyn_thread\asyn_thread.vcxproj", "{D87A0B24-AA34-41A6-93FC-7033D6BBCB63}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "auto_asyn_cmd", "auto_asyn_cmd\auto_asyn_cmd.vcxproj", "{BAC3C08E-6E1A-4EA9-9F72-EE0BCC4537A9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "per_event", "per_event\per_event.vcxproj", "{2B29ADC6-0E59-428F-B881-062B6515F398}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "change_event", "change_event\change_event.vcxproj", "{EC965242-1D96-4E0C-9AFB-CD5EB64FDB2E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "change_event64", "change_event64\change_event64.vcxproj", "{8B3A3FF3-B78C-4D50-8BBB-68F58A62DAEC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "archive_event", "archive_event\archive_event.vcxproj", "{B80E8A57-208E-49FA-83BD-546B46A9BC4E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "user_event", "user_event\user_event.vcxproj", "{3B7C102E-1228-4C67-AAAF-90A2894370FD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server_event", "server_event\server_event.vcxproj", "{AA03D1D3-E62E-491E-BED6-7A5851879382}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reco_event", "reco_event\reco_event.vcxproj", "{8926BDE3-BD11-4DA3-8F5D-09A23243DDBB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reco_svc", "reco_svc\reco_svc.vcxproj", "{73B65A5F-06D3-46E3-AE76-74853A0FDB36}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "state_event", "state_event\state_event.vcxproj", "{3E45FEB0-8CB6-42BC-BEF2-B7484198359A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scan", "scan\scan.vcxproj", "{5DD390AE-DCDE-4B18-BEDF-6EE21B5DD6AC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "att_conf_event", "att_conf_event\att_conf_event.vcxproj", "{B839A523-2BF1-4041-8438-FB084FEDE4CA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "data_ready_event", "data_ready_event\data_ready_event.vcxproj", "{6BC0051B-48CC-4B9D-9BFF-5D6B9CAEDF4C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "change_event_buffer", "change_event_buffer\change_event_buffer.vcxproj", "{B93C82CE-D496-47E8-B111-99F406ADB490}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "att_conf_event_buffer", "att_conf_event_buffer\att_conf_event_buffer.vcxproj", "{78349AD2-3C40-4D22-BFE1-6E63686E3FFC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "data_ready_event_buffer", "data_ready_event_buffer\data_ready_event_buffer.vcxproj", "{E21FE87C-B9E0-40ED-B1C5-044C116B42F8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event_lock", "event_lock\event_lock.vcxproj", "{6F89B606-00C4-4DE5-BBE4-4D058E6AEB6B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multi_event", "multi_event\multi_event.vcxproj", "{A2F8D0FB-F549-42BF-BB86-108B7B4AFBE0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "poll_pool", "poll_pool\poll_pool.vcxproj", "{6406C9C4-DCB7-43C5-828A-15B669A2A1A4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runner", "runner\runner.vcxproj", "{94D774D1-1403-4F01-AD70-1337438E970B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "att_type_event", "att_type_event\att_type_event.vcxproj", "{509AE767-82A2-48A7-8C11-21D5A2432F3E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stateless_sub", "stateless_sub\stateless_sub.vcxproj", "{4BDF04F0-C19E-42E4-837C-B63EECA8D651}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reco_zmq", "reco_zmq\reco_zmq.vcxproj", "{978CF74F-FE36-4343-B02E-33A62976818F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attr_conf_test", "attr_conf_test\attr_conf_test.vcxproj", "{34EE9DAB-1D81-4E13-892C-CD844BCA4E50}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wait_mcast_dev", "wait_mcast_dev\wait_mcast_dev.vcxproj", "{78E9071A-23F5-4F7D-A4CD-59EC01A7FA1D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dev_intr_event", "dev_intr_event\dev_intr_event.vcxproj", "{6B072643-D0CB-4B7A-BA4C-E7509ADC51B6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multi_dev_event", "multi_dev_event\multi_dev_event.vcxproj", "{B0341BD0-497A-4969-B045-1D259C59B32D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pipe_event", "pipe_event\pipe_event.vcxproj", "{A3A424FA-E965-45B6-957D-3EE630C8AE91}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5CF0AD69-352A-4827-AD4B-DE629E1B4E78}.Debug|Win32.ActiveCfg = Release|Win32 - {5CF0AD69-352A-4827-AD4B-DE629E1B4E78}.Debug|Win32.Build.0 = Release|Win32 - {5CF0AD69-352A-4827-AD4B-DE629E1B4E78}.Debug|x64.ActiveCfg = Debug|x64 - {5CF0AD69-352A-4827-AD4B-DE629E1B4E78}.Debug|x64.Build.0 = Debug|x64 - {5CF0AD69-352A-4827-AD4B-DE629E1B4E78}.Release|Win32.ActiveCfg = Release|Win32 - {5CF0AD69-352A-4827-AD4B-DE629E1B4E78}.Release|Win32.Build.0 = Release|Win32 - {5CF0AD69-352A-4827-AD4B-DE629E1B4E78}.Release|x64.ActiveCfg = Release|x64 - {5CF0AD69-352A-4827-AD4B-DE629E1B4E78}.Release|x64.Build.0 = Release|x64 - {E37BBC67-2308-4B63-B961-71519FB9F279}.Debug|Win32.ActiveCfg = Release|Win32 - {E37BBC67-2308-4B63-B961-71519FB9F279}.Debug|Win32.Build.0 = Release|Win32 - {E37BBC67-2308-4B63-B961-71519FB9F279}.Debug|x64.ActiveCfg = Debug|x64 - {E37BBC67-2308-4B63-B961-71519FB9F279}.Debug|x64.Build.0 = Debug|x64 - {E37BBC67-2308-4B63-B961-71519FB9F279}.Release|Win32.ActiveCfg = Release|Win32 - {E37BBC67-2308-4B63-B961-71519FB9F279}.Release|Win32.Build.0 = Release|Win32 - {E37BBC67-2308-4B63-B961-71519FB9F279}.Release|x64.ActiveCfg = Release|x64 - {E37BBC67-2308-4B63-B961-71519FB9F279}.Release|x64.Build.0 = Release|x64 - {C01D8845-2CDF-43E3-BEE8-91896629E064}.Debug|Win32.ActiveCfg = Release|Win32 - {C01D8845-2CDF-43E3-BEE8-91896629E064}.Debug|Win32.Build.0 = Release|Win32 - {C01D8845-2CDF-43E3-BEE8-91896629E064}.Debug|x64.ActiveCfg = Debug|x64 - {C01D8845-2CDF-43E3-BEE8-91896629E064}.Debug|x64.Build.0 = Debug|x64 - {C01D8845-2CDF-43E3-BEE8-91896629E064}.Release|Win32.ActiveCfg = Release|Win32 - {C01D8845-2CDF-43E3-BEE8-91896629E064}.Release|Win32.Build.0 = Release|Win32 - {C01D8845-2CDF-43E3-BEE8-91896629E064}.Release|x64.ActiveCfg = Release|x64 - {C01D8845-2CDF-43E3-BEE8-91896629E064}.Release|x64.Build.0 = Release|x64 - {B70EC07A-24E8-44F0-8CE6-49AC2760470F}.Debug|Win32.ActiveCfg = Release|Win32 - {B70EC07A-24E8-44F0-8CE6-49AC2760470F}.Debug|Win32.Build.0 = Release|Win32 - {B70EC07A-24E8-44F0-8CE6-49AC2760470F}.Debug|x64.ActiveCfg = Debug|x64 - {B70EC07A-24E8-44F0-8CE6-49AC2760470F}.Debug|x64.Build.0 = Debug|x64 - {B70EC07A-24E8-44F0-8CE6-49AC2760470F}.Release|Win32.ActiveCfg = Release|Win32 - {B70EC07A-24E8-44F0-8CE6-49AC2760470F}.Release|Win32.Build.0 = Release|Win32 - {B70EC07A-24E8-44F0-8CE6-49AC2760470F}.Release|x64.ActiveCfg = Release|x64 - {B70EC07A-24E8-44F0-8CE6-49AC2760470F}.Release|x64.Build.0 = Release|x64 - {7ECEF870-A73D-4FFA-9248-4E14C528FC81}.Debug|Win32.ActiveCfg = Release|Win32 - {7ECEF870-A73D-4FFA-9248-4E14C528FC81}.Debug|Win32.Build.0 = Release|Win32 - {7ECEF870-A73D-4FFA-9248-4E14C528FC81}.Debug|x64.ActiveCfg = Debug|x64 - {7ECEF870-A73D-4FFA-9248-4E14C528FC81}.Debug|x64.Build.0 = Debug|x64 - {7ECEF870-A73D-4FFA-9248-4E14C528FC81}.Release|Win32.ActiveCfg = Release|Win32 - {7ECEF870-A73D-4FFA-9248-4E14C528FC81}.Release|Win32.Build.0 = Release|Win32 - {7ECEF870-A73D-4FFA-9248-4E14C528FC81}.Release|x64.ActiveCfg = Release|x64 - {7ECEF870-A73D-4FFA-9248-4E14C528FC81}.Release|x64.Build.0 = Release|x64 - {B011952D-D686-4A1B-92A9-F457B8444154}.Debug|Win32.ActiveCfg = Release|Win32 - {B011952D-D686-4A1B-92A9-F457B8444154}.Debug|Win32.Build.0 = Release|Win32 - {B011952D-D686-4A1B-92A9-F457B8444154}.Debug|x64.ActiveCfg = Debug|x64 - {B011952D-D686-4A1B-92A9-F457B8444154}.Debug|x64.Build.0 = Debug|x64 - {B011952D-D686-4A1B-92A9-F457B8444154}.Release|Win32.ActiveCfg = Release|Win32 - {B011952D-D686-4A1B-92A9-F457B8444154}.Release|Win32.Build.0 = Release|Win32 - {B011952D-D686-4A1B-92A9-F457B8444154}.Release|x64.ActiveCfg = Release|x64 - {B011952D-D686-4A1B-92A9-F457B8444154}.Release|x64.Build.0 = Release|x64 - {CE6EC813-919B-4257-A4B6-EC94A1FDABCD}.Debug|Win32.ActiveCfg = Release|Win32 - {CE6EC813-919B-4257-A4B6-EC94A1FDABCD}.Debug|Win32.Build.0 = Release|Win32 - {CE6EC813-919B-4257-A4B6-EC94A1FDABCD}.Debug|x64.ActiveCfg = Debug|x64 - {CE6EC813-919B-4257-A4B6-EC94A1FDABCD}.Debug|x64.Build.0 = Debug|x64 - {CE6EC813-919B-4257-A4B6-EC94A1FDABCD}.Release|Win32.ActiveCfg = Release|Win32 - {CE6EC813-919B-4257-A4B6-EC94A1FDABCD}.Release|Win32.Build.0 = Release|Win32 - {CE6EC813-919B-4257-A4B6-EC94A1FDABCD}.Release|x64.ActiveCfg = Release|x64 - {CE6EC813-919B-4257-A4B6-EC94A1FDABCD}.Release|x64.Build.0 = Release|x64 - {290BA60F-09D9-4BCA-8403-94EDCB899E53}.Debug|Win32.ActiveCfg = Release|Win32 - {290BA60F-09D9-4BCA-8403-94EDCB899E53}.Debug|Win32.Build.0 = Release|Win32 - {290BA60F-09D9-4BCA-8403-94EDCB899E53}.Debug|x64.ActiveCfg = Debug|x64 - {290BA60F-09D9-4BCA-8403-94EDCB899E53}.Debug|x64.Build.0 = Debug|x64 - {290BA60F-09D9-4BCA-8403-94EDCB899E53}.Release|Win32.ActiveCfg = Release|Win32 - {290BA60F-09D9-4BCA-8403-94EDCB899E53}.Release|Win32.Build.0 = Release|Win32 - {290BA60F-09D9-4BCA-8403-94EDCB899E53}.Release|x64.ActiveCfg = Release|x64 - {290BA60F-09D9-4BCA-8403-94EDCB899E53}.Release|x64.Build.0 = Release|x64 - {DC4473DB-EAEA-4DC7-BB6F-1CA2DF5F2F3B}.Debug|Win32.ActiveCfg = Release|Win32 - {DC4473DB-EAEA-4DC7-BB6F-1CA2DF5F2F3B}.Debug|Win32.Build.0 = Release|Win32 - {DC4473DB-EAEA-4DC7-BB6F-1CA2DF5F2F3B}.Debug|x64.ActiveCfg = Debug|x64 - {DC4473DB-EAEA-4DC7-BB6F-1CA2DF5F2F3B}.Debug|x64.Build.0 = Debug|x64 - {DC4473DB-EAEA-4DC7-BB6F-1CA2DF5F2F3B}.Release|Win32.ActiveCfg = Release|Win32 - {DC4473DB-EAEA-4DC7-BB6F-1CA2DF5F2F3B}.Release|Win32.Build.0 = Release|Win32 - {DC4473DB-EAEA-4DC7-BB6F-1CA2DF5F2F3B}.Release|x64.ActiveCfg = Release|x64 - {DC4473DB-EAEA-4DC7-BB6F-1CA2DF5F2F3B}.Release|x64.Build.0 = Release|x64 - {A2E9C810-2935-4805-8792-496A0ED10839}.Debug|Win32.ActiveCfg = Release|Win32 - {A2E9C810-2935-4805-8792-496A0ED10839}.Debug|Win32.Build.0 = Release|Win32 - {A2E9C810-2935-4805-8792-496A0ED10839}.Debug|x64.ActiveCfg = Debug|x64 - {A2E9C810-2935-4805-8792-496A0ED10839}.Debug|x64.Build.0 = Debug|x64 - {A2E9C810-2935-4805-8792-496A0ED10839}.Release|Win32.ActiveCfg = Release|Win32 - {A2E9C810-2935-4805-8792-496A0ED10839}.Release|Win32.Build.0 = Release|Win32 - {A2E9C810-2935-4805-8792-496A0ED10839}.Release|x64.ActiveCfg = Release|x64 - {A2E9C810-2935-4805-8792-496A0ED10839}.Release|x64.Build.0 = Release|x64 - {4CD9F188-97C9-4C1F-AC7B-1666D5FAE3C3}.Debug|Win32.ActiveCfg = Release|Win32 - {4CD9F188-97C9-4C1F-AC7B-1666D5FAE3C3}.Debug|Win32.Build.0 = Release|Win32 - {4CD9F188-97C9-4C1F-AC7B-1666D5FAE3C3}.Debug|x64.ActiveCfg = Debug|x64 - {4CD9F188-97C9-4C1F-AC7B-1666D5FAE3C3}.Debug|x64.Build.0 = Debug|x64 - {4CD9F188-97C9-4C1F-AC7B-1666D5FAE3C3}.Release|Win32.ActiveCfg = Release|Win32 - {4CD9F188-97C9-4C1F-AC7B-1666D5FAE3C3}.Release|Win32.Build.0 = Release|Win32 - {4CD9F188-97C9-4C1F-AC7B-1666D5FAE3C3}.Release|x64.ActiveCfg = Release|x64 - {4CD9F188-97C9-4C1F-AC7B-1666D5FAE3C3}.Release|x64.Build.0 = Release|x64 - {D6F15615-2C92-4CFE-B548-9506ECFD73AB}.Debug|Win32.ActiveCfg = Release|Win32 - {D6F15615-2C92-4CFE-B548-9506ECFD73AB}.Debug|Win32.Build.0 = Release|Win32 - {D6F15615-2C92-4CFE-B548-9506ECFD73AB}.Debug|x64.ActiveCfg = Debug|x64 - {D6F15615-2C92-4CFE-B548-9506ECFD73AB}.Debug|x64.Build.0 = Debug|x64 - {D6F15615-2C92-4CFE-B548-9506ECFD73AB}.Release|Win32.ActiveCfg = Release|Win32 - {D6F15615-2C92-4CFE-B548-9506ECFD73AB}.Release|Win32.Build.0 = Release|Win32 - {D6F15615-2C92-4CFE-B548-9506ECFD73AB}.Release|x64.ActiveCfg = Release|x64 - {D6F15615-2C92-4CFE-B548-9506ECFD73AB}.Release|x64.Build.0 = Release|x64 - {7EE9A9E4-78AE-4B6D-8F7C-DADB9FE90E7A}.Debug|Win32.ActiveCfg = Release|Win32 - {7EE9A9E4-78AE-4B6D-8F7C-DADB9FE90E7A}.Debug|Win32.Build.0 = Release|Win32 - {7EE9A9E4-78AE-4B6D-8F7C-DADB9FE90E7A}.Debug|x64.ActiveCfg = Debug|x64 - {7EE9A9E4-78AE-4B6D-8F7C-DADB9FE90E7A}.Debug|x64.Build.0 = Debug|x64 - {7EE9A9E4-78AE-4B6D-8F7C-DADB9FE90E7A}.Release|Win32.ActiveCfg = Release|Win32 - {7EE9A9E4-78AE-4B6D-8F7C-DADB9FE90E7A}.Release|Win32.Build.0 = Release|Win32 - {7EE9A9E4-78AE-4B6D-8F7C-DADB9FE90E7A}.Release|x64.ActiveCfg = Release|x64 - {7EE9A9E4-78AE-4B6D-8F7C-DADB9FE90E7A}.Release|x64.Build.0 = Release|x64 - {37D0C9C1-31C0-467F-9310-DAF494377E95}.Debug|Win32.ActiveCfg = Release|Win32 - {37D0C9C1-31C0-467F-9310-DAF494377E95}.Debug|Win32.Build.0 = Release|Win32 - {37D0C9C1-31C0-467F-9310-DAF494377E95}.Debug|x64.ActiveCfg = Debug|x64 - {37D0C9C1-31C0-467F-9310-DAF494377E95}.Debug|x64.Build.0 = Debug|x64 - {37D0C9C1-31C0-467F-9310-DAF494377E95}.Release|Win32.ActiveCfg = Release|Win32 - {37D0C9C1-31C0-467F-9310-DAF494377E95}.Release|Win32.Build.0 = Release|Win32 - {37D0C9C1-31C0-467F-9310-DAF494377E95}.Release|x64.ActiveCfg = Release|x64 - {37D0C9C1-31C0-467F-9310-DAF494377E95}.Release|x64.Build.0 = Release|x64 - {700AD2FC-90D2-480C-B059-15DCA0F8D894}.Debug|Win32.ActiveCfg = Release|Win32 - {700AD2FC-90D2-480C-B059-15DCA0F8D894}.Debug|Win32.Build.0 = Release|Win32 - {700AD2FC-90D2-480C-B059-15DCA0F8D894}.Debug|x64.ActiveCfg = Debug|x64 - {700AD2FC-90D2-480C-B059-15DCA0F8D894}.Debug|x64.Build.0 = Debug|x64 - {700AD2FC-90D2-480C-B059-15DCA0F8D894}.Release|Win32.ActiveCfg = Release|Win32 - {700AD2FC-90D2-480C-B059-15DCA0F8D894}.Release|Win32.Build.0 = Release|Win32 - {700AD2FC-90D2-480C-B059-15DCA0F8D894}.Release|x64.ActiveCfg = Release|x64 - {700AD2FC-90D2-480C-B059-15DCA0F8D894}.Release|x64.Build.0 = Release|x64 - {3CBAF461-838E-4225-A24C-21BD8E4FE551}.Debug|Win32.ActiveCfg = Release|Win32 - {3CBAF461-838E-4225-A24C-21BD8E4FE551}.Debug|Win32.Build.0 = Release|Win32 - {3CBAF461-838E-4225-A24C-21BD8E4FE551}.Debug|x64.ActiveCfg = Debug|x64 - {3CBAF461-838E-4225-A24C-21BD8E4FE551}.Debug|x64.Build.0 = Debug|x64 - {3CBAF461-838E-4225-A24C-21BD8E4FE551}.Release|Win32.ActiveCfg = Release|Win32 - {3CBAF461-838E-4225-A24C-21BD8E4FE551}.Release|Win32.Build.0 = Release|Win32 - {3CBAF461-838E-4225-A24C-21BD8E4FE551}.Release|x64.ActiveCfg = Release|x64 - {3CBAF461-838E-4225-A24C-21BD8E4FE551}.Release|x64.Build.0 = Release|x64 - {1491287C-D235-4BE7-A534-33055C88E59C}.Debug|Win32.ActiveCfg = Release|Win32 - {1491287C-D235-4BE7-A534-33055C88E59C}.Debug|Win32.Build.0 = Release|Win32 - {1491287C-D235-4BE7-A534-33055C88E59C}.Debug|x64.ActiveCfg = Debug|x64 - {1491287C-D235-4BE7-A534-33055C88E59C}.Debug|x64.Build.0 = Debug|x64 - {1491287C-D235-4BE7-A534-33055C88E59C}.Release|Win32.ActiveCfg = Release|Win32 - {1491287C-D235-4BE7-A534-33055C88E59C}.Release|Win32.Build.0 = Release|Win32 - {1491287C-D235-4BE7-A534-33055C88E59C}.Release|x64.ActiveCfg = Release|x64 - {1491287C-D235-4BE7-A534-33055C88E59C}.Release|x64.Build.0 = Release|x64 - {D58946D1-C6C3-4AE2-86C5-9C53B11E027E}.Debug|Win32.ActiveCfg = Release|Win32 - {D58946D1-C6C3-4AE2-86C5-9C53B11E027E}.Debug|Win32.Build.0 = Release|Win32 - {D58946D1-C6C3-4AE2-86C5-9C53B11E027E}.Debug|x64.ActiveCfg = Debug|x64 - {D58946D1-C6C3-4AE2-86C5-9C53B11E027E}.Debug|x64.Build.0 = Debug|x64 - {D58946D1-C6C3-4AE2-86C5-9C53B11E027E}.Release|Win32.ActiveCfg = Release|Win32 - {D58946D1-C6C3-4AE2-86C5-9C53B11E027E}.Release|Win32.Build.0 = Release|Win32 - {D58946D1-C6C3-4AE2-86C5-9C53B11E027E}.Release|x64.ActiveCfg = Release|x64 - {D58946D1-C6C3-4AE2-86C5-9C53B11E027E}.Release|x64.Build.0 = Release|x64 - {C0BF9611-7DFA-4782-99FA-661C29977CD1}.Debug|Win32.ActiveCfg = Release|Win32 - {C0BF9611-7DFA-4782-99FA-661C29977CD1}.Debug|Win32.Build.0 = Release|Win32 - {C0BF9611-7DFA-4782-99FA-661C29977CD1}.Debug|x64.ActiveCfg = Debug|x64 - {C0BF9611-7DFA-4782-99FA-661C29977CD1}.Debug|x64.Build.0 = Debug|x64 - {C0BF9611-7DFA-4782-99FA-661C29977CD1}.Release|Win32.ActiveCfg = Release|Win32 - {C0BF9611-7DFA-4782-99FA-661C29977CD1}.Release|Win32.Build.0 = Release|Win32 - {C0BF9611-7DFA-4782-99FA-661C29977CD1}.Release|x64.ActiveCfg = Release|x64 - {C0BF9611-7DFA-4782-99FA-661C29977CD1}.Release|x64.Build.0 = Release|x64 - {BDB9FBC2-8DB1-46F2-AF29-96D975120A76}.Debug|Win32.ActiveCfg = Release|Win32 - {BDB9FBC2-8DB1-46F2-AF29-96D975120A76}.Debug|Win32.Build.0 = Release|Win32 - {BDB9FBC2-8DB1-46F2-AF29-96D975120A76}.Debug|x64.ActiveCfg = Debug|x64 - {BDB9FBC2-8DB1-46F2-AF29-96D975120A76}.Debug|x64.Build.0 = Debug|x64 - {BDB9FBC2-8DB1-46F2-AF29-96D975120A76}.Release|Win32.ActiveCfg = Release|Win32 - {BDB9FBC2-8DB1-46F2-AF29-96D975120A76}.Release|Win32.Build.0 = Release|Win32 - {BDB9FBC2-8DB1-46F2-AF29-96D975120A76}.Release|x64.ActiveCfg = Release|x64 - {BDB9FBC2-8DB1-46F2-AF29-96D975120A76}.Release|x64.Build.0 = Release|x64 - {870C3E28-A769-4F95-B6DA-7CD45CDB780C}.Debug|Win32.ActiveCfg = Release|Win32 - {870C3E28-A769-4F95-B6DA-7CD45CDB780C}.Debug|Win32.Build.0 = Release|Win32 - {870C3E28-A769-4F95-B6DA-7CD45CDB780C}.Debug|x64.ActiveCfg = Debug|x64 - {870C3E28-A769-4F95-B6DA-7CD45CDB780C}.Debug|x64.Build.0 = Debug|x64 - {870C3E28-A769-4F95-B6DA-7CD45CDB780C}.Release|Win32.ActiveCfg = Release|Win32 - {870C3E28-A769-4F95-B6DA-7CD45CDB780C}.Release|Win32.Build.0 = Release|Win32 - {870C3E28-A769-4F95-B6DA-7CD45CDB780C}.Release|x64.ActiveCfg = Release|x64 - {870C3E28-A769-4F95-B6DA-7CD45CDB780C}.Release|x64.Build.0 = Release|x64 - {4C874FC5-474A-4B12-8A56-61A53CC055DC}.Debug|Win32.ActiveCfg = Release|Win32 - {4C874FC5-474A-4B12-8A56-61A53CC055DC}.Debug|Win32.Build.0 = Release|Win32 - {4C874FC5-474A-4B12-8A56-61A53CC055DC}.Debug|x64.ActiveCfg = Debug|x64 - {4C874FC5-474A-4B12-8A56-61A53CC055DC}.Debug|x64.Build.0 = Debug|x64 - {4C874FC5-474A-4B12-8A56-61A53CC055DC}.Release|Win32.ActiveCfg = Release|Win32 - {4C874FC5-474A-4B12-8A56-61A53CC055DC}.Release|Win32.Build.0 = Release|Win32 - {4C874FC5-474A-4B12-8A56-61A53CC055DC}.Release|x64.ActiveCfg = Release|x64 - {7E906AB3-8ED0-4462-8E31-0E7D5C291806}.Debug|Win32.ActiveCfg = Release|Win32 - {7E906AB3-8ED0-4462-8E31-0E7D5C291806}.Debug|x64.ActiveCfg = Debug|x64 - {7E906AB3-8ED0-4462-8E31-0E7D5C291806}.Release|Win32.ActiveCfg = Release|Win32 - {7E906AB3-8ED0-4462-8E31-0E7D5C291806}.Release|x64.ActiveCfg = Release|x64 - {2571DAA6-742A-49F1-875C-8E3EF9F52EF9}.Debug|Win32.ActiveCfg = Release|Win32 - {2571DAA6-742A-49F1-875C-8E3EF9F52EF9}.Debug|Win32.Build.0 = Release|Win32 - {2571DAA6-742A-49F1-875C-8E3EF9F52EF9}.Debug|x64.ActiveCfg = Debug|x64 - {2571DAA6-742A-49F1-875C-8E3EF9F52EF9}.Debug|x64.Build.0 = Debug|x64 - {2571DAA6-742A-49F1-875C-8E3EF9F52EF9}.Release|Win32.ActiveCfg = Release|Win32 - {2571DAA6-742A-49F1-875C-8E3EF9F52EF9}.Release|Win32.Build.0 = Release|Win32 - {2571DAA6-742A-49F1-875C-8E3EF9F52EF9}.Release|x64.ActiveCfg = Release|x64 - {2571DAA6-742A-49F1-875C-8E3EF9F52EF9}.Release|x64.Build.0 = Release|x64 - {1B4C4DA3-65F5-4D17-B082-BD2F6CAAD6C0}.Debug|Win32.ActiveCfg = Release|Win32 - {1B4C4DA3-65F5-4D17-B082-BD2F6CAAD6C0}.Debug|Win32.Build.0 = Release|Win32 - {1B4C4DA3-65F5-4D17-B082-BD2F6CAAD6C0}.Debug|x64.ActiveCfg = Debug|x64 - {1B4C4DA3-65F5-4D17-B082-BD2F6CAAD6C0}.Debug|x64.Build.0 = Debug|x64 - {1B4C4DA3-65F5-4D17-B082-BD2F6CAAD6C0}.Release|Win32.ActiveCfg = Release|Win32 - {1B4C4DA3-65F5-4D17-B082-BD2F6CAAD6C0}.Release|Win32.Build.0 = Release|Win32 - {1B4C4DA3-65F5-4D17-B082-BD2F6CAAD6C0}.Release|x64.ActiveCfg = Release|x64 - {1B4C4DA3-65F5-4D17-B082-BD2F6CAAD6C0}.Release|x64.Build.0 = Release|x64 - {08D23250-240C-4025-8649-EC441171A51D}.Debug|Win32.ActiveCfg = Release|Win32 - {08D23250-240C-4025-8649-EC441171A51D}.Debug|Win32.Build.0 = Release|Win32 - {08D23250-240C-4025-8649-EC441171A51D}.Debug|x64.ActiveCfg = Debug|x64 - {08D23250-240C-4025-8649-EC441171A51D}.Debug|x64.Build.0 = Debug|x64 - {08D23250-240C-4025-8649-EC441171A51D}.Release|Win32.ActiveCfg = Release|Win32 - {08D23250-240C-4025-8649-EC441171A51D}.Release|Win32.Build.0 = Release|Win32 - {08D23250-240C-4025-8649-EC441171A51D}.Release|x64.ActiveCfg = Release|x64 - {08D23250-240C-4025-8649-EC441171A51D}.Release|x64.Build.0 = Release|x64 - {23F9A2ED-D02F-410B-9004-8CC9E642EE01}.Debug|Win32.ActiveCfg = Release|Win32 - {23F9A2ED-D02F-410B-9004-8CC9E642EE01}.Debug|Win32.Build.0 = Release|Win32 - {23F9A2ED-D02F-410B-9004-8CC9E642EE01}.Debug|x64.ActiveCfg = Debug|x64 - {23F9A2ED-D02F-410B-9004-8CC9E642EE01}.Debug|x64.Build.0 = Debug|x64 - {23F9A2ED-D02F-410B-9004-8CC9E642EE01}.Release|Win32.ActiveCfg = Release|Win32 - {23F9A2ED-D02F-410B-9004-8CC9E642EE01}.Release|Win32.Build.0 = Release|Win32 - {23F9A2ED-D02F-410B-9004-8CC9E642EE01}.Release|x64.ActiveCfg = Release|x64 - {23F9A2ED-D02F-410B-9004-8CC9E642EE01}.Release|x64.Build.0 = Release|x64 - {2640C5A4-7B5E-4159-AF46-8D012582A70A}.Debug|Win32.ActiveCfg = Release|Win32 - {2640C5A4-7B5E-4159-AF46-8D012582A70A}.Debug|Win32.Build.0 = Release|Win32 - {2640C5A4-7B5E-4159-AF46-8D012582A70A}.Debug|x64.ActiveCfg = Debug|x64 - {2640C5A4-7B5E-4159-AF46-8D012582A70A}.Debug|x64.Build.0 = Debug|x64 - {2640C5A4-7B5E-4159-AF46-8D012582A70A}.Release|Win32.ActiveCfg = Release|Win32 - {2640C5A4-7B5E-4159-AF46-8D012582A70A}.Release|Win32.Build.0 = Release|Win32 - {2640C5A4-7B5E-4159-AF46-8D012582A70A}.Release|x64.ActiveCfg = Release|x64 - {2640C5A4-7B5E-4159-AF46-8D012582A70A}.Release|x64.Build.0 = Release|x64 - {F756059A-654F-40ED-8BA0-F478B7CBF1CF}.Debug|Win32.ActiveCfg = Release|Win32 - {F756059A-654F-40ED-8BA0-F478B7CBF1CF}.Debug|Win32.Build.0 = Release|Win32 - {F756059A-654F-40ED-8BA0-F478B7CBF1CF}.Debug|x64.ActiveCfg = Debug|x64 - {F756059A-654F-40ED-8BA0-F478B7CBF1CF}.Debug|x64.Build.0 = Debug|x64 - {F756059A-654F-40ED-8BA0-F478B7CBF1CF}.Release|Win32.ActiveCfg = Release|Win32 - {F756059A-654F-40ED-8BA0-F478B7CBF1CF}.Release|Win32.Build.0 = Release|Win32 - {F756059A-654F-40ED-8BA0-F478B7CBF1CF}.Release|x64.ActiveCfg = Release|x64 - {F756059A-654F-40ED-8BA0-F478B7CBF1CF}.Release|x64.Build.0 = Release|x64 - {D136A855-85D8-4D29-99C9-AE7D5D6EA738}.Debug|Win32.ActiveCfg = Release|Win32 - {D136A855-85D8-4D29-99C9-AE7D5D6EA738}.Debug|Win32.Build.0 = Release|Win32 - {D136A855-85D8-4D29-99C9-AE7D5D6EA738}.Debug|x64.ActiveCfg = Debug|x64 - {D136A855-85D8-4D29-99C9-AE7D5D6EA738}.Debug|x64.Build.0 = Debug|x64 - {D136A855-85D8-4D29-99C9-AE7D5D6EA738}.Release|Win32.ActiveCfg = Release|Win32 - {D136A855-85D8-4D29-99C9-AE7D5D6EA738}.Release|Win32.Build.0 = Release|Win32 - {D136A855-85D8-4D29-99C9-AE7D5D6EA738}.Release|x64.ActiveCfg = Release|x64 - {D136A855-85D8-4D29-99C9-AE7D5D6EA738}.Release|x64.Build.0 = Release|x64 - {B2D73C70-66F2-4BB8-92A4-111C44DAA3DB}.Debug|Win32.ActiveCfg = Release|Win32 - {B2D73C70-66F2-4BB8-92A4-111C44DAA3DB}.Debug|Win32.Build.0 = Release|Win32 - {B2D73C70-66F2-4BB8-92A4-111C44DAA3DB}.Debug|x64.ActiveCfg = Debug|x64 - {B2D73C70-66F2-4BB8-92A4-111C44DAA3DB}.Debug|x64.Build.0 = Debug|x64 - {B2D73C70-66F2-4BB8-92A4-111C44DAA3DB}.Release|Win32.ActiveCfg = Release|Win32 - {B2D73C70-66F2-4BB8-92A4-111C44DAA3DB}.Release|Win32.Build.0 = Release|Win32 - {B2D73C70-66F2-4BB8-92A4-111C44DAA3DB}.Release|x64.ActiveCfg = Release|x64 - {B2D73C70-66F2-4BB8-92A4-111C44DAA3DB}.Release|x64.Build.0 = Release|x64 - {8594FBDD-2938-49E0-AF5B-F524ABEE5C0F}.Debug|Win32.ActiveCfg = Release|Win32 - {8594FBDD-2938-49E0-AF5B-F524ABEE5C0F}.Debug|Win32.Build.0 = Release|Win32 - {8594FBDD-2938-49E0-AF5B-F524ABEE5C0F}.Debug|x64.ActiveCfg = Debug|x64 - {8594FBDD-2938-49E0-AF5B-F524ABEE5C0F}.Debug|x64.Build.0 = Debug|x64 - {8594FBDD-2938-49E0-AF5B-F524ABEE5C0F}.Release|Win32.ActiveCfg = Release|Win32 - {8594FBDD-2938-49E0-AF5B-F524ABEE5C0F}.Release|Win32.Build.0 = Release|Win32 - {8594FBDD-2938-49E0-AF5B-F524ABEE5C0F}.Release|x64.ActiveCfg = Release|x64 - {8594FBDD-2938-49E0-AF5B-F524ABEE5C0F}.Release|x64.Build.0 = Release|x64 - {2C333947-5663-4717-BB41-39804C4EDBCA}.Debug|Win32.ActiveCfg = Release|Win32 - {2C333947-5663-4717-BB41-39804C4EDBCA}.Debug|Win32.Build.0 = Release|Win32 - {2C333947-5663-4717-BB41-39804C4EDBCA}.Debug|x64.ActiveCfg = Debug|x64 - {2C333947-5663-4717-BB41-39804C4EDBCA}.Debug|x64.Build.0 = Debug|x64 - {2C333947-5663-4717-BB41-39804C4EDBCA}.Release|Win32.ActiveCfg = Release|Win32 - {2C333947-5663-4717-BB41-39804C4EDBCA}.Release|Win32.Build.0 = Release|Win32 - {2C333947-5663-4717-BB41-39804C4EDBCA}.Release|x64.ActiveCfg = Release|x64 - {2C333947-5663-4717-BB41-39804C4EDBCA}.Release|x64.Build.0 = Release|x64 - {19B05026-7732-4FEC-A85C-8C6BC339D761}.Debug|Win32.ActiveCfg = Release|Win32 - {19B05026-7732-4FEC-A85C-8C6BC339D761}.Debug|Win32.Build.0 = Release|Win32 - {19B05026-7732-4FEC-A85C-8C6BC339D761}.Debug|x64.ActiveCfg = Debug|x64 - {19B05026-7732-4FEC-A85C-8C6BC339D761}.Debug|x64.Build.0 = Debug|x64 - {19B05026-7732-4FEC-A85C-8C6BC339D761}.Release|Win32.ActiveCfg = Release|Win32 - {19B05026-7732-4FEC-A85C-8C6BC339D761}.Release|Win32.Build.0 = Release|Win32 - {19B05026-7732-4FEC-A85C-8C6BC339D761}.Release|x64.ActiveCfg = Release|x64 - {19B05026-7732-4FEC-A85C-8C6BC339D761}.Release|x64.Build.0 = Release|x64 - {E3CF6E9E-2DA5-4EB6-9529-95BF2761A9CC}.Debug|Win32.ActiveCfg = Release|Win32 - {E3CF6E9E-2DA5-4EB6-9529-95BF2761A9CC}.Debug|Win32.Build.0 = Release|Win32 - {E3CF6E9E-2DA5-4EB6-9529-95BF2761A9CC}.Debug|x64.ActiveCfg = Debug|x64 - {E3CF6E9E-2DA5-4EB6-9529-95BF2761A9CC}.Debug|x64.Build.0 = Debug|x64 - {E3CF6E9E-2DA5-4EB6-9529-95BF2761A9CC}.Release|Win32.ActiveCfg = Release|Win32 - {E3CF6E9E-2DA5-4EB6-9529-95BF2761A9CC}.Release|Win32.Build.0 = Release|Win32 - {E3CF6E9E-2DA5-4EB6-9529-95BF2761A9CC}.Release|x64.ActiveCfg = Release|x64 - {E3CF6E9E-2DA5-4EB6-9529-95BF2761A9CC}.Release|x64.Build.0 = Release|x64 - {683BBC0B-FE1D-4C1C-867A-C1EF384E9848}.Debug|Win32.ActiveCfg = Release|Win32 - {683BBC0B-FE1D-4C1C-867A-C1EF384E9848}.Debug|Win32.Build.0 = Release|Win32 - {683BBC0B-FE1D-4C1C-867A-C1EF384E9848}.Debug|x64.ActiveCfg = Debug|x64 - {683BBC0B-FE1D-4C1C-867A-C1EF384E9848}.Debug|x64.Build.0 = Debug|x64 - {683BBC0B-FE1D-4C1C-867A-C1EF384E9848}.Release|Win32.ActiveCfg = Release|Win32 - {683BBC0B-FE1D-4C1C-867A-C1EF384E9848}.Release|Win32.Build.0 = Release|Win32 - {683BBC0B-FE1D-4C1C-867A-C1EF384E9848}.Release|x64.ActiveCfg = Release|x64 - {683BBC0B-FE1D-4C1C-867A-C1EF384E9848}.Release|x64.Build.0 = Release|x64 - {8A319852-91A7-4339-9C03-F4D355614454}.Debug|Win32.ActiveCfg = Release|Win32 - {8A319852-91A7-4339-9C03-F4D355614454}.Debug|x64.ActiveCfg = Debug|x64 - {8A319852-91A7-4339-9C03-F4D355614454}.Release|Win32.ActiveCfg = Release|Win32 - {8A319852-91A7-4339-9C03-F4D355614454}.Release|x64.ActiveCfg = Release|x64 - {8A319852-91A7-4339-9C03-F4D355614454}.Release|x64.Build.0 = Release|x64 - {2E5B889E-72C7-45F8-9611-9687A706D327}.Debug|Win32.ActiveCfg = Release|Win32 - {2E5B889E-72C7-45F8-9611-9687A706D327}.Debug|Win32.Build.0 = Release|Win32 - {2E5B889E-72C7-45F8-9611-9687A706D327}.Debug|x64.ActiveCfg = Debug|x64 - {2E5B889E-72C7-45F8-9611-9687A706D327}.Debug|x64.Build.0 = Debug|x64 - {2E5B889E-72C7-45F8-9611-9687A706D327}.Release|Win32.ActiveCfg = Release|Win32 - {2E5B889E-72C7-45F8-9611-9687A706D327}.Release|Win32.Build.0 = Release|Win32 - {2E5B889E-72C7-45F8-9611-9687A706D327}.Release|x64.ActiveCfg = Release|x64 - {2E5B889E-72C7-45F8-9611-9687A706D327}.Release|x64.Build.0 = Release|x64 - {ECF3BF91-AE61-42AC-B3F2-FBCE55589B0C}.Debug|Win32.ActiveCfg = Release|Win32 - {ECF3BF91-AE61-42AC-B3F2-FBCE55589B0C}.Debug|Win32.Build.0 = Release|Win32 - {ECF3BF91-AE61-42AC-B3F2-FBCE55589B0C}.Debug|x64.ActiveCfg = Debug|x64 - {ECF3BF91-AE61-42AC-B3F2-FBCE55589B0C}.Debug|x64.Build.0 = Debug|x64 - {ECF3BF91-AE61-42AC-B3F2-FBCE55589B0C}.Release|Win32.ActiveCfg = Release|Win32 - {ECF3BF91-AE61-42AC-B3F2-FBCE55589B0C}.Release|Win32.Build.0 = Release|Win32 - {ECF3BF91-AE61-42AC-B3F2-FBCE55589B0C}.Release|x64.ActiveCfg = Release|x64 - {ECF3BF91-AE61-42AC-B3F2-FBCE55589B0C}.Release|x64.Build.0 = Release|x64 - {AAD01C98-3B8F-495F-A070-80A97A9AEAE2}.Debug|Win32.ActiveCfg = Release|Win32 - {AAD01C98-3B8F-495F-A070-80A97A9AEAE2}.Debug|Win32.Build.0 = Release|Win32 - {AAD01C98-3B8F-495F-A070-80A97A9AEAE2}.Debug|x64.ActiveCfg = Debug|x64 - {AAD01C98-3B8F-495F-A070-80A97A9AEAE2}.Debug|x64.Build.0 = Debug|x64 - {AAD01C98-3B8F-495F-A070-80A97A9AEAE2}.Release|Win32.ActiveCfg = Release|Win32 - {AAD01C98-3B8F-495F-A070-80A97A9AEAE2}.Release|Win32.Build.0 = Release|Win32 - {AAD01C98-3B8F-495F-A070-80A97A9AEAE2}.Release|x64.ActiveCfg = Release|x64 - {AAD01C98-3B8F-495F-A070-80A97A9AEAE2}.Release|x64.Build.0 = Release|x64 - {94F286EB-0016-4205-8B39-25EDB17C9E0C}.Debug|Win32.ActiveCfg = Release|Win32 - {94F286EB-0016-4205-8B39-25EDB17C9E0C}.Debug|Win32.Build.0 = Release|Win32 - {94F286EB-0016-4205-8B39-25EDB17C9E0C}.Debug|x64.ActiveCfg = Debug|x64 - {94F286EB-0016-4205-8B39-25EDB17C9E0C}.Debug|x64.Build.0 = Debug|x64 - {94F286EB-0016-4205-8B39-25EDB17C9E0C}.Release|Win32.ActiveCfg = Release|Win32 - {94F286EB-0016-4205-8B39-25EDB17C9E0C}.Release|Win32.Build.0 = Release|Win32 - {94F286EB-0016-4205-8B39-25EDB17C9E0C}.Release|x64.ActiveCfg = Release|x64 - {94F286EB-0016-4205-8B39-25EDB17C9E0C}.Release|x64.Build.0 = Release|x64 - {937982FD-CB54-40B7-9A95-638F97AC6C81}.Debug|Win32.ActiveCfg = Release|Win32 - {937982FD-CB54-40B7-9A95-638F97AC6C81}.Debug|x64.ActiveCfg = Debug|x64 - {937982FD-CB54-40B7-9A95-638F97AC6C81}.Release|Win32.ActiveCfg = Release|Win32 - {937982FD-CB54-40B7-9A95-638F97AC6C81}.Release|x64.ActiveCfg = Release|x64 - {3D404CC8-162C-46D5-8910-AB54DE545FC5}.Debug|Win32.ActiveCfg = Release|Win32 - {3D404CC8-162C-46D5-8910-AB54DE545FC5}.Debug|Win32.Build.0 = Release|Win32 - {3D404CC8-162C-46D5-8910-AB54DE545FC5}.Debug|x64.ActiveCfg = Debug|x64 - {3D404CC8-162C-46D5-8910-AB54DE545FC5}.Debug|x64.Build.0 = Debug|x64 - {3D404CC8-162C-46D5-8910-AB54DE545FC5}.Release|Win32.ActiveCfg = Release|Win32 - {3D404CC8-162C-46D5-8910-AB54DE545FC5}.Release|Win32.Build.0 = Release|Win32 - {3D404CC8-162C-46D5-8910-AB54DE545FC5}.Release|x64.ActiveCfg = Release|x64 - {3D404CC8-162C-46D5-8910-AB54DE545FC5}.Release|x64.Build.0 = Release|x64 - {514E32B7-43FA-4CC8-A87C-540F4E0AF768}.Debug|Win32.ActiveCfg = Release|Win32 - {514E32B7-43FA-4CC8-A87C-540F4E0AF768}.Debug|Win32.Build.0 = Release|Win32 - {514E32B7-43FA-4CC8-A87C-540F4E0AF768}.Debug|x64.ActiveCfg = Debug|x64 - {514E32B7-43FA-4CC8-A87C-540F4E0AF768}.Debug|x64.Build.0 = Debug|x64 - {514E32B7-43FA-4CC8-A87C-540F4E0AF768}.Release|Win32.ActiveCfg = Release|Win32 - {514E32B7-43FA-4CC8-A87C-540F4E0AF768}.Release|Win32.Build.0 = Release|Win32 - {514E32B7-43FA-4CC8-A87C-540F4E0AF768}.Release|x64.ActiveCfg = Release|x64 - {514E32B7-43FA-4CC8-A87C-540F4E0AF768}.Release|x64.Build.0 = Release|x64 - {34BA4CE1-613B-42E0-8399-761DD96FD595}.Debug|Win32.ActiveCfg = Release|Win32 - {34BA4CE1-613B-42E0-8399-761DD96FD595}.Debug|Win32.Build.0 = Release|Win32 - {34BA4CE1-613B-42E0-8399-761DD96FD595}.Debug|x64.ActiveCfg = Debug|x64 - {34BA4CE1-613B-42E0-8399-761DD96FD595}.Debug|x64.Build.0 = Debug|x64 - {34BA4CE1-613B-42E0-8399-761DD96FD595}.Release|Win32.ActiveCfg = Release|Win32 - {34BA4CE1-613B-42E0-8399-761DD96FD595}.Release|Win32.Build.0 = Release|Win32 - {34BA4CE1-613B-42E0-8399-761DD96FD595}.Release|x64.ActiveCfg = Release|x64 - {34BA4CE1-613B-42E0-8399-761DD96FD595}.Release|x64.Build.0 = Release|x64 - {C7621A8E-AB31-4D98-B995-90A99D2D7B45}.Debug|Win32.ActiveCfg = Release|Win32 - {C7621A8E-AB31-4D98-B995-90A99D2D7B45}.Debug|Win32.Build.0 = Release|Win32 - {C7621A8E-AB31-4D98-B995-90A99D2D7B45}.Debug|x64.ActiveCfg = Debug|x64 - {C7621A8E-AB31-4D98-B995-90A99D2D7B45}.Debug|x64.Build.0 = Debug|x64 - {C7621A8E-AB31-4D98-B995-90A99D2D7B45}.Release|Win32.ActiveCfg = Release|Win32 - {C7621A8E-AB31-4D98-B995-90A99D2D7B45}.Release|Win32.Build.0 = Release|Win32 - {C7621A8E-AB31-4D98-B995-90A99D2D7B45}.Release|x64.ActiveCfg = Release|x64 - {C7621A8E-AB31-4D98-B995-90A99D2D7B45}.Release|x64.Build.0 = Release|x64 - {B29EA00F-7420-43C0-B7BB-DF1F8AEF1C94}.Debug|Win32.ActiveCfg = Release|Win32 - {B29EA00F-7420-43C0-B7BB-DF1F8AEF1C94}.Debug|Win32.Build.0 = Release|Win32 - {B29EA00F-7420-43C0-B7BB-DF1F8AEF1C94}.Debug|x64.ActiveCfg = Debug|x64 - {B29EA00F-7420-43C0-B7BB-DF1F8AEF1C94}.Debug|x64.Build.0 = Debug|x64 - {B29EA00F-7420-43C0-B7BB-DF1F8AEF1C94}.Release|Win32.ActiveCfg = Release|Win32 - {B29EA00F-7420-43C0-B7BB-DF1F8AEF1C94}.Release|Win32.Build.0 = Release|Win32 - {B29EA00F-7420-43C0-B7BB-DF1F8AEF1C94}.Release|x64.ActiveCfg = Release|x64 - {B29EA00F-7420-43C0-B7BB-DF1F8AEF1C94}.Release|x64.Build.0 = Release|x64 - {649B6A2C-A3E4-48B6-AF27-D29532356A6B}.Debug|Win32.ActiveCfg = Release|Win32 - {649B6A2C-A3E4-48B6-AF27-D29532356A6B}.Debug|Win32.Build.0 = Release|Win32 - {649B6A2C-A3E4-48B6-AF27-D29532356A6B}.Debug|x64.ActiveCfg = Debug|x64 - {649B6A2C-A3E4-48B6-AF27-D29532356A6B}.Debug|x64.Build.0 = Debug|x64 - {649B6A2C-A3E4-48B6-AF27-D29532356A6B}.Release|Win32.ActiveCfg = Release|Win32 - {649B6A2C-A3E4-48B6-AF27-D29532356A6B}.Release|Win32.Build.0 = Release|Win32 - {649B6A2C-A3E4-48B6-AF27-D29532356A6B}.Release|x64.ActiveCfg = Release|x64 - {649B6A2C-A3E4-48B6-AF27-D29532356A6B}.Release|x64.Build.0 = Release|x64 - {928D4E54-26B5-4B24-A1C4-4775BC0BE76C}.Debug|Win32.ActiveCfg = Release|Win32 - {928D4E54-26B5-4B24-A1C4-4775BC0BE76C}.Debug|Win32.Build.0 = Release|Win32 - {928D4E54-26B5-4B24-A1C4-4775BC0BE76C}.Debug|x64.ActiveCfg = Debug|x64 - {928D4E54-26B5-4B24-A1C4-4775BC0BE76C}.Debug|x64.Build.0 = Debug|x64 - {928D4E54-26B5-4B24-A1C4-4775BC0BE76C}.Release|Win32.ActiveCfg = Release|Win32 - {928D4E54-26B5-4B24-A1C4-4775BC0BE76C}.Release|Win32.Build.0 = Release|Win32 - {928D4E54-26B5-4B24-A1C4-4775BC0BE76C}.Release|x64.ActiveCfg = Release|x64 - {928D4E54-26B5-4B24-A1C4-4775BC0BE76C}.Release|x64.Build.0 = Release|x64 - {E8AE8FF7-54BB-43EC-ACFD-45E70B73A2C9}.Debug|Win32.ActiveCfg = Release|Win32 - {E8AE8FF7-54BB-43EC-ACFD-45E70B73A2C9}.Debug|Win32.Build.0 = Release|Win32 - {E8AE8FF7-54BB-43EC-ACFD-45E70B73A2C9}.Debug|x64.ActiveCfg = Debug|x64 - {E8AE8FF7-54BB-43EC-ACFD-45E70B73A2C9}.Debug|x64.Build.0 = Debug|x64 - {E8AE8FF7-54BB-43EC-ACFD-45E70B73A2C9}.Release|Win32.ActiveCfg = Release|Win32 - {E8AE8FF7-54BB-43EC-ACFD-45E70B73A2C9}.Release|Win32.Build.0 = Release|Win32 - {E8AE8FF7-54BB-43EC-ACFD-45E70B73A2C9}.Release|x64.ActiveCfg = Release|x64 - {E8AE8FF7-54BB-43EC-ACFD-45E70B73A2C9}.Release|x64.Build.0 = Release|x64 - {469D0696-C16C-4EC5-819F-C07E0F384285}.Debug|Win32.ActiveCfg = Release|Win32 - {469D0696-C16C-4EC5-819F-C07E0F384285}.Debug|Win32.Build.0 = Release|Win32 - {469D0696-C16C-4EC5-819F-C07E0F384285}.Debug|x64.ActiveCfg = Debug|x64 - {469D0696-C16C-4EC5-819F-C07E0F384285}.Debug|x64.Build.0 = Debug|x64 - {469D0696-C16C-4EC5-819F-C07E0F384285}.Release|Win32.ActiveCfg = Release|Win32 - {469D0696-C16C-4EC5-819F-C07E0F384285}.Release|Win32.Build.0 = Release|Win32 - {469D0696-C16C-4EC5-819F-C07E0F384285}.Release|x64.ActiveCfg = Release|x64 - {469D0696-C16C-4EC5-819F-C07E0F384285}.Release|x64.Build.0 = Release|x64 - {EEE171FE-9C9D-4552-BF21-2BAA5DAEDFF6}.Debug|Win32.ActiveCfg = Release|Win32 - {EEE171FE-9C9D-4552-BF21-2BAA5DAEDFF6}.Debug|Win32.Build.0 = Release|Win32 - {EEE171FE-9C9D-4552-BF21-2BAA5DAEDFF6}.Debug|x64.ActiveCfg = Debug|x64 - {EEE171FE-9C9D-4552-BF21-2BAA5DAEDFF6}.Debug|x64.Build.0 = Debug|x64 - {EEE171FE-9C9D-4552-BF21-2BAA5DAEDFF6}.Release|Win32.ActiveCfg = Release|Win32 - {EEE171FE-9C9D-4552-BF21-2BAA5DAEDFF6}.Release|Win32.Build.0 = Release|Win32 - {EEE171FE-9C9D-4552-BF21-2BAA5DAEDFF6}.Release|x64.ActiveCfg = Release|x64 - {EEE171FE-9C9D-4552-BF21-2BAA5DAEDFF6}.Release|x64.Build.0 = Release|x64 - {5008C2DB-FA43-4E2A-B03A-C60F43FAAC1C}.Debug|Win32.ActiveCfg = Release|Win32 - {5008C2DB-FA43-4E2A-B03A-C60F43FAAC1C}.Debug|Win32.Build.0 = Release|Win32 - {5008C2DB-FA43-4E2A-B03A-C60F43FAAC1C}.Debug|x64.ActiveCfg = Debug|x64 - {5008C2DB-FA43-4E2A-B03A-C60F43FAAC1C}.Debug|x64.Build.0 = Debug|x64 - {5008C2DB-FA43-4E2A-B03A-C60F43FAAC1C}.Release|Win32.ActiveCfg = Release|Win32 - {5008C2DB-FA43-4E2A-B03A-C60F43FAAC1C}.Release|Win32.Build.0 = Release|Win32 - {5008C2DB-FA43-4E2A-B03A-C60F43FAAC1C}.Release|x64.ActiveCfg = Release|x64 - {5008C2DB-FA43-4E2A-B03A-C60F43FAAC1C}.Release|x64.Build.0 = Release|x64 - {DF6060F0-C235-4E8E-AF43-D3385A506A2F}.Debug|Win32.ActiveCfg = Release|Win32 - {DF6060F0-C235-4E8E-AF43-D3385A506A2F}.Debug|Win32.Build.0 = Release|Win32 - {DF6060F0-C235-4E8E-AF43-D3385A506A2F}.Debug|x64.ActiveCfg = Debug|x64 - {DF6060F0-C235-4E8E-AF43-D3385A506A2F}.Debug|x64.Build.0 = Debug|x64 - {DF6060F0-C235-4E8E-AF43-D3385A506A2F}.Release|Win32.ActiveCfg = Release|Win32 - {DF6060F0-C235-4E8E-AF43-D3385A506A2F}.Release|Win32.Build.0 = Release|Win32 - {DF6060F0-C235-4E8E-AF43-D3385A506A2F}.Release|x64.ActiveCfg = Release|x64 - {DF6060F0-C235-4E8E-AF43-D3385A506A2F}.Release|x64.Build.0 = Release|x64 - {D87A0B24-AA34-41A6-93FC-7033D6BBCB63}.Debug|Win32.ActiveCfg = Release|Win32 - {D87A0B24-AA34-41A6-93FC-7033D6BBCB63}.Debug|Win32.Build.0 = Release|Win32 - {D87A0B24-AA34-41A6-93FC-7033D6BBCB63}.Debug|x64.ActiveCfg = Debug|x64 - {D87A0B24-AA34-41A6-93FC-7033D6BBCB63}.Debug|x64.Build.0 = Debug|x64 - {D87A0B24-AA34-41A6-93FC-7033D6BBCB63}.Release|Win32.ActiveCfg = Release|Win32 - {D87A0B24-AA34-41A6-93FC-7033D6BBCB63}.Release|Win32.Build.0 = Release|Win32 - {D87A0B24-AA34-41A6-93FC-7033D6BBCB63}.Release|x64.ActiveCfg = Release|x64 - {D87A0B24-AA34-41A6-93FC-7033D6BBCB63}.Release|x64.Build.0 = Release|x64 - {BAC3C08E-6E1A-4EA9-9F72-EE0BCC4537A9}.Debug|Win32.ActiveCfg = Release|Win32 - {BAC3C08E-6E1A-4EA9-9F72-EE0BCC4537A9}.Debug|Win32.Build.0 = Release|Win32 - {BAC3C08E-6E1A-4EA9-9F72-EE0BCC4537A9}.Debug|x64.ActiveCfg = Debug|x64 - {BAC3C08E-6E1A-4EA9-9F72-EE0BCC4537A9}.Debug|x64.Build.0 = Debug|x64 - {BAC3C08E-6E1A-4EA9-9F72-EE0BCC4537A9}.Release|Win32.ActiveCfg = Release|Win32 - {BAC3C08E-6E1A-4EA9-9F72-EE0BCC4537A9}.Release|Win32.Build.0 = Release|Win32 - {BAC3C08E-6E1A-4EA9-9F72-EE0BCC4537A9}.Release|x64.ActiveCfg = Release|x64 - {BAC3C08E-6E1A-4EA9-9F72-EE0BCC4537A9}.Release|x64.Build.0 = Release|x64 - {2B29ADC6-0E59-428F-B881-062B6515F398}.Debug|Win32.ActiveCfg = Release|Win32 - {2B29ADC6-0E59-428F-B881-062B6515F398}.Debug|Win32.Build.0 = Release|Win32 - {2B29ADC6-0E59-428F-B881-062B6515F398}.Debug|x64.ActiveCfg = Debug|x64 - {2B29ADC6-0E59-428F-B881-062B6515F398}.Debug|x64.Build.0 = Debug|x64 - {2B29ADC6-0E59-428F-B881-062B6515F398}.Release|Win32.ActiveCfg = Release|Win32 - {2B29ADC6-0E59-428F-B881-062B6515F398}.Release|Win32.Build.0 = Release|Win32 - {2B29ADC6-0E59-428F-B881-062B6515F398}.Release|x64.ActiveCfg = Release|x64 - {2B29ADC6-0E59-428F-B881-062B6515F398}.Release|x64.Build.0 = Release|x64 - {EC965242-1D96-4E0C-9AFB-CD5EB64FDB2E}.Debug|Win32.ActiveCfg = Release|Win32 - {EC965242-1D96-4E0C-9AFB-CD5EB64FDB2E}.Debug|Win32.Build.0 = Release|Win32 - {EC965242-1D96-4E0C-9AFB-CD5EB64FDB2E}.Debug|x64.ActiveCfg = Debug|x64 - {EC965242-1D96-4E0C-9AFB-CD5EB64FDB2E}.Debug|x64.Build.0 = Debug|x64 - {EC965242-1D96-4E0C-9AFB-CD5EB64FDB2E}.Release|Win32.ActiveCfg = Release|Win32 - {EC965242-1D96-4E0C-9AFB-CD5EB64FDB2E}.Release|Win32.Build.0 = Release|Win32 - {EC965242-1D96-4E0C-9AFB-CD5EB64FDB2E}.Release|x64.ActiveCfg = Release|x64 - {EC965242-1D96-4E0C-9AFB-CD5EB64FDB2E}.Release|x64.Build.0 = Release|x64 - {8B3A3FF3-B78C-4D50-8BBB-68F58A62DAEC}.Debug|Win32.ActiveCfg = Release|Win32 - {8B3A3FF3-B78C-4D50-8BBB-68F58A62DAEC}.Debug|Win32.Build.0 = Release|Win32 - {8B3A3FF3-B78C-4D50-8BBB-68F58A62DAEC}.Debug|x64.ActiveCfg = Debug|x64 - {8B3A3FF3-B78C-4D50-8BBB-68F58A62DAEC}.Debug|x64.Build.0 = Debug|x64 - {8B3A3FF3-B78C-4D50-8BBB-68F58A62DAEC}.Release|Win32.ActiveCfg = Release|Win32 - {8B3A3FF3-B78C-4D50-8BBB-68F58A62DAEC}.Release|Win32.Build.0 = Release|Win32 - {8B3A3FF3-B78C-4D50-8BBB-68F58A62DAEC}.Release|x64.ActiveCfg = Release|x64 - {8B3A3FF3-B78C-4D50-8BBB-68F58A62DAEC}.Release|x64.Build.0 = Release|x64 - {B80E8A57-208E-49FA-83BD-546B46A9BC4E}.Debug|Win32.ActiveCfg = Release|Win32 - {B80E8A57-208E-49FA-83BD-546B46A9BC4E}.Debug|Win32.Build.0 = Release|Win32 - {B80E8A57-208E-49FA-83BD-546B46A9BC4E}.Debug|x64.ActiveCfg = Debug|x64 - {B80E8A57-208E-49FA-83BD-546B46A9BC4E}.Debug|x64.Build.0 = Debug|x64 - {B80E8A57-208E-49FA-83BD-546B46A9BC4E}.Release|Win32.ActiveCfg = Release|Win32 - {B80E8A57-208E-49FA-83BD-546B46A9BC4E}.Release|Win32.Build.0 = Release|Win32 - {B80E8A57-208E-49FA-83BD-546B46A9BC4E}.Release|x64.ActiveCfg = Release|x64 - {B80E8A57-208E-49FA-83BD-546B46A9BC4E}.Release|x64.Build.0 = Release|x64 - {3B7C102E-1228-4C67-AAAF-90A2894370FD}.Debug|Win32.ActiveCfg = Release|Win32 - {3B7C102E-1228-4C67-AAAF-90A2894370FD}.Debug|Win32.Build.0 = Release|Win32 - {3B7C102E-1228-4C67-AAAF-90A2894370FD}.Debug|x64.ActiveCfg = Debug|x64 - {3B7C102E-1228-4C67-AAAF-90A2894370FD}.Debug|x64.Build.0 = Debug|x64 - {3B7C102E-1228-4C67-AAAF-90A2894370FD}.Release|Win32.ActiveCfg = Release|Win32 - {3B7C102E-1228-4C67-AAAF-90A2894370FD}.Release|Win32.Build.0 = Release|Win32 - {3B7C102E-1228-4C67-AAAF-90A2894370FD}.Release|x64.ActiveCfg = Release|x64 - {3B7C102E-1228-4C67-AAAF-90A2894370FD}.Release|x64.Build.0 = Release|x64 - {AA03D1D3-E62E-491E-BED6-7A5851879382}.Debug|Win32.ActiveCfg = Release|Win32 - {AA03D1D3-E62E-491E-BED6-7A5851879382}.Debug|Win32.Build.0 = Release|Win32 - {AA03D1D3-E62E-491E-BED6-7A5851879382}.Debug|x64.ActiveCfg = Debug|x64 - {AA03D1D3-E62E-491E-BED6-7A5851879382}.Debug|x64.Build.0 = Debug|x64 - {AA03D1D3-E62E-491E-BED6-7A5851879382}.Release|Win32.ActiveCfg = Release|Win32 - {AA03D1D3-E62E-491E-BED6-7A5851879382}.Release|Win32.Build.0 = Release|Win32 - {AA03D1D3-E62E-491E-BED6-7A5851879382}.Release|x64.ActiveCfg = Release|x64 - {AA03D1D3-E62E-491E-BED6-7A5851879382}.Release|x64.Build.0 = Release|x64 - {8926BDE3-BD11-4DA3-8F5D-09A23243DDBB}.Debug|Win32.ActiveCfg = Release|Win32 - {8926BDE3-BD11-4DA3-8F5D-09A23243DDBB}.Debug|Win32.Build.0 = Release|Win32 - {8926BDE3-BD11-4DA3-8F5D-09A23243DDBB}.Debug|x64.ActiveCfg = Debug|x64 - {8926BDE3-BD11-4DA3-8F5D-09A23243DDBB}.Debug|x64.Build.0 = Debug|x64 - {8926BDE3-BD11-4DA3-8F5D-09A23243DDBB}.Release|Win32.ActiveCfg = Release|Win32 - {8926BDE3-BD11-4DA3-8F5D-09A23243DDBB}.Release|Win32.Build.0 = Release|Win32 - {8926BDE3-BD11-4DA3-8F5D-09A23243DDBB}.Release|x64.ActiveCfg = Release|x64 - {8926BDE3-BD11-4DA3-8F5D-09A23243DDBB}.Release|x64.Build.0 = Release|x64 - {73B65A5F-06D3-46E3-AE76-74853A0FDB36}.Debug|Win32.ActiveCfg = Release|Win32 - {73B65A5F-06D3-46E3-AE76-74853A0FDB36}.Debug|Win32.Build.0 = Release|Win32 - {73B65A5F-06D3-46E3-AE76-74853A0FDB36}.Debug|x64.ActiveCfg = Debug|x64 - {73B65A5F-06D3-46E3-AE76-74853A0FDB36}.Debug|x64.Build.0 = Debug|x64 - {73B65A5F-06D3-46E3-AE76-74853A0FDB36}.Release|Win32.ActiveCfg = Release|Win32 - {73B65A5F-06D3-46E3-AE76-74853A0FDB36}.Release|Win32.Build.0 = Release|Win32 - {73B65A5F-06D3-46E3-AE76-74853A0FDB36}.Release|x64.ActiveCfg = Release|x64 - {73B65A5F-06D3-46E3-AE76-74853A0FDB36}.Release|x64.Build.0 = Release|x64 - {3E45FEB0-8CB6-42BC-BEF2-B7484198359A}.Debug|Win32.ActiveCfg = Release|Win32 - {3E45FEB0-8CB6-42BC-BEF2-B7484198359A}.Debug|Win32.Build.0 = Release|Win32 - {3E45FEB0-8CB6-42BC-BEF2-B7484198359A}.Debug|x64.ActiveCfg = Debug|x64 - {3E45FEB0-8CB6-42BC-BEF2-B7484198359A}.Debug|x64.Build.0 = Debug|x64 - {3E45FEB0-8CB6-42BC-BEF2-B7484198359A}.Release|Win32.ActiveCfg = Release|Win32 - {3E45FEB0-8CB6-42BC-BEF2-B7484198359A}.Release|Win32.Build.0 = Release|Win32 - {3E45FEB0-8CB6-42BC-BEF2-B7484198359A}.Release|x64.ActiveCfg = Release|x64 - {3E45FEB0-8CB6-42BC-BEF2-B7484198359A}.Release|x64.Build.0 = Release|x64 - {5DD390AE-DCDE-4B18-BEDF-6EE21B5DD6AC}.Debug|Win32.ActiveCfg = Release|Win32 - {5DD390AE-DCDE-4B18-BEDF-6EE21B5DD6AC}.Debug|Win32.Build.0 = Release|Win32 - {5DD390AE-DCDE-4B18-BEDF-6EE21B5DD6AC}.Debug|x64.ActiveCfg = Debug|x64 - {5DD390AE-DCDE-4B18-BEDF-6EE21B5DD6AC}.Debug|x64.Build.0 = Debug|x64 - {5DD390AE-DCDE-4B18-BEDF-6EE21B5DD6AC}.Release|Win32.ActiveCfg = Release|Win32 - {5DD390AE-DCDE-4B18-BEDF-6EE21B5DD6AC}.Release|Win32.Build.0 = Release|Win32 - {5DD390AE-DCDE-4B18-BEDF-6EE21B5DD6AC}.Release|x64.ActiveCfg = Release|x64 - {5DD390AE-DCDE-4B18-BEDF-6EE21B5DD6AC}.Release|x64.Build.0 = Release|x64 - {B839A523-2BF1-4041-8438-FB084FEDE4CA}.Debug|Win32.ActiveCfg = Release|Win32 - {B839A523-2BF1-4041-8438-FB084FEDE4CA}.Debug|Win32.Build.0 = Release|Win32 - {B839A523-2BF1-4041-8438-FB084FEDE4CA}.Debug|x64.ActiveCfg = Debug|x64 - {B839A523-2BF1-4041-8438-FB084FEDE4CA}.Debug|x64.Build.0 = Debug|x64 - {B839A523-2BF1-4041-8438-FB084FEDE4CA}.Release|Win32.ActiveCfg = Release|Win32 - {B839A523-2BF1-4041-8438-FB084FEDE4CA}.Release|Win32.Build.0 = Release|Win32 - {B839A523-2BF1-4041-8438-FB084FEDE4CA}.Release|x64.ActiveCfg = Release|x64 - {B839A523-2BF1-4041-8438-FB084FEDE4CA}.Release|x64.Build.0 = Release|x64 - {6BC0051B-48CC-4B9D-9BFF-5D6B9CAEDF4C}.Debug|Win32.ActiveCfg = Release|Win32 - {6BC0051B-48CC-4B9D-9BFF-5D6B9CAEDF4C}.Debug|Win32.Build.0 = Release|Win32 - {6BC0051B-48CC-4B9D-9BFF-5D6B9CAEDF4C}.Debug|x64.ActiveCfg = Debug|x64 - {6BC0051B-48CC-4B9D-9BFF-5D6B9CAEDF4C}.Debug|x64.Build.0 = Debug|x64 - {6BC0051B-48CC-4B9D-9BFF-5D6B9CAEDF4C}.Release|Win32.ActiveCfg = Release|Win32 - {6BC0051B-48CC-4B9D-9BFF-5D6B9CAEDF4C}.Release|Win32.Build.0 = Release|Win32 - {6BC0051B-48CC-4B9D-9BFF-5D6B9CAEDF4C}.Release|x64.ActiveCfg = Release|x64 - {6BC0051B-48CC-4B9D-9BFF-5D6B9CAEDF4C}.Release|x64.Build.0 = Release|x64 - {B93C82CE-D496-47E8-B111-99F406ADB490}.Debug|Win32.ActiveCfg = Release|Win32 - {B93C82CE-D496-47E8-B111-99F406ADB490}.Debug|Win32.Build.0 = Release|Win32 - {B93C82CE-D496-47E8-B111-99F406ADB490}.Debug|x64.ActiveCfg = Debug|x64 - {B93C82CE-D496-47E8-B111-99F406ADB490}.Debug|x64.Build.0 = Debug|x64 - {B93C82CE-D496-47E8-B111-99F406ADB490}.Release|Win32.ActiveCfg = Release|Win32 - {B93C82CE-D496-47E8-B111-99F406ADB490}.Release|Win32.Build.0 = Release|Win32 - {B93C82CE-D496-47E8-B111-99F406ADB490}.Release|x64.ActiveCfg = Release|x64 - {B93C82CE-D496-47E8-B111-99F406ADB490}.Release|x64.Build.0 = Release|x64 - {78349AD2-3C40-4D22-BFE1-6E63686E3FFC}.Debug|Win32.ActiveCfg = Release|Win32 - {78349AD2-3C40-4D22-BFE1-6E63686E3FFC}.Debug|Win32.Build.0 = Release|Win32 - {78349AD2-3C40-4D22-BFE1-6E63686E3FFC}.Debug|x64.ActiveCfg = Debug|x64 - {78349AD2-3C40-4D22-BFE1-6E63686E3FFC}.Debug|x64.Build.0 = Debug|x64 - {78349AD2-3C40-4D22-BFE1-6E63686E3FFC}.Release|Win32.ActiveCfg = Release|Win32 - {78349AD2-3C40-4D22-BFE1-6E63686E3FFC}.Release|Win32.Build.0 = Release|Win32 - {78349AD2-3C40-4D22-BFE1-6E63686E3FFC}.Release|x64.ActiveCfg = Release|x64 - {78349AD2-3C40-4D22-BFE1-6E63686E3FFC}.Release|x64.Build.0 = Release|x64 - {E21FE87C-B9E0-40ED-B1C5-044C116B42F8}.Debug|Win32.ActiveCfg = Release|Win32 - {E21FE87C-B9E0-40ED-B1C5-044C116B42F8}.Debug|Win32.Build.0 = Release|Win32 - {E21FE87C-B9E0-40ED-B1C5-044C116B42F8}.Debug|x64.ActiveCfg = Debug|x64 - {E21FE87C-B9E0-40ED-B1C5-044C116B42F8}.Debug|x64.Build.0 = Debug|x64 - {E21FE87C-B9E0-40ED-B1C5-044C116B42F8}.Release|Win32.ActiveCfg = Release|Win32 - {E21FE87C-B9E0-40ED-B1C5-044C116B42F8}.Release|Win32.Build.0 = Release|Win32 - {E21FE87C-B9E0-40ED-B1C5-044C116B42F8}.Release|x64.ActiveCfg = Release|x64 - {E21FE87C-B9E0-40ED-B1C5-044C116B42F8}.Release|x64.Build.0 = Release|x64 - {6F89B606-00C4-4DE5-BBE4-4D058E6AEB6B}.Debug|Win32.ActiveCfg = Release|Win32 - {6F89B606-00C4-4DE5-BBE4-4D058E6AEB6B}.Debug|Win32.Build.0 = Release|Win32 - {6F89B606-00C4-4DE5-BBE4-4D058E6AEB6B}.Debug|x64.ActiveCfg = Debug|x64 - {6F89B606-00C4-4DE5-BBE4-4D058E6AEB6B}.Debug|x64.Build.0 = Debug|x64 - {6F89B606-00C4-4DE5-BBE4-4D058E6AEB6B}.Release|Win32.ActiveCfg = Release|Win32 - {6F89B606-00C4-4DE5-BBE4-4D058E6AEB6B}.Release|Win32.Build.0 = Release|Win32 - {6F89B606-00C4-4DE5-BBE4-4D058E6AEB6B}.Release|x64.ActiveCfg = Release|x64 - {6F89B606-00C4-4DE5-BBE4-4D058E6AEB6B}.Release|x64.Build.0 = Release|x64 - {A2F8D0FB-F549-42BF-BB86-108B7B4AFBE0}.Debug|Win32.ActiveCfg = Release|Win32 - {A2F8D0FB-F549-42BF-BB86-108B7B4AFBE0}.Debug|Win32.Build.0 = Release|Win32 - {A2F8D0FB-F549-42BF-BB86-108B7B4AFBE0}.Debug|x64.ActiveCfg = Debug|x64 - {A2F8D0FB-F549-42BF-BB86-108B7B4AFBE0}.Debug|x64.Build.0 = Debug|x64 - {A2F8D0FB-F549-42BF-BB86-108B7B4AFBE0}.Release|Win32.ActiveCfg = Release|Win32 - {A2F8D0FB-F549-42BF-BB86-108B7B4AFBE0}.Release|Win32.Build.0 = Release|Win32 - {A2F8D0FB-F549-42BF-BB86-108B7B4AFBE0}.Release|x64.ActiveCfg = Release|x64 - {A2F8D0FB-F549-42BF-BB86-108B7B4AFBE0}.Release|x64.Build.0 = Release|x64 - {6406C9C4-DCB7-43C5-828A-15B669A2A1A4}.Debug|Win32.ActiveCfg = Release|Win32 - {6406C9C4-DCB7-43C5-828A-15B669A2A1A4}.Debug|Win32.Build.0 = Release|Win32 - {6406C9C4-DCB7-43C5-828A-15B669A2A1A4}.Debug|x64.ActiveCfg = Debug|x64 - {6406C9C4-DCB7-43C5-828A-15B669A2A1A4}.Debug|x64.Build.0 = Debug|x64 - {6406C9C4-DCB7-43C5-828A-15B669A2A1A4}.Release|Win32.ActiveCfg = Release|Win32 - {6406C9C4-DCB7-43C5-828A-15B669A2A1A4}.Release|Win32.Build.0 = Release|Win32 - {6406C9C4-DCB7-43C5-828A-15B669A2A1A4}.Release|x64.ActiveCfg = Release|x64 - {6406C9C4-DCB7-43C5-828A-15B669A2A1A4}.Release|x64.Build.0 = Release|x64 - {94D774D1-1403-4F01-AD70-1337438E970B}.Debug|Win32.ActiveCfg = Release|Win32 - {94D774D1-1403-4F01-AD70-1337438E970B}.Debug|Win32.Build.0 = Release|Win32 - {94D774D1-1403-4F01-AD70-1337438E970B}.Debug|x64.ActiveCfg = Debug|x64 - {94D774D1-1403-4F01-AD70-1337438E970B}.Debug|x64.Build.0 = Debug|x64 - {94D774D1-1403-4F01-AD70-1337438E970B}.Release|Win32.ActiveCfg = Release|Win32 - {94D774D1-1403-4F01-AD70-1337438E970B}.Release|Win32.Build.0 = Release|Win32 - {94D774D1-1403-4F01-AD70-1337438E970B}.Release|x64.ActiveCfg = Release|x64 - {94D774D1-1403-4F01-AD70-1337438E970B}.Release|x64.Build.0 = Release|x64 - {509AE767-82A2-48A7-8C11-21D5A2432F3E}.Debug|Win32.ActiveCfg = Release|Win32 - {509AE767-82A2-48A7-8C11-21D5A2432F3E}.Debug|Win32.Build.0 = Release|Win32 - {509AE767-82A2-48A7-8C11-21D5A2432F3E}.Debug|x64.ActiveCfg = Debug|x64 - {509AE767-82A2-48A7-8C11-21D5A2432F3E}.Debug|x64.Build.0 = Debug|x64 - {509AE767-82A2-48A7-8C11-21D5A2432F3E}.Release|Win32.ActiveCfg = Release|Win32 - {509AE767-82A2-48A7-8C11-21D5A2432F3E}.Release|Win32.Build.0 = Release|Win32 - {509AE767-82A2-48A7-8C11-21D5A2432F3E}.Release|x64.ActiveCfg = Release|x64 - {509AE767-82A2-48A7-8C11-21D5A2432F3E}.Release|x64.Build.0 = Release|x64 - {4BDF04F0-C19E-42E4-837C-B63EECA8D651}.Debug|Win32.ActiveCfg = Debug|Win32 - {4BDF04F0-C19E-42E4-837C-B63EECA8D651}.Debug|Win32.Build.0 = Debug|Win32 - {4BDF04F0-C19E-42E4-837C-B63EECA8D651}.Debug|x64.ActiveCfg = Debug|Win32 - {4BDF04F0-C19E-42E4-837C-B63EECA8D651}.Release|Win32.ActiveCfg = Release|Win32 - {4BDF04F0-C19E-42E4-837C-B63EECA8D651}.Release|Win32.Build.0 = Release|Win32 - {4BDF04F0-C19E-42E4-837C-B63EECA8D651}.Release|x64.ActiveCfg = Release|x64 - {4BDF04F0-C19E-42E4-837C-B63EECA8D651}.Release|x64.Build.0 = Release|x64 - {978CF74F-FE36-4343-B02E-33A62976818F}.Debug|Win32.ActiveCfg = Debug|Win32 - {978CF74F-FE36-4343-B02E-33A62976818F}.Debug|Win32.Build.0 = Debug|Win32 - {978CF74F-FE36-4343-B02E-33A62976818F}.Debug|x64.ActiveCfg = Debug|Win32 - {978CF74F-FE36-4343-B02E-33A62976818F}.Release|Win32.ActiveCfg = Release|Win32 - {978CF74F-FE36-4343-B02E-33A62976818F}.Release|Win32.Build.0 = Release|Win32 - {978CF74F-FE36-4343-B02E-33A62976818F}.Release|x64.ActiveCfg = Release|x64 - {978CF74F-FE36-4343-B02E-33A62976818F}.Release|x64.Build.0 = Release|x64 - {34EE9DAB-1D81-4E13-892C-CD844BCA4E50}.Debug|Win32.ActiveCfg = Debug|Win32 - {34EE9DAB-1D81-4E13-892C-CD844BCA4E50}.Debug|Win32.Build.0 = Debug|Win32 - {34EE9DAB-1D81-4E13-892C-CD844BCA4E50}.Debug|x64.ActiveCfg = Debug|Win32 - {34EE9DAB-1D81-4E13-892C-CD844BCA4E50}.Release|Win32.ActiveCfg = Release|Win32 - {34EE9DAB-1D81-4E13-892C-CD844BCA4E50}.Release|Win32.Build.0 = Release|Win32 - {34EE9DAB-1D81-4E13-892C-CD844BCA4E50}.Release|x64.ActiveCfg = Release|x64 - {34EE9DAB-1D81-4E13-892C-CD844BCA4E50}.Release|x64.Build.0 = Release|x64 - {78E9071A-23F5-4F7D-A4CD-59EC01A7FA1D}.Debug|Win32.ActiveCfg = Debug|Win32 - {78E9071A-23F5-4F7D-A4CD-59EC01A7FA1D}.Debug|Win32.Build.0 = Debug|Win32 - {78E9071A-23F5-4F7D-A4CD-59EC01A7FA1D}.Debug|x64.ActiveCfg = Debug|Win32 - {78E9071A-23F5-4F7D-A4CD-59EC01A7FA1D}.Release|Win32.ActiveCfg = Release|Win32 - {78E9071A-23F5-4F7D-A4CD-59EC01A7FA1D}.Release|Win32.Build.0 = Release|Win32 - {78E9071A-23F5-4F7D-A4CD-59EC01A7FA1D}.Release|x64.ActiveCfg = Release|x64 - {78E9071A-23F5-4F7D-A4CD-59EC01A7FA1D}.Release|x64.Build.0 = Release|x64 - {6B072643-D0CB-4B7A-BA4C-E7509ADC51B6}.Debug|Win32.ActiveCfg = Debug|Win32 - {6B072643-D0CB-4B7A-BA4C-E7509ADC51B6}.Debug|Win32.Build.0 = Debug|Win32 - {6B072643-D0CB-4B7A-BA4C-E7509ADC51B6}.Debug|x64.ActiveCfg = Debug|x64 - {6B072643-D0CB-4B7A-BA4C-E7509ADC51B6}.Debug|x64.Build.0 = Debug|x64 - {6B072643-D0CB-4B7A-BA4C-E7509ADC51B6}.Release|Win32.ActiveCfg = Release|Win32 - {6B072643-D0CB-4B7A-BA4C-E7509ADC51B6}.Release|Win32.Build.0 = Release|Win32 - {6B072643-D0CB-4B7A-BA4C-E7509ADC51B6}.Release|x64.ActiveCfg = Release|x64 - {6B072643-D0CB-4B7A-BA4C-E7509ADC51B6}.Release|x64.Build.0 = Release|x64 - {B0341BD0-497A-4969-B045-1D259C59B32D}.Debug|Win32.ActiveCfg = Debug|Win32 - {B0341BD0-497A-4969-B045-1D259C59B32D}.Debug|Win32.Build.0 = Debug|Win32 - {B0341BD0-497A-4969-B045-1D259C59B32D}.Debug|x64.ActiveCfg = Debug|x64 - {B0341BD0-497A-4969-B045-1D259C59B32D}.Debug|x64.Build.0 = Debug|x64 - {B0341BD0-497A-4969-B045-1D259C59B32D}.Release|Win32.ActiveCfg = Release|Win32 - {B0341BD0-497A-4969-B045-1D259C59B32D}.Release|Win32.Build.0 = Release|Win32 - {B0341BD0-497A-4969-B045-1D259C59B32D}.Release|x64.ActiveCfg = Release|x64 - {B0341BD0-497A-4969-B045-1D259C59B32D}.Release|x64.Build.0 = Release|x64 - {A3A424FA-E965-45B6-957D-3EE630C8AE91}.Debug|Win32.ActiveCfg = Debug|Win32 - {A3A424FA-E965-45B6-957D-3EE630C8AE91}.Debug|Win32.Build.0 = Debug|Win32 - {A3A424FA-E965-45B6-957D-3EE630C8AE91}.Debug|x64.ActiveCfg = Debug|Win32 - {A3A424FA-E965-45B6-957D-3EE630C8AE91}.Release|Win32.ActiveCfg = Release|Win32 - {A3A424FA-E965-45B6-957D-3EE630C8AE91}.Release|Win32.Build.0 = Release|Win32 - {A3A424FA-E965-45B6-957D-3EE630C8AE91}.Release|x64.ActiveCfg = Release|x64 - {A3A424FA-E965-45B6-957D-3EE630C8AE91}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/cpp_test_suite/win64/vc10/test_suite/unlock/unlock.vcxproj b/cpp_test_suite/win64/vc10/test_suite/unlock/unlock.vcxproj deleted file mode 100644 index 5b0cd52ba..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/unlock/unlock.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {ECF3BF91-AE61-42AC-B3F2-FBCE55589B0C} - unlock - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - unlock - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/user_event/user_event.vcxproj b/cpp_test_suite/win64/vc10/test_suite/user_event/user_event.vcxproj deleted file mode 100644 index 40b409349..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/user_event/user_event.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {3B7C102E-1228-4C67-AAAF-90A2894370FD} - user_event - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - user_event - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/w_r_attr/w_r_attr.vcxproj b/cpp_test_suite/win64/vc10/test_suite/w_r_attr/w_r_attr.vcxproj deleted file mode 100644 index 7e16c607d..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/w_r_attr/w_r_attr.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {94F286EB-0016-4205-8B39-25EDB17C9E0C} - w_r_attr - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - w_r_attr - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/wait_mcast_dev/wait_mcast_dev.vcxproj b/cpp_test_suite/win64/vc10/test_suite/wait_mcast_dev/wait_mcast_dev.vcxproj deleted file mode 100644 index 37e34b53b..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/wait_mcast_dev/wait_mcast_dev.vcxproj +++ /dev/null @@ -1,161 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {78E9071A-23F5-4F7D-A4CD-59EC01A7FA1D} - Win32Proj - wait_mcast_dev - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - false - true - Unicode - Windows7.1SDK - - - Application - false - true - Unicode - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - $(PREFIX)\win64\bin - wait_mcast_dev - - - false - $(PREFIX)\win64\bin\ - wait_mcast_dev - $(Configuration)\ - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level2 - - - Disabled - true - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - false - true - true - $(PREFIX)\win64\bin\$(TargetName)$(TargetExt) - tango.lib;log4tango.lib;omniORB4.lib;omniDynamic4.lib;omnithread.lib;COS4.lib;zmq.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - MachineX64 - - - - - Level2 - - - Disabled - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - %(AdditionalIncludeDirectories) - - - Console - false - true - true - $(PREFIX)\win64\bin\$(ProjectName).exe - tango.lib;log4tango.lib;omniORB4.lib;omniDynamic4.lib;omnithread.lib;COS4.lib;zmq.lib;comctl32.lib;ws2_32.lib;mswsock.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win64\lib\vc10;$(OMNI_BASE)\win64\lib;$(LOG4TANGO_BASE)\win64\lib;$(ZMQ_BASE)\win64\lib\vc10;%(AdditionalLibraryDirectories) - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/write_attr/write_attr.vcxproj b/cpp_test_suite/win64/vc10/test_suite/write_attr/write_attr.vcxproj deleted file mode 100644 index d36e27012..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/write_attr/write_attr.vcxproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {7EE9A9E4-78AE-4B6D-8F7C-DADB9FE90E7A} - write_attr - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - write_attr - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cpp_test_suite/win64/vc10/test_suite/write_attr_3/write_attr_3.vcxproj b/cpp_test_suite/win64/vc10/test_suite/write_attr_3/write_attr_3.vcxproj deleted file mode 100644 index 0104e1275..000000000 --- a/cpp_test_suite/win64/vc10/test_suite/write_attr_3/write_attr_3.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {08D23250-240C-4025-8649-EC441171A51D} - write_attr_3 - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - true - Windows7.1SDK - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(PREFIX)\win64\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - write_attr_3 - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Console - true - true - MachineX86 - - - - - Disabled - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level2 - ProgramDatabase - - - Console - true - true - - - - - - - - - \ No newline at end of file diff --git a/cppapi/.mailmap b/cppapi/.mailmap deleted file mode 100644 index 985ad29ef..000000000 --- a/cppapi/.mailmap +++ /dev/null @@ -1 +0,0 @@ - diff --git a/cppapi/CMakeLists.txt b/cppapi/CMakeLists.txt deleted file mode 100644 index aaaea6e97..000000000 --- a/cppapi/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -add_subdirectory(doxygen) -add_subdirectory(client) -add_subdirectory(server) - - -#link_libraries() - -#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tango.pc" -# DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") \ No newline at end of file diff --git a/cppapi/Make.rules b/cppapi/Make.rules deleted file mode 100644 index d4eccf2f1..000000000 --- a/cppapi/Make.rules +++ /dev/null @@ -1,136 +0,0 @@ -# -# Rules for Tango lib generation -# - - -############################################################################## -# -# PLEASE, Update library version here (for versioning support) -# -############################################################################## - -MAJOR_VERS = 9 -MINOR_VERS = 2 -PATCH_VERS = 5 - -############################################################################## -# -# The base directory -# -############################################################################## - -ifdef prefix -TANGO_HOME = /segfs/tango -else -TANGO_HOME = /segfs/tango -endif - -############################################################################## -# -# -############################################################################## - -ifndef ubuntu -OS=$(shell /csadmin/common/scripts/get_os.share) -endif - -ifdef ubuntu -ifdef dev -OS=ubuntu1404 -else -OS=ubuntu1204 -endif -endif - -############################################################################## -# -# The directory where generated libs will be placed -# They will automatically be created if they do not -# already exist. -# -############################################################################## - -ifdef prefix -BIN_DIR = $(OS) -else -BIN_DIR = $(OS) -endif - -ifdef _solaris -ifdef gcc -BIN_DIR = $(OS)_gcc -else -BIN_DIR = $(OS)_CC -endif -endif - -# check for 64 bits!!!! -ifdef 64bits -ifeq ($(OS),redhate4) -BIN_DIR = $(OS)_64 -endif -endif - -############################################################################## -# -# Installation directory for include files and libraries -# -############################################################################## - -ifdef prefix -INSTALL_BASE = $(prefix)/$(BIN_DIR) -INSTALL_BASE_WIN32 = $(prefix)/win32 -else -#INSTALL_BASE = /segfs/tango/tmp/install/$(BIN_DIR) -INSTALL_BASE = /home/taurel/tango/install/$(BIN_DIR) -INSTALL_BASE_WIN32 = /segfs/tango/install/win32 -endif - -############################################################################## -# -# OmniORB base directory -# -############################################################################## - -ifdef prefix -OMNI_BASE = $(TANGO_HOME)/ORB/omniORB4.2.1/$(BIN_DIR) -else -OMNI_BASE = $(TANGO_HOME)/ORB/omniORB4.2.1/$(BIN_DIR) -endif - -############################################################################## -# -# Log4tango base directory -# -############################################################################## - -ifdef prefix -LOG4TANGO_BASE = $(TANGO_HOME)/tools/log4tango-release/log4tango5.0.1/$(BIN_DIR) -else -LOG4TANGO_BASE = $(TANGO_HOME)/tools/log4tango-release/log4tango5.0.1/$(BIN_DIR) -endif - -############################################################################## -# -# ZMQ base directory -# -############################################################################## - - -ifdef prefix -#ZMQ_BASE = $(TANGO_HOME)/transport/zmq/$(BIN_DIR) -ZMQ_BASE = $(TANGO_HOME)/transport/zmq4.0.5/$(BIN_DIR) -#ZMQ_BASE = $(TANGO_HOME)/transport/zmq4.1.3/$(BIN_DIR) -else -#ZMQ_BASE = $(TANGO_HOME)/transport/zmq/$(BIN_DIR) -ZMQ_BASE = $(TANGO_HOME)/transport/zmq4.0.5/$(BIN_DIR) -#ZMQ_BASE = $(TANGO_HOME)/transport/zmq4.1.3/$(BIN_DIR) -endif - -############################################################################## -# -# doxygen base directory -# -############################################################################## - -DOXYGEN = doxygen diff --git a/cppapi/Makefile b/cppapi/Makefile deleted file mode 100644 index 6e2b90cbd..000000000 --- a/cppapi/Makefile +++ /dev/null @@ -1,649 +0,0 @@ -# -# Makefile to generate the Tango library -# - -include Make.rules - -ifdef linux -CC = c++ -AR = ar rv -AR_SL = $(CC) -fPIC -shared -ldl -Wl,-z,now -VERS_OPT = -Wl,-soname, -SL_EXT = so -# -DOC_CONFIG = ../doxygen/Doxyfile -GEN_DOC = $(DOXYGEN) $(DOC_CONFIG) -MINOR_VERS_TMP = 1 -endif - - -ifdef macosx-darwin8 -CC = c++ -AR = ar rv -#AR_SL = $(CC) -isysroot /DevelopAR_SLAR_SLper/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -fPIC \ - -dynamiclib -flat_namespace --disable-dependency-tracking -AR_SL = $(CC) -fPIC \ - -dynamiclib -flat_namespace --disable-dependency-tracking -SL_EXT = dylib -endif - - -CLIENT_SRC = client -SERVER_SRC = server -IDL_SRC = server/idl -JPG_SRC = server/jpeg -JPG_SRC_MMX = server/jpeg_mmx - -ifdef prefix -OBJS_DIR = objs/$(BIN_DIR) -OBJS_DIR_SL = objs_sl/$(BIN_DIR) -else -OBJS_DIR = objs/$(BIN_DIR) -OBJS_DIR_SL = objs_sl/$(BIN_DIR) -endif - - -INCLUDE_DIRS = -I$(CLIENT_SRC) \ - -I$(SERVER_SRC) \ - -I$(JPG_SRC) \ - -I$(OMNI_BASE)/include \ - -I$(LOG4TANGO_BASE)/include/tango \ - -I$(ZMQ_BASE)/include - -# ----------------------------------------------------------------- -# -# The compiler flags -# -#------------------------------------------------------------------ -MMFLAG = - -#Check that we have at least gcc 4.3 (for c++0x features) -ifdef linux -GCC_MAJOR_VERSION_GT4 := $(shell expr `c++ -dumpversion | cut -f1 -d.` \> 4) -GCC_MAJOR_VERSION_EQ4 := $(shell expr `c++ -dumpversion | cut -f1 -d.` \== 4) -GCC_MINOR_VERSION_GTEQ3 := $(shell expr `c++ -dumpversion | cut -f2 -d.` \>= 3) -ifeq ($(GCC_MAJOR_VERSION_GT4),1) - CXX11 = -std=c++0x -else - ifeq ($(GCC_MAJOR_VERSION_EQ4),1) - ifeq ($(GCC_MINOR_VERSION_GTEQ3),1) - CXX11 = -std=c++0x - endif - endif -endif -endif - -ifdef linux -ifdef debug -FLAGS = -g -Wall -Wextra $(CXX11) -D_REENTRANT -DOMNI_UNLOADABLE_STUBS -D_FORTIFY_SOURCE=2 $(INCLUDE_DIRS) -#FLAGS = -g -Wall -Wextra $(CXX11) -D_REENTRANT -DOMNI_UNLOADABLE_STUBS -D_FORTIFY_SOURCE=2 -O1 $(INCLUDE_DIRS) -#FLAGS = -g -D_REENTRANT -D_TANGO_LIB $(INCLUDE_DIRS) -DOMNI_UNLOADABLE_STUBS -else -FLAGS = -O2 $(CXX11) -D_REENTRANT -D_TANGO_LIB $(INCLUDE_DIRS) -DOMNI_UNLOADABLE_STUBS -D_FORTIFY_SOURCE=2 -#FLAGS = -O2 -D_REENTRANT $(INCLUDE_DIRS) -DOMNI_UNLOADABLE_STUBS -endif - -# gcc does not allow MMX optimisation with -fPIC in 64bits -ifdef 64bits -MMFLAG = -mmmx -D_64BITS -#CXXFLAGS = -DJPG_USE_ASM $(FLAGS) -CXXFLAGS = $(FLAGS) -CXXFLAGS_SL = $(FLAGS) -fPIC -else -MMFLAG = -mmmx -O0 -CXXFLAGS = -DJPG_USE_ASM $(FLAGS) -CXXFLAGS_SL = -DJPG_USE_ASM $(FLAGS) -fPIC -endif -endif - -ifdef macosx-darwin8 -#CXXFLAGS = -g -isysroot /Developper/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -D_REENTRANT -DOMNI_UNLOADABLE_STUBS $(INCLUDE_DIRS) -CXXFLAGS = -g -D_REENTRANT -DOMNI_UNLOADABLE_STUBS $(INCLUDE_DIRS) -CXXFLAGS_SL = $(CXXFLAGS) -fPIC -endif - - -#------------------------------------------------------------------- - -LIBNAME = libtango - -ifdef debug -LIB_DIR = lib/debug -else -LIB_DIR = lib -endif - -AR_EXT = a - - -IDL_OBJS = $(OBJS_DIR)/tangoSK.o \ - $(OBJS_DIR)/tangoDynSK.o - -SERVER_OBJS = $(OBJS_DIR)/device.o \ - $(OBJS_DIR)/device_2.o \ - $(OBJS_DIR)/device_3.o \ - $(OBJS_DIR)/device_4.o \ - $(OBJS_DIR)/device_5.o \ - $(OBJS_DIR)/dev_event.o \ - $(OBJS_DIR)/dev_poll.o \ - $(OBJS_DIR)/deviceclass.o \ - $(OBJS_DIR)/command.o \ - $(OBJS_DIR)/pipe.o \ - $(OBJS_DIR)/w_pipe.o \ - $(OBJS_DIR)/dserversignal.o \ - $(OBJS_DIR)/devintr.o \ - $(OBJS_DIR)/dintrthread.o \ - $(OBJS_DIR)/thsig.o \ - $(OBJS_DIR)/basiccommand.o \ - $(OBJS_DIR)/utils.o \ - $(OBJS_DIR)/dserverclass.o \ - $(OBJS_DIR)/dserver.o \ - $(OBJS_DIR)/class_factory.o \ - $(OBJS_DIR)/blackbox.o \ - $(OBJS_DIR)/classattribute.o \ - $(OBJS_DIR)/multiattribute.o \ - $(OBJS_DIR)/templ_inst.o \ - $(OBJS_DIR)/attribute.o \ - $(OBJS_DIR)/attrsetval.o \ - $(OBJS_DIR)/attrgetsetprop.o \ - $(OBJS_DIR)/w_attribute.o \ - $(OBJS_DIR)/attrdesc.o \ - $(OBJS_DIR)/fwdattrdesc.o \ - $(OBJS_DIR)/fwdattribute.o \ - $(OBJS_DIR)/rootattreg.o \ - $(OBJS_DIR)/except.o \ - $(OBJS_DIR)/attrmanip.o \ - $(OBJS_DIR)/seqvec.o \ - $(OBJS_DIR)/pollring.o \ - $(OBJS_DIR)/pollobj.o \ - $(OBJS_DIR)/pollcmds.o \ - $(OBJS_DIR)/dserverpoll.o \ - $(OBJS_DIR)/pollthread.o \ - $(OBJS_DIR)/dserverlock.o \ - $(OBJS_DIR)/logging.o \ - $(OBJS_DIR)/logcmds.o \ - $(OBJS_DIR)/logstream.o \ - $(OBJS_DIR)/devicelog.o \ - $(OBJS_DIR)/dserverlog.o \ - $(OBJS_DIR)/coutappender.o \ - $(OBJS_DIR)/tangoappender.o \ - $(OBJS_DIR)/tangorollingfileappender.o \ - $(OBJS_DIR)/eventsupplier.o \ - $(OBJS_DIR)/notifdeventsupplier.o \ - $(OBJS_DIR)/zmqeventsupplier.o \ - $(OBJS_DIR)/eventcmds.o \ - $(OBJS_DIR)/utils_polling.o \ - $(OBJS_DIR)/utils_shut.o \ - $(OBJS_DIR)/subdev_diag.o \ - $(OBJS_DIR)/encoded_attribute.o \ - $(OBJS_DIR)/classpipe.o \ - $(OBJS_DIR)/jpeg_bitstream.o \ - $(OBJS_DIR)/jpeg_color.o \ - $(OBJS_DIR)/jpeg_color_mmx.o \ - $(OBJS_DIR)/jpeg_dct.o \ - $(OBJS_DIR)/jpeg_dct_mmx.o \ - $(OBJS_DIR)/jpeg_decoder.o \ - $(OBJS_DIR)/jpeg_encoder.o \ - $(OBJS_DIR)/jpeg_memory.o - -CLIENT_OBJS = $(OBJS_DIR)/dbapi_base.o \ - $(OBJS_DIR)/dbapi_history.o \ - $(OBJS_DIR)/dbapi_class.o \ - $(OBJS_DIR)/dbapi_datum.o \ - $(OBJS_DIR)/dbapi_device.o \ - $(OBJS_DIR)/dbapi_server.o \ - $(OBJS_DIR)/dbapi_cache.o \ - $(OBJS_DIR)/dbapi_serverdata.o \ - $(OBJS_DIR)/devapi_attr.o \ - $(OBJS_DIR)/devapi_base.o \ - $(OBJS_DIR)/devapi_data.o \ - $(OBJS_DIR)/devapi_datahist.o \ - $(OBJS_DIR)/devapi_pipe.o \ - $(OBJS_DIR)/api_util.o \ - $(OBJS_DIR)/devapi_utils.o \ - $(OBJS_DIR)/asynreq.o \ - $(OBJS_DIR)/proxy_asyn.o \ - $(OBJS_DIR)/proxy_asyn_cb.o \ - $(OBJS_DIR)/cbthread.o \ - $(OBJS_DIR)/lockthread.o \ - $(OBJS_DIR)/group.o \ - $(OBJS_DIR)/accessproxy.o \ - $(OBJS_DIR)/dbapi_attribute.o \ - $(OBJS_DIR)/attr_proxy.o \ - $(OBJS_DIR)/apiexcept.o \ - $(OBJS_DIR)/filedatabase.o \ - $(OBJS_DIR)/event.o \ - $(OBJS_DIR)/eventqueue.o \ - $(OBJS_DIR)/notifdeventconsumer.o \ - $(OBJS_DIR)/zmqeventconsumer.o \ - $(OBJS_DIR)/eventkeepalive.o - -IDL_OBJS_SL = $(OBJS_DIR_SL)/tangoSK.so.o \ - $(OBJS_DIR_SL)/tangoDynSK.so.o - -SERVER_OBJS_SL =$(OBJS_DIR_SL)/device.so.o \ - $(OBJS_DIR_SL)/device_2.so.o \ - $(OBJS_DIR_SL)/device_3.so.o \ - $(OBJS_DIR_SL)/device_4.so.o \ - $(OBJS_DIR_SL)/device_5.so.o \ - $(OBJS_DIR_SL)/dev_event.so.o \ - $(OBJS_DIR_SL)/dev_poll.so.o \ - $(OBJS_DIR_SL)/deviceclass.so.o \ - $(OBJS_DIR_SL)/command.so.o \ - $(OBJS_DIR_SL)/pipe.so.o \ - $(OBJS_DIR_SL)/w_pipe.so.o \ - $(OBJS_DIR_SL)/dserversignal.so.o \ - $(OBJS_DIR_SL)/devintr.so.o \ - $(OBJS_DIR_SL)/dintrthread.so.o \ - $(OBJS_DIR_SL)/thsig.so.o \ - $(OBJS_DIR_SL)/basiccommand.so.o \ - $(OBJS_DIR_SL)/utils.so.o \ - $(OBJS_DIR_SL)/dserverclass.so.o \ - $(OBJS_DIR_SL)/dserver.so.o \ - $(OBJS_DIR_SL)/class_factory.so.o \ - $(OBJS_DIR_SL)/blackbox.so.o \ - $(OBJS_DIR_SL)/classattribute.so.o \ - $(OBJS_DIR_SL)/templ_inst.so.o \ - $(OBJS_DIR_SL)/attribute.so.o \ - $(OBJS_DIR_SL)/attrsetval.so.o \ - $(OBJS_DIR_SL)/attrgetsetprop.so.o \ - $(OBJS_DIR_SL)/w_attribute.so.o \ - $(OBJS_DIR_SL)/multiattribute.so.o \ - $(OBJS_DIR_SL)/attrdesc.so.o \ - $(OBJS_DIR_SL)/fwdattrdesc.so.o \ - $(OBJS_DIR_SL)/fwdattribute.so.o \ - $(OBJS_DIR_SL)/rootattreg.so.o \ - $(OBJS_DIR_SL)/except.so.o \ - $(OBJS_DIR_SL)/attrmanip.so.o \ - $(OBJS_DIR_SL)/seqvec.so.o \ - $(OBJS_DIR_SL)/pollring.so.o \ - $(OBJS_DIR_SL)/pollobj.so.o \ - $(OBJS_DIR_SL)/pollcmds.so.o \ - $(OBJS_DIR_SL)/dserverpoll.so.o \ - $(OBJS_DIR_SL)/pollthread.so.o \ - $(OBJS_DIR_SL)/dserverlock.so.o \ - $(OBJS_DIR_SL)/logcmds.so.o \ - $(OBJS_DIR_SL)/logstream.so.o \ - $(OBJS_DIR_SL)/devicelog.so.o \ - $(OBJS_DIR_SL)/logging.so.o \ - $(OBJS_DIR_SL)/dserverlog.so.o \ - $(OBJS_DIR_SL)/coutappender.so.o \ - $(OBJS_DIR_SL)/tangoappender.so.o \ - $(OBJS_DIR_SL)/tangorollingfileappender.so.o \ - $(OBJS_DIR_SL)/eventsupplier.so.o \ - $(OBJS_DIR_SL)/notifdeventsupplier.so.o \ - $(OBJS_DIR_SL)/zmqeventsupplier.so.o \ - $(OBJS_DIR_SL)/eventcmds.so.o \ - $(OBJS_DIR_SL)/utils_polling.so.o \ - $(OBJS_DIR_SL)/utils_shut.so.o \ - $(OBJS_DIR_SL)/subdev_diag.so.o \ - $(OBJS_DIR_SL)/encoded_attribute.so.o \ - $(OBJS_DIR_SL)/classpipe.so.o \ - $(OBJS_DIR_SL)/jpeg_bitstream.so.o \ - $(OBJS_DIR_SL)/jpeg_color.so.o \ - $(OBJS_DIR_SL)/jpeg_color_mmx.so.o \ - $(OBJS_DIR_SL)/jpeg_dct.so.o \ - $(OBJS_DIR_SL)/jpeg_dct_mmx.so.o \ - $(OBJS_DIR_SL)/jpeg_decoder.so.o \ - $(OBJS_DIR_SL)/jpeg_encoder.so.o \ - $(OBJS_DIR_SL)/jpeg_memory.so.o - -CLIENT_OBJS_SL = $(OBJS_DIR_SL)/dbapi_base.so.o \ - $(OBJS_DIR_SL)/dbapi_history.so.o \ - $(OBJS_DIR_SL)/dbapi_class.so.o \ - $(OBJS_DIR_SL)/dbapi_datum.so.o \ - $(OBJS_DIR_SL)/dbapi_device.so.o \ - $(OBJS_DIR_SL)/dbapi_server.so.o \ - $(OBJS_DIR_SL)/dbapi_cache.so.o \ - $(OBJS_DIR_SL)/dbapi_serverdata.so.o \ - $(OBJS_DIR_SL)/devapi_attr.so.o \ - $(OBJS_DIR_SL)/devapi_base.so.o \ - $(OBJS_DIR_SL)/devapi_data.so.o \ - $(OBJS_DIR_SL)/devapi_datahist.so.o \ - $(OBJS_DIR_SL)/devapi_pipe.so.o \ - $(OBJS_DIR_SL)/api_util.so.o \ - $(OBJS_DIR_SL)/devapi_utils.so.o \ - $(OBJS_DIR_SL)/asynreq.so.o \ - $(OBJS_DIR_SL)/proxy_asyn.so.o \ - $(OBJS_DIR_SL)/proxy_asyn_cb.so.o \ - $(OBJS_DIR_SL)/cbthread.so.o \ - $(OBJS_DIR_SL)/lockthread.so.o \ - $(OBJS_DIR_SL)/group.so.o \ - $(OBJS_DIR_SL)/accessproxy.so.o \ - $(OBJS_DIR_SL)/dbapi_attribute.so.o \ - $(OBJS_DIR_SL)/attr_proxy.so.o \ - $(OBJS_DIR_SL)/apiexcept.so.o \ - $(OBJS_DIR_SL)/filedatabase.so.o \ - $(OBJS_DIR_SL)/event.so.o \ - $(OBJS_DIR_SL)/eventqueue.so.o \ - $(OBJS_DIR_SL)/notifdeventconsumer.so.o \ - $(OBJS_DIR_SL)/zmqeventconsumer.so.o \ - $(OBJS_DIR_SL)/eventkeepalive.so.o - -IDL_INCLUDE = tango.h - -HELPERS_INCLUDE = DeviceProxyHelper.h \ - PogoHelper.h \ - TangoExceptionsHelper.h \ - Xstring.h - -CLIENT_INCLUDE = apiexcept.h \ - cbthread.h \ - lockthread.h \ - dbapi.h \ - devapi.h \ - devasyn.h \ - filedatabase.h \ - group.h \ - accessproxy.h \ - eventconsumer.h \ - event.h \ - Database.h \ - DbDevice.h \ - ApiUtil.h \ - api_util.tpp \ - DeviceData.h \ - DeviceAttribute.h \ - DevicePipe.h \ - devapi_attr.tpp \ - devapi_pipe.tpp \ - devapi_utils.tpp \ - event.tpp \ - Connection.h \ - DeviceProxy.h \ - AttributeProxy.h \ - doc.h - -SERVER_INCLUDE = attrdesc.h \ - attribute.h \ - attribute.tpp \ - attrsetval.tpp \ - attribute_spec.tpp \ - attrmanip.h \ - attrprop.h \ - attrprop.tpp \ - auto_tango_monitor.h \ - basiccommand.h \ - blackbox.h \ - classattribute.h \ - classpipe.h \ - command.h \ - pipe.h \ - pipe.tpp \ - coutappender.h \ - coutbuf.h \ - device.h \ - device_2.h \ - device_3.h \ - device_3.tpp \ - device_4.h \ - device_5.h \ - deviceclass.h \ - devintr.h \ - dintrthread.h \ - dserver.h \ - dserverclass.h \ - dserversignal.h \ - eventsupplier.h \ - except.h \ - fwdattrdesc.h \ - fwdattribute.h \ - fwdattribute.tpp \ - fwdattribute_spec.tpp \ - log4tango.h \ - logcmds.h \ - logging.h \ - logstream.h \ - multiattribute.h \ - ntservice.h \ - pipedesc.h \ - pollcmds.h \ - pollext.h \ - pollext.tpp \ - pollobj.h \ - pollring.h \ - pollring.tpp \ - pollthread.h \ - pollthread.tpp \ - readers_writers_lock.h \ - rootattreg.h \ - seqvec.h \ - tango.h \ - tango_config.h \ - tango_const.h \ - tango_monitor.h \ - tangoappender.h \ - tangorollingfileappender.h \ - utils.h \ - utils.tpp \ - utils_spec.tpp \ - w32win.h \ - w_attribute.h \ - w_attribute.tpp \ - w_attrsetval.tpp \ - w_attribute_spec.tpp \ - w_pipe.h \ - w_pipe.tpp \ - subdev_diag.h \ - encoded_attribute.h \ - encoded_format.h - -#----------------------------------------------------------------- - -all: $(LIBNAME).$(AR_EXT) $(LIBNAME).$(SL_EXT) install_include install_link - - -# -# Rule for archive libary -# - -.SUFFIXES: .o .cpp -.cpp.o: - $(CC) $(CXXFLAGS) -c $< - -# -# Rule for shared library -# - -.SUFFIXES: .so.o .cpp -.cpp.so.o: - $(CC) $(CXXFLAGS_SL) -c $< -o $*.so.o - -# -# Rule for API files -# -$(OBJS_DIR)/%.o: $(SERVER_SRC)/%.cpp - @./cr_dir $(OBJS_DIR) - $(CC) $(CXXFLAGS) -c $< -o $(OBJS_DIR)/$*.o - -$(OBJS_DIR)/%.o: $(IDL_SRC)/%.cpp - @./cr_dir $(OBJS_DIR) - $(CC) $(CXXFLAGS) -c $< -o $(OBJS_DIR)/$*.o - -$(OBJS_DIR)/%.o: $(JPG_SRC)/%.cpp - @./cr_dir $(OBJS_DIR) - $(CC) $(CXXFLAGS) -c $< -o $(OBJS_DIR)/$*.o - -$(OBJS_DIR)/%.o: $(CLIENT_SRC)/%.cpp - @./cr_dir $(OBJS_DIR) - $(CC) $(CXXFLAGS) -c $< -o $(OBJS_DIR)/$*.o - -$(OBJS_DIR)/jpeg_color_mmx.o: $(JPG_SRC_MMX)/jpeg_color_mmx.cpp - @./cr_dir $(OBJS_DIR) - $(CC) $(CXXFLAGS) $(MMFLAG) -c $(JPG_SRC_MMX)/jpeg_color_mmx.cpp -o $(OBJS_DIR)/jpeg_color_mmx.o - -$(OBJS_DIR)/jpeg_dct_mmx.o: $(JPG_SRC_MMX)/jpeg_dct_mmx.cpp - @./cr_dir $(OBJS_DIR) - $(CC) $(CXXFLAGS) $(MMFLAG) -c $(JPG_SRC_MMX)/jpeg_dct_mmx.cpp -o $(OBJS_DIR)/jpeg_dct_mmx.o - -#----------------------------------------------------------------- - -$(OBJS_DIR_SL)/%.so.o: $(SERVER_SRC)/%.cpp - @./cr_dir $(OBJS_DIR_SL) - $(CC) $(CXXFLAGS_SL) -c $< -o $(OBJS_DIR_SL)/$*.so.o - -$(OBJS_DIR_SL)/%.so.o: $(IDL_SRC)/%.cpp - @./cr_dir $(OBJS_DIR_SL) - $(CC) $(CXXFLAGS_SL) -c $< -o $(OBJS_DIR_SL)/$*.so.o - -$(OBJS_DIR_SL)/%.so.o: $(JPG_SRC)/%.cpp - @./cr_dir $(OBJS_DIR_SL) - $(CC) $(CXXFLAGS_SL) -c $< -o $(OBJS_DIR_SL)/$*.so.o - -$(OBJS_DIR_SL)/%.so.o: $(CLIENT_SRC)/%.cpp - @./cr_dir $(OBJS_DIR_SL) - $(CC) $(CXXFLAGS_SL) -c $< -o $(OBJS_DIR_SL)/$*.so.o - -$(OBJS_DIR_SL)/jpeg_color_mmx.so.o: $(JPG_SRC_MMX)/jpeg_color_mmx.cpp - @./cr_dir $(OBJS_DIR) - $(CC) $(CXXFLAGS_SL) $(MMFLAG) -c $(JPG_SRC_MMX)/jpeg_color_mmx.cpp -o $(OBJS_DIR_SL)/jpeg_color_mmx.so.o - -$(OBJS_DIR_SL)/jpeg_dct_mmx.so.o: $(JPG_SRC_MMX)/jpeg_dct_mmx.cpp - @./cr_dir $(OBJS_DIR) - $(CC) $(CXXFLAGS_SL) $(MMFLAG) -c $(JPG_SRC_MMX)/jpeg_dct_mmx.cpp -o $(OBJS_DIR_SL)/jpeg_dct_mmx.so.o - - -#----------------------------------------------------------------- -# -# The archive libs -# - -$(LIBNAME).$(AR_EXT): $(IDL_OBJS) $(SERVER_OBJS) $(CLIENT_OBJS) - @./cr_dir $(INSTALL_BASE)/$(LIB_DIR) - $(AR) $(INSTALL_BASE)/$(LIB_DIR)/$(LIBNAME).$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS).$(AR_EXT) \ - $(IDL_OBJS) $(SERVER_OBJS) $(CLIENT_OBJS) - -# -# The shared libs -# - -ifndef macosx-darwin8 -$(LIBNAME).$(SL_EXT): $(IDL_OBJS_SL) $(SERVER_OBJS_SL) $(CLIENT_OBJS_SL) - @./cr_dir $(INSTALL_BASE)/$(LIB_DIR) - $(AR_SL) -o $(INSTALL_BASE)/$(LIB_DIR)/$(LIBNAME).$(SL_EXT).$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS) \ - $(VERS_OPT)$(LIBNAME).$(SL_EXT).$(MAJOR_VERS)$(MINOR_VERS_TMP) \ - $(IDL_OBJS_SL) $(SERVER_OBJS_SL) $(CLIENT_OBJS_SL) - -install_link: - d=`pwd` - cd $(INSTALL_BASE)/$(LIB_DIR); \ - rm $(LIBNAME).$(AR_EXT); ln -s $(LIBNAME).$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS).$(AR_EXT) $(LIBNAME).$(AR_EXT); \ - rm $(LIBNAME).$(SL_EXT); ln -s $(LIBNAME).$(SL_EXT).$(MAJOR_VERS) $(LIBNAME).$(SL_EXT); \ - rm $(LIBNAME).$(SL_EXT).$(MAJOR_VERS); ln -s $(LIBNAME).$(SL_EXT).$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS) $(LIBNAME).$(SL_EXT).$(MAJOR_VERS); \ - cd $d -else -# MacOSX has to link the shared library -$(LIBNAME).$(SL_EXT): $(IDL_OBJS_SL) $(SERVER_OBJS_SL) $(CLIENT_OBJS_SL) - @./cr_dir $(INSTALL_BASE)/$(LIB_DIR) - $(AR_SL) \ - -o $(INSTALL_BASE)/$(LIB_DIR)/$(LIBNAME).$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS).$(SL_EXT) \ - -install_name $(INSTALL_BASE)/$(LIB_DIR)/$(LIBNAME).$(MAJOR_VERS).$(SL_EXT) \ - $(IDL_OBJS_SL) $(SERVER_OBJS_SL) $(CLIENT_OBJS_SL) \ - -L$(OMNI_BASE)/lib -L$(LOG4TANGO_BASE)/lib \ - -llog4tango \ - -lomniORB4 \ - -lomniDynamic4 \ - -lomnithread \ - -lCOS4 - -# library versioning is not handled the same way under MacOSX -install_link: - d=`pwd` - cd $(INSTALL_BASE)/$(LIB_DIR); \ - rm $(LIBNAME).$(AR_EXT); ln -s $(LIBNAME).$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS).$(AR_EXT) $(LIBNAME).$(AR_EXT); \ - rm $(LIBNAME).$(SL_EXT); ln -s $(LIBNAME).$(MAJOR_VERS).$(SL_EXT) $(LIBNAME).$(SL_EXT); \ - rm $(LIBNAME).$(MAJOR_VERS).$(SL_EXT); ln -s $(LIBNAME).$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS).$(SL_EXT) $(LIBNAME).$(MAJOR_VERS).$(SL_EXT); \ - cd $d -endif - -install_include: - @./cr_dir $(INSTALL_BASE)/include - @./cr_dir $(INSTALL_BASE)/include/idl - @./cr_dir $(INSTALL_BASE)/include/V-1 - @./cr_dir $(INSTALL_BASE)/include/V-1/idl -# cp $(INSTALL_BASE)/include/*.h $(INSTALL_BASE)/include/V-1 -# cp $(INSTALL_BASE)/include/*.tpp $(INSTALL_BASE)/include/V-1 -# cp $(INSTALL_BASE)/include/idl/*.h $(INSTALL_BASE)/include/V-1/idl - cd server/idl; cp $(IDL_INCLUDE) $(INSTALL_BASE)/include/idl; cd ../.. - cd server; cp $(SERVER_INCLUDE) $(INSTALL_BASE)/include; cd .. - cd client/helpers; cp $(HELPERS_INCLUDE) $(INSTALL_BASE)/include; cd ../.. - cd client; cp $(CLIENT_INCLUDE) $(INSTALL_BASE)/include; cd .. - - -install_win32: - @./cr_dir $(INSTALL_BASE_WIN32)/include - @./cr_dir $(INSTALL_BASE_WIN32)/include/vc8 - @./cr_dir $(INSTALL_BASE_WIN32)/include/vc9 - @./cr_dir $(INSTALL_BASE_WIN32)/include/vc8/idl - @./cr_dir $(INSTALL_BASE_WIN32)/include/vc9/idl - @./cr_dir $(INSTALL_BASE_WIN32)/include/vc8/V-1 - @./cr_dir $(INSTALL_BASE_WIN32)/include/vc9/V-1 - @./cr_dir $(INSTALL_BASE_WIN32)/include/vc8/V-1/idl - @./cr_dir $(INSTALL_BASE_WIN32)/include/vc9/V-1/idl -# cp $(INSTALL_BASE_WIN32)/include/vc8/*.h $(INSTALL_BASE_WIN32)/include/vc8/V-1 -# cp $(INSTALL_BASE_WIN32)/include/vc9/*.h $(INSTALL_BASE_WIN32)/include/vc9/V-1 -# cp $(INSTALL_BASE_WIN32)/include/vc8/idl/*.h $(INSTALL_BASE_WIN32)/include/vc8/V-1/idl -# cp $(INSTALL_BASE_WIN32)/include/vc9/idl/*.h $(INSTALL_BASE_WIN32)/include/vc9/V-1/idl - cd server/idl; cp $(IDL_INCLUDE) $(INSTALL_BASE_WIN32)/include/vc8/idl; cd ../.. - cd server/idl; cp $(IDL_INCLUDE) $(INSTALL_BASE_WIN32)/include/vc9/idl; cd ../.. - cd server; cp $(SERVER_INCLUDE) $(INSTALL_BASE_WIN32)/include/vc8; cd .. - cd server; cp $(SERVER_INCLUDE) $(INSTALL_BASE_WIN32)/include/vc9; cd .. - cd client/helpers; cp $(HELPERS_INCLUDE) $(INSTALL_BASE_WIN32)/include/vc8; cd ../.. - cd client/helpers; cp $(HELPERS_INCLUDE) $(INSTALL_BASE_WIN32)/include/vc9; cd ../.. - cd client; cp $(CLIENT_INCLUDE) $(INSTALL_BASE_WIN32)/include/vc8; cd .. - cd client; cp $(CLIENT_INCLUDE) $(INSTALL_BASE_WIN32)/include/vc9; cd .. - - -# @./cr_dir $(INSTALL_BASE_WIN32)/lib -# cp win32/winnt_lib/tango_static/lib/tangod.$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS).lib $(INSTALL_BASE_WIN32)/lib -# cp win32/winnt_lib/tango_static/lib/tangod.$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS).pdb $(INSTALL_BASE_WIN32)/lib -# cp win32/winnt_lib/tango_static/lib/tango.$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS).lib $(INSTALL_BASE_WIN32)/lib - -# @./cr_dir $(INSTALL_BASE_WIN32)_dll/lib -# cp win32/winnt_lib/tango_dll/lib/tangod.$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS).lib $(INSTALL_BASE_WIN32)_dll/lib -# cp win32/winnt_lib/tango_dll/lib/tangod.$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS).pdb $(INSTALL_BASE_WIN32)_dll/lib -# cp win32/winnt_lib/tango_dll/lib/tango$(MAJOR_VERS)$(MINOR_VERS)$(PATCH_VERS)d.dll $(INSTALL_BASE_WIN32)_dll/lib -# cp win32/winnt_lib/tango_dll/lib/tango.$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS).lib $(INSTALL_BASE_WIN32)_dll/lib -# cp win32/winnt_lib/tango_dll/lib/tango$(MAJOR_VERS)$(MINOR_VERS)$(PATCH_VERS).dll $(INSTALL_BASE_WIN32)_dll/lib - -# d=`pwd` -# cd $(INSTALL_BASE_WIN32)/lib; \ -# rm tangod.lib; ln -s tangod.$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS).lib tangod.lib; \ -# rm tango.lib; ln -s tango.$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS).lib tango.lib; \ - -# cd $(INSTALL_BASE_WIN32)_dll/lib; \ -# rm tangod.lib; ln -s tangod.$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS).lib tangod.lib; \ -# rm tango.lib; ln -s tango.$(MAJOR_VERS).$(MINOR_VERS).$(PATCH_VERS).lib tango.lib; \ -# cd $d - - -doc: - cd server; $(GEN_DOC); cd .. - -clean: - rm -f *.o core - rm -f $(OBJS_DIR_SL)/*.o - rm -f $(OBJS_DIR)/*.o - -clean_all: - rm -f *.o - rm -f test/*.html - rm -f test/solaris/*.html - rm -f test/suse72/*.html - rm -f test/*.log - rm -f test/solaris/*.log - rm -f test/suse72/*log - rm -f winnt_lib/tango_static/Debug/*.obj - rm -f winnt_lib/tango_static/Debug/*.lib - rm -f winnt_lib/tango_static/Release/*.obj - rm -f winnt_lib/tango_static/Release/*.lib - rm -f winnt_lib/tango_dll/Debug/*.obj - rm -f winnt_lib/tango_dll/Debug/*.lib - rm -f winnt_lib/tango_dll/Debug/*.dll - rm -f winnt_lib/tango_dll/Debug/*.exp - rm -f winnt_lib/tango_dll/Debug/*.map - rm -f winnt_lib/tango_dll/Release/*.obj - rm -f winnt_lib/tango_dll/Release/*.lib - rm -f winnt_lib/tango_dll/Release/*.dll - rm -f winnt_lib/tango_dll/Release/*.exp - rm -f winnt_lib/tango_dll/Release/*.map diff --git a/cppapi/client/CMakeLists.txt b/cppapi/client/CMakeLists.txt deleted file mode 100644 index 24c892043..000000000 --- a/cppapi/client/CMakeLists.txt +++ /dev/null @@ -1,64 +0,0 @@ -set(SOURCES dbapi_class.cpp - dbapi_server.cpp - dbapi_datum.cpp - dbapi_base.cpp - dbapi_device.cpp - dbapi_history.cpp - dbapi_attribute.cpp - dbapi_cache.cpp - dbapi_serverdata.cpp - devapi_attr.cpp - devapi_base.cpp - devapi_data.cpp - devapi_datahist.cpp - devapi_utils.cpp - devapi_pipe.cpp - api_util.cpp - asynreq.cpp - cbthread.cpp - proxy_asyn.cpp - proxy_asyn_cb.cpp - attr_proxy.cpp - group.cpp - filedatabase.cpp - apiexcept.cpp - accessproxy.cpp - lockthread.cpp - event.cpp - eventkeepalive.cpp - eventqueue.cpp - notifdeventconsumer.cpp - zmqeventconsumer.cpp) - -set(HEADERS accessproxy.h - apiexcept.h - cbthread.h - dbapi.h - devapi.h - devasyn.h - event.h - eventconsumer.h - filedatabase.h - group.h - lockthread.h - Database.h - DbDevice.h - ApiUtil.h - DeviceData.h - DeviceAttribute.h - DevicePipe.h - Connection.h - DeviceProxy.h - AttributeProxy.h - event.tpp - devapi_attr.tpp - devapi_utils.tpp - api_util.tpp - devapi_pipe.tpp) - -add_subdirectory(helpers) - -add_library(client_objects OBJECT ${SOURCES}) -target_compile_options(client_objects PRIVATE -fPIC) - -install(FILES ${HEADERS} DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}") \ No newline at end of file diff --git a/cppapi/client/DevicePipe.h b/cppapi/client/DevicePipe.h deleted file mode 100644 index 534e0ab74..000000000 --- a/cppapi/client/DevicePipe.h +++ /dev/null @@ -1,1625 +0,0 @@ -//=================================================================================================================== -// -// DevicePipe.h - include file for TANGO device api class DevicePipe -// -// -// Copyright (C) : 2014,2015 -// European Synchrotron Radiation Facility -// BP 220, Grenoble 38043 -// FRANCE -// -// This file is part of Tango. -// -// Tango is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Tango is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty -// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License along with Tango. -// If not, see . -// -// $Revision$ -// -//=================================================================================================================== - -#ifndef _DEVICEPIPE_H -#define _DEVICEPIPE_H - -/** - * Fundamental type for extracting data from a device pipe blob - * - * This is the fundamental type for extracting data from a device pipe blob - * - * $Author$ - * $Revision$ - * - * @headerfile tango.h - * @ingroup Client - */ - -template -struct DataElement -{ -/** - * Create a DataElement object. - * - * Create a DataElement object for device pipe blob extraction - * - * @param [in] name The data element name - * @param [in] value The data element value - */ - DataElement(const string &name,T value); -/** - * Create a DataElement object. - * - * Create a DataElement object for device pipe blob extraction - * - * @param [in] name The data element name - */ - DataElement(const string &name); -/** - * Create a DataElement object. - * - * Create a DataElement object for device pipe blob extraction. Usefull for extraction into TANGO CORBA - * sequence. See DevicePipeBlob extraction method - * - * @param [in] value The data element value - */ - DataElement(T value); - - DataElement(); - - string name; ///< The data element name - T value; ///< The data element value -}; - -template -DataElement::DataElement(const string &_na,T _val):name(_na),value(_val) -{ -} - -template -DataElement::DataElement(const string &_na):name(_na) -{ -} - -template -DataElement::DataElement(T _val):value(_val) -{ -} - -template -DataElement::DataElement() -{ -} - -/** - * A device pipe blob - * - * A device pipe blob. A blob is used to pack data to be sent through device pipe - * - * $Author$ - * $Revision$ - * - * @headerfile tango.h - * @ingroup Client - */ - -class DevicePipeBlob -{ -public: -///@privatesection - - enum except_flags - { - isempty_flag, - wrongtype_flag, - notenoughde_flag, - blobdenamenotset_flag, - mixing_flag, - numFlags - }; - -///@publicsection -/**@name Constructors */ -//@{ -/** - * Create a DevicePipeBlob object. - * - * Default constructor. - * - */ - DevicePipeBlob(); -/** - * Create a DevicePipeBlob object with name - * - * Create one instance of the DevicePipeBlob class and set its name - * - * @param [in] blob_name The blob name - */ - DevicePipeBlob(const string &blob_name); -//@} - -/**@name Get/Set methods */ -//@{ -/** - * Set blob name - * - * Set the blob name - * - * @param [in] blob_name The blob name - */ - void set_name(const string &blob_name) {name=blob_name;} -/** - * Get blob name - * - * Get the blob name - * - * @return The blob name - */ - const string &get_name() {return name;} -//@} - - -/**@name Inserting data into a DevicePipeBlob - */ -//@{ -/** - * Insert data into a data blob - * - * According to the data to be inserted into the blob data element, several kinds of insetor methods have been - * implemented. You can insert data from: - * @li Scalar data type - * @li vector - * @li TANGO CORBA sequence types (by reference) - * @li TANGO CORBA sequence types (by pointer) - * @li DataElement with T being scalar data type - * @li DataElement with T being vector - * @li DataElement with T being TANGO CORBA sequence type (by reference) - * @li DataElement with T being TANGO CORBA sequence type (by pointer) - * - * When inserting data using a DataElement instance, the data element name is also set. - * For insertion from TANGO CORBA sequence type pointer, the insertion method consumes the - * memory allocated to store the data and it will be freed by the Tango layer. - * - * Insert operators for the following scalar C++ types (and DataElement) - * @li bool - * @li short - * @li DevLong - * @li DevLong64 - * @li float - * @li double - * @li unsigned char - * @li unsigned short - * @li DevULong - * @li DevULong64 - * @li DevString - * @li string - * @li DevState - * @li DevEncoded - * - * Insert operators for the following C++ vector types (and DataElement) - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * - * Insert operators for the following CORBA sequence types (and DataElement): - * @li DevVarBooleanArray & - * @li DevVarShortArray & - * @li DevVarLongArray & - * @li DevVarLong64Array & - * @li DevVarFloatArray & - * @li DevVarDoubleArray & - * @li DevVarUCharArray & - * @li DevVarUShortArray & - * @li DevVarULongArray & - * @li DevVarULong64Array & - * @li DevVarStringArray & - * @li DevVarStateArray & - * - * Insert operators for the following CORBA sequence types with memory consumption (and DataElement): - * @li DevVarBooleanArray * - * @li DevVarShortArray * - * @li DevVarLongArray * - * @li DevVarLong64Array * - * @li DevVarFloatArray * - * @li DevVarDoubleArray * - * @li DevVarUCharArray * - * @li DevVarUShortArray * - * @li DevVarULongArray * - * @li DevVarULong64Array * - * @li DevVarStringArray * - * @li DevVarStateArray * - * - * Here is an example of inserting data into a DevicePipeBlob instance. We insert - * 3 data element into the pipe blob with a DevLong, a vector of doubles and finally an array of 100 unsigned short - * @code - * DevicePipeBlob dpb("MyBlob"); - * - * vector de_names = {"FirstDE","SecondDE","ThirdDE"}; - * dpb.set_data_elt_names(de_names); - * - * DevLong dl = 666; - * vector v_db = {1.11,2.22}; - * unsigned short *array = new unsigned short [100]; // The array is populated by a way or another - * - * DevVarUShortArray *dvush = create_DevVarUShortArray(array,100); - * - * try - * { - * dpb << dl << v_db << dvush; - * } - * catch (DevFailed &e) - * { - * cout << "DevicePipeBlob insertion failed" << endl; - * .... - * } - * - * @endcode - * The same example of inserting data into a DevicePipeBlob instance when we want to set the data element name. - * @code - * DevicePipeBlob dpb("MyBlob"); - * - * DataElement de_dl("FirstDE",666); - * - * vector v_db = {1.11,2.22}; - * DataElement > de_v_db("SecondDE",v_db); - * - * unsigned short *array = new unsigned short [100]; // The array is populated by a way or another - * DevVarUShortArray *dvush = create_DevVarUShortArray(array,100); - * DataElement de_dvush("ThirdDE",array); - * - * try - * { - * dpb << de_dl << de_v_db << de_dvush; - * } - * catch (DevFailed &e) - * { - * cout << "DevicePipeBlob insertion failed" << endl; - * .... - * } - * - * ... - * @endcode - * It is also possible to do the insertion in a third way - * @code - * DevicePipeBlob dpb("MyBlob"); - * - * vector de_names{"FirstDE","SecondDE","ThirdDE"}; - * dpb.set_data_elt_names(de_names); - * - * DevLong dl = 666; - * vector v_db = {1.11,2.22}; - * unsigned short *array = new unsigned short [100]; // The array is populated by a way or another - * - * DevVarUShortArray *dvush = create_DevVarUShortArray(array,100); - * - * dpb["FirstDE"] << dl; - * dpb["SecondDE"] << v_db; - * dpb["ThirdDE"] << dvush; - * - * @endcode - * - * @param [in] datum The data to be inserted into the DevicePipeBlob - * @exception WrongData if requested - */ - DevicePipeBlob & operator << (short &datum); -/** - * Set blob data element number - * - * Set the blob data element number - * - * @param [in] nb The blob data element number - */ - void set_data_elt_nb(size_t nb); -/** - * Set blob data element number and names - * - * Set the blob data element number and names. The data element number is the number of names in the input - * parameter. - * - * @param [in] names The blob data element names - */ - void set_data_elt_names(vector &names); -//@} - -/**@name Extracting data from a DevicePipeBlob - */ -//@{ -/** - * Extract data from a data blob - * - * According to the data inside blob data element, several kinds of extractor methods have been implemented. You - * can extract data into: - * @li Scalar data type - * @li vector - * @li TANGO CORBA sequence types - * @li DataElement with T being scalar data type - * @li DataElement with T being vector - * @li DataElement with T being TANGO CORBA sequence type - * - * When extracting data using a DataElement instance, the data element name is also returned. - * For extraction into C++ vector, data are copied into the vector. It is not the case for extraction into TANGO - * CORBA sequence type. For extraction into TANGO CORBA sequence types, the extraction method consumes the - * memory allocated to store the data and it is the caller responsibility to delete this memory. - * - * Extract operators for the following scalar C++ types (and DataElement) - * @li bool - * @li short - * @li DevLong - * @li DevLong64 - * @li float - * @li double - * @li unsigned char - * @li unsigned short - * @li DevULong - * @li DevULong64 - * @li string - * @li DevState - * @li DevEncoded - * - * Extract operators for the following C++ vector types (and DataElement) - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * @li vector - * - * Extract operators for the following CORBA sequence types with memory consumption (and DataElement): - * @li DevVarBooleanArray * - * @li DevVarShortArray * - * @li DevVarLongArray * - * @li DevVarLong64Array * - * @li DevVarFloatArray * - * @li DevVarDoubleArray * - * @li DevVarUCharArray * - * @li DevVarUShortArray * - * @li DevVarULongArray * - * @li DevVarULong64Array * - * @li DevVarStringArray * - * @li DevVarStateArray * - * - * Here is an example of extracting data from a DevicePipeBlob instance. We know that the DevicePipeBlob contains - * 3 data element with a DevLong, an array of doubles and finally an array of unsigned short - * @code - * DevicePipeBlob dpb = ..... - * - * DevLong dl; - * vector v_db; - * DevVarUShortArray *dvush = new DevVarUShortArray(); - * - * try - * { - * dpb >> dl >> v_db >> dvush; - * } - * catch (DevFailed &e) - * { - * cout << "DevicePipeBlob extraction failed" << endl; - * .... - * } - * - * delete dvush; - * @endcode - * The same example of extracting data from a DevicePipeBlob instance when we want to retrieve the data element name. - * @code - * DevicePipeBlob dpb = ..... - * - * DataElement de_dl; - * DataElement > de_v_db; - * DataElement de_dvush(new DevVarUShortArray()); - * - * try - * { - * dpb >> de_dl >> de_v_db >> de_dvush; - * } - * catch (DevFailed &e) - * { - * cout << "DevicePipeBlob extraction failed" << endl; - * .... - * } - * - * cout << "Data element name = " << de_dl.name << " - Value = " << de_dl.value << endl; - * ... - * delete de_dvush.value; - * @endcode - * It is also possible to do the extraction in a generic way - * @code - * DevicePipeBlob dpb = ..... - * - * size_t nb_de = dpb.get_data_elt_nb(); - * for (size_t loop = 0;loop < nb;loop++) - * { - * int data_type = dpb.get_data_elt_type(loop); - * string de_name = dpb.get_data_elt_name(loop); - * switch(data_type) - * { - * case DEV_LONG: - * { - * DevLong lg; - * dpb >> lg; - * } - * break; - * - * case DEVVAR_DOUBLEARRAY: - * { - * vector v_db; - * dpb >> v_db; - * } - * break; - * .... - * } - * ... - * } - * @endcode - * Note that instead of using DevLong and vector data, the extraction can be done using DataElement - * instances. In this case, the call to the get_data_elt_name() method becomes useless. - * - * @param [out] datum The blob data - * @exception WrongData if requested - */ - DevicePipeBlob & operator >> (short &datum); -/** - * Get blob data element number - * - * Get the blob data element number - * - * @return The blob data element number - */ - size_t get_data_elt_nb(); -/** - * Get blob data elements name - * - * Get the blob data elements name - * - * @return The blob data elements name - */ - vector get_data_elt_names(); -/** - * Get blob data element name - * - * Get the blob data element name for a single data element - * - * @param [in] ind The data element index within the blob - * @return The blob data element name - */ - string get_data_elt_name(size_t ind); -/** - * Get blob data element value type - * - * Get the blob data element value type for a single data element - * - * @param [in] ind The data element index within the blob - * @return The blob data element value type - */ - int get_data_elt_type(size_t ind); -//@} - -/**@name Exception and error related methods methods - */ -//@{ -/** - * Set exception flag - * - * It's a method which allows the user to switch on/off exception throwing when trying to extract data from a - * DevicePipeBlob object. The following flags are supported : - * @li @b isempty_flag - throw a WrongData exception (reason = API_EmptyDataElement) if user - * tries to extract data from one empty blob data element. By default, this flag - * is set - * @li @b wrongtype_flag - throw a WrongData exception (reason = API_IncompatibleArgumentType) if user - * tries to extract data with a type different than the type used for insertion. By default, this flag - * is set - * @li @b notenoughde_flag - throw a WrongData exception (reason = API_PipeWrongArg) if user - * tries to extract data from a DevicePipeBlob for a data element which does not exist. By default, this flag - * is set - * @li @b blobdenamenotset_flag - Throw a WrongData exception (reason = API_PipeNoDataElement) if user tries to - * insert data into the blob while the name or number of data element has not been set with methods - * set_data_elt_nb() or set_data_elt_names() - * @li @b mixing_flag - Throw a WrongData exception (reason = API_NotSupportedFeature) if user tries to mix - * insertion/extraction method (<< or >>) with operator[] - * - * @param [in] fl The exception flag - */ - void exceptions(bitset fl) {exceptions_flags = fl;} -/** - * Get exception flag - * - * Returns the whole exception flags. - * The following is an example of how to use these exceptions related methods - * @code - * DevicePipeBlob dpb; - * - * bitset bs = dpb.exceptions(); - * cout << "bs = " << bs << endl; - * - * dpb.set_exceptions(DevicePipeBlob::wrongtype_flag); - * bs = dpb.exceptions(); - * - * cout << "bs = " << bs << endl; - * @endcode - * - * @return The exception flag - */ - bitset exceptions() {return exceptions_flags;} -/** - * Reset one exception flag - * - * Resets one exception flag - * - * @param [in] fl The exception flag - */ - void reset_exceptions(except_flags fl) {exceptions_flags.reset((size_t)fl);} -/** - * Set one exception flag - * - * Sets one exception flag. See DevicePipeBlob::exceptions() for a usage example. - * - * @param [in] fl The exception flag - */ - void set_exceptions(except_flags fl) {exceptions_flags.set((size_t)fl);} -/** - * Check insertion/extraction success - * - * Allow the user to check if insertion/extraction into/from DevicePipeBlob instance was successfull. This - * method has to be used when exceptions are disabled. - * - * @return True if insertion/extraction has failed - */ - bool has_failed(); -/** - * Get instance insertion/extraction state - * - * Allow the user to find out what was the reason of insertion/extraction into/from DevicePipeBlob failure. This - * method has to be used when exceptions are disabled. - * Here is an example of how methods has_failed() and state() could be used - * @code - * DevicePipeBlob dpb = .... - * - * bitset bs; - * bs.reset(); - * dpb.exceptions(bs); - * - * DevLong dl; - * dpb >> dl; - * - * if (dpb.has_failed() == true) - * { - * bitset bs_err = dpb.state(); - * if (bs_err.test(DevicePipeBlob::isempty_flag) == true) - * ..... - * } - * @endcode - * - * @return The error bit set. - */ - bitset state() {return ext_state;} -//@} - -///@privatesection - ~DevicePipeBlob(); - DevicePipeBlob(const DevicePipeBlob &); - DevicePipeBlob & operator=(const DevicePipeBlob &); -#ifdef HAS_RVALUE - DevicePipeBlob(DevicePipeBlob &&); - DevicePipeBlob & operator=(DevicePipeBlob &&); -#endif - - DevicePipeBlob & operator << (DevBoolean &); -// DevicePipeBlob & operator << (short &); - DevicePipeBlob & operator << (DevLong &); - DevicePipeBlob & operator << (DevLong64 &); - DevicePipeBlob & operator << (float &); - DevicePipeBlob & operator << (double &); - DevicePipeBlob & operator << (DevUChar &); - DevicePipeBlob & operator << (DevUShort &); - DevicePipeBlob & operator << (DevULong &); - DevicePipeBlob & operator << (DevULong64 &); - DevicePipeBlob & operator << (DevString &); - DevicePipeBlob & operator << (DevState &); - DevicePipeBlob & operator << (DevEncoded &); - DevicePipeBlob & operator << (const string &); - - DevicePipeBlob & operator << (DevicePipeBlob &); - - DevicePipeBlob & operator << (vector &); - DevicePipeBlob & operator << (vector &); - DevicePipeBlob & operator << (vector &); - DevicePipeBlob & operator << (vector &); - DevicePipeBlob & operator << (vector &); - DevicePipeBlob & operator << (vector &); - DevicePipeBlob & operator << (vector &); - DevicePipeBlob & operator << (vector &); - DevicePipeBlob & operator << (vector &); - DevicePipeBlob & operator << (vector &); - DevicePipeBlob & operator << (vector &); - DevicePipeBlob & operator << (vector &); - DevicePipeBlob & operator << (vector &); - DevicePipeBlob & operator << (vector &); - - DevicePipeBlob & operator << (DevVarBooleanArray &); - DevicePipeBlob & operator << (DevVarShortArray &); - DevicePipeBlob & operator << (DevVarLongArray &); - DevicePipeBlob & operator << (DevVarLong64Array &); - DevicePipeBlob & operator << (DevVarFloatArray &); - DevicePipeBlob & operator << (DevVarDoubleArray &); - DevicePipeBlob & operator << (DevVarUCharArray &); - DevicePipeBlob & operator << (DevVarUShortArray &); - DevicePipeBlob & operator << (DevVarULongArray &); - DevicePipeBlob & operator << (DevVarULong64Array &); - DevicePipeBlob & operator << (DevVarStringArray &); - DevicePipeBlob & operator << (DevVarStateArray &); - DevicePipeBlob & operator << (DevVarEncodedArray &); - - DevicePipeBlob & operator << (DevVarBooleanArray *); - DevicePipeBlob & operator << (DevVarShortArray *); - DevicePipeBlob & operator << (DevVarLongArray *); - DevicePipeBlob & operator << (DevVarLong64Array *); - DevicePipeBlob & operator << (DevVarFloatArray *); - DevicePipeBlob & operator << (DevVarDoubleArray *); - DevicePipeBlob & operator << (DevVarUCharArray *); - DevicePipeBlob & operator << (DevVarUShortArray *); - DevicePipeBlob & operator << (DevVarULongArray *); - DevicePipeBlob & operator << (DevVarULong64Array *); - DevicePipeBlob & operator << (DevVarStringArray *); - DevicePipeBlob & operator << (DevVarStateArray *); - DevicePipeBlob & operator << (DevVarEncodedArray *); - -//------------------------------------------------------------------------------------------------- - - DevicePipeBlob & operator >> (DevBoolean &); -// DevicePipeBlob & operator >> (short &); - DevicePipeBlob & operator >> (DevLong &); - DevicePipeBlob & operator >> (DevLong64 &); - DevicePipeBlob & operator >> (float &); - DevicePipeBlob & operator >> (double &); - DevicePipeBlob & operator >> (DevUChar &); - DevicePipeBlob & operator >> (DevUShort &); - DevicePipeBlob & operator >> (DevULong &); - DevicePipeBlob & operator >> (DevULong64 &); - DevicePipeBlob & operator >> (DevString &); - DevicePipeBlob & operator >> (DevState &); - DevicePipeBlob & operator >> (DevEncoded &); - DevicePipeBlob & operator >> (string &); - - DevicePipeBlob & operator >> (DevicePipeBlob &); - - DevicePipeBlob & operator >> (vector &); - DevicePipeBlob & operator >> (vector &); - DevicePipeBlob & operator >> (vector &); - DevicePipeBlob & operator >> (vector &); - DevicePipeBlob & operator >> (vector &); - DevicePipeBlob & operator >> (vector &); - DevicePipeBlob & operator >> (vector &); - DevicePipeBlob & operator >> (vector &); - DevicePipeBlob & operator >> (vector &); - DevicePipeBlob & operator >> (vector &); - DevicePipeBlob & operator >> (vector &); - DevicePipeBlob & operator >> (vector &); -// DevicePipeBlob & operator >> (vector &); - - DevicePipeBlob & operator >> (DevVarBooleanArray *); - DevicePipeBlob & operator >> (DevVarShortArray *); - DevicePipeBlob & operator >> (DevVarLongArray *); - DevicePipeBlob & operator >> (DevVarLong64Array *); - DevicePipeBlob & operator >> (DevVarFloatArray *); - DevicePipeBlob & operator >> (DevVarDoubleArray *); - DevicePipeBlob & operator >> (DevVarUCharArray *); - DevicePipeBlob & operator >> (DevVarUShortArray *); - DevicePipeBlob & operator >> (DevVarULongArray *); - DevicePipeBlob & operator >> (DevVarULong64Array *); - DevicePipeBlob & operator >> (DevVarStringArray *); - DevicePipeBlob & operator >> (DevVarStateArray *); - DevicePipeBlob & operator >> (DevVarEncodedArray *); - - DevicePipeBlob &operator[](const string &); - - const char *get_current_delt_name() {return (*extract_elt_array)[extract_ctr].name.in();} - void set_current_delt_name(const string &); - - size_t get_extract_ind_from_name(const string &); - size_t get_insert_ind_from_name(const string &); - - void reset_insert_ctr() {insert_ctr=0;} - DevVarPipeDataEltArray *get_insert_data() {return insert_elt_array;} - const DevVarPipeDataEltArray *get_extract_data() {return extract_elt_array;} - - void set_extract_data(const DevVarPipeDataEltArray *_ptr) {extract_elt_array=_ptr;} - void reset_insert_data_ptr() {insert_elt_array=Tango_nullptr;} - - void reset_extract_ctr() {extract_ctr=0;} - void set_extract_delete(bool _b) {extract_delete=_b;} - - void print(ostream &,int,bool); - -protected: -///@privatesection - void throw_type_except(const string &,const string &); - void throw_too_many(const string &,bool); - void throw_is_empty(const string &); - void throw_name_not_set(const string &); - void throw_mixing(const string &); - -private: - string name; // The blob name - bitset exceptions_flags; // Exception flag - bitset ext_state; // Extraction state - bool failed; // Failed flag - - DevVarPipeDataEltArray *insert_elt_array; // Ptr for data to be inserted (client write/Server read) - int insert_ctr; // Ctr for inserting data elt - int insert_ind; - - const DevVarPipeDataEltArray *extract_elt_array; // Ptr for data to be extracted (client read/Server write) - int extract_ctr; // Ctr for extracting data elt - bool extract_delete; // Flag to force extract ptr delete - int extract_ind; - - class DevicePipeBlobExt - { - public: - DevicePipeBlobExt() {}; - }; - -#ifdef HAS_UNIQUE_PTR - unique_ptr ext; -#else - DevicePipeBlobExt *ext; // Class extension -#endif -}; - - -/**************************************************************************************** - * * - * The DevicePipe class * - * -------------------- * - * * - ***************************************************************************************/ - - -/** - * Fundamental type for sending/receiving data from device pipes - * - * This is the fundamental type for sending/receiving data to/from device pipe. - * - * $Author$ - * $Revision$ - * - * @headerfile tango.h - * @ingroup Client - */ - -class DevicePipe -{ - -public : - -///@publicsection -/**@name Constructors */ -//@{ -/** - * Create a DevicePipe object. - * - * Default constructor. The instance is empty - * - */ - DevicePipe(); -/** - * Create a DevicePipe object with name - * - * Create one instance of the DevicePipe class and set its name - * - * @param [in] pipe_name The pipe name - */ - DevicePipe(const string &pipe_name); -/** - * Create a DevicePipe object with name and root blob name. - * - * Create one instance of the DevicePipe class and set its name and its root blob name - * - * @param [in] pipe_name The pipe name - * @param [in] root_blob_name The root blob name - */ - DevicePipe(const string &pipe_name,const string &root_blob_name); -//@} - -/**@name Get/Set methods */ -//@{ -/** - * Set pipe name - * - * Set the device pipe name - * - * @param [in] pipe_name The pipe name - */ - void set_name(const string &pipe_name) {name=pipe_name;} -/** - * Get pipe name - * - * Set the device pipe name - * - * @return The pipe name - */ - const string &get_name() {return name;} - -/** - * Set root blob name - * - * Set the root blob name - * - * @param [in] root_blob_name The root blob name - */ - void set_root_blob_name(const string &root_blob_name) {the_root_blob.set_name(root_blob_name);} -/** - * Get root blob name - * - * Get the root blob name - * - * @return The root blob name - */ - const string &get_root_blob_name() {return the_root_blob.get_name();} -//@} - -/**@name Inserting data into a DevicePipe - */ -//@{ -#ifdef GEN_DOC -/** - * Insert data into a device pipe - * - * Inserting data into a DevicePipe instance is simlar to inserting data into a DevicePipeBlob class instance. - * See doc of DevicePipeBlob class insertion methods (DevicePipeBlob::operator<<) to get a complete documentation on - * how to insert data into a DevicePipe - * - * @param [in] datum The data to be inserted into the DevicePipe - * @exception WrongData if requested - */ - DevicePipe & operator << (short &datum); -#endif -/** - * Set blob data element number - * - * Set the blob data element number - * - * @param [in] nb The blob data element number - */ - void set_data_elt_nb(size_t nb) {the_root_blob.set_data_elt_nb(nb);} -/** - * Set blob data element number and names - * - * Set the blob data element number and names. The data element number is the number of names in the input - * parameter. - * - * @param [in] names The blob data element names - */ - void set_data_elt_names(vector &names) {the_root_blob.set_data_elt_names(names);} -//@} - -/**@name Extracting data from a DevicePipe - */ -//@{ -#ifdef GEN_DOC -/** - * Extract data from a device pipe - * - * Extracting data from a DevicePipe instance is simlar to extracting data from a DevicePipeBlob class instance. - * See doc of DevicePipeBlob class extraction methods (DevicePipeBlob::operator>>) to get a complete documentation on - * how to extract data from a DevicePipe - * - * @param [in] datum The pipe data - * @exception WrongData if requested - */ - DevicePipe & operator >> (short &datum); -#endif -/** - * Get root blob data element number - * - * Get the root blob data element number - * - * @return The root blob data element number - */ - size_t get_data_elt_nb() {return the_root_blob.get_data_elt_nb();} -/** - * Get root blob data elements name - * - * Get the root blob data elements name - * - * @return The root blob data elements name - */ - vector get_data_elt_names() {return the_root_blob.get_data_elt_names();} -/** - * Get root blob data element name - * - * Get root blob data element name for a single data element - * - * @param [in] ind The data element index within the root blob - * @return The root blob data element name - */ - string get_data_elt_name(size_t ind) {return the_root_blob.get_data_elt_name(ind);} -/** - * Get root blob data element value type - * - * Get root blob data element value type for a single data element - * - * @param [in] ind The data element index within the root blob - * @return The root blob data element value type - */ - int get_data_elt_type(size_t ind) {return the_root_blob.get_data_elt_type(ind);} -//@} - - -/**@name Exception and error related methods methods - */ -//@{ -/** - * Set exception flag - * - * It's a method which allows the user to switch on/off exception throwing when trying to insert/extract data from a - * DevicePipe object. The following flags are supported : - * @li @b isempty_flag - throw a WrongData exception (reason = API_EmptyDataElement) if user - * tries to extract data from one empty pipe data element. By default, this flag - * is set - * @li @b wrongtype_flag - throw a WrongData exception (reason = API_IncompatibleArgumentType) if user - * tries to extract data with a type different than the type used for insertion. By default, this flag - * is set - * @li @b notenoughde_flag - throw a WrongData exception (reason = API_PipeWrongArg) if user - * tries to extract data from a DevicePipe for a data element which does not exist. By default, this flag - * is set - * @li @b blobdenamenotset_flag - Throw a WrongData exception (reason = API_PipeNoDataElement) if user tries to - * insert data into the blob while the name or number of data element has not been set with methods - * set_data_elt_nb() or set_data_elt_names() - * @li @b mixing_flag - Throw a WrongData exception (reason = API_NotSupportedFeature) if user tries to mix - * insertion/extraction method (<< or >>) with operator[] - * - * @param [in] fl The exception flag - */ - void exceptions(bitset fl) {the_root_blob.exceptions(fl);} -/** - * Get exception flag - * - * Returns the whole exception flags. - * The following is an example of how to use these exceptions related methods - * @code - * DevicePipe dp; - * - * bitset bs = dp.exceptions(); - * cout << "bs = " << bs << endl; - * - * dp.set_exceptions(DevicePipeBlob::wrongtype_flag); - * bs = dp.exceptions(); - * - * cout << "bs = " << bs << endl; - * @endcode - * - * @return The exception flag - */ - bitset exceptions() {return the_root_blob.exceptions();} -/** - * Reset one exception flag - * - * Resets one exception flag - * - * @param [in] fl The exception flag - */ - void reset_exceptions(DevicePipeBlob::except_flags fl) {the_root_blob.reset_exceptions(fl);} -/** - * Set one exception flag - * - * Sets one exception flag. See DevicePipe::exceptions() for a usage example. - * - * @param [in] fl The exception flag - */ - void set_exceptions(DevicePipeBlob::except_flags fl) {the_root_blob.set_exceptions(fl);} -/** - * Check insertion/extraction success - * - * Allow the user to check if insertion/extraction into/from DevicePipe instance was successfull. This - * method has to be used when exceptions are disabled. - * - * @return True if insertion/extraction has failed - */ - bool has_failed() {return the_root_blob.has_failed();} -/** - * Get instance insertion/extraction state - * - * Allow the user to find out what was the reason of insertion/extraction into/from DevicePipe failure. This - * method has to be used when exceptions are disabled. - * Here is an example of how methods has_failed() and state() could be used - * @code - * DevicePipe dpb = .... - * - * bitset bs; - * bs.reset(); - * dpb.exceptions(bs); - * - * DevLong dl; - * dpb >> dl; - * - * if (dpb.has_failed() == true) - * { - * bitset bs_err = dpb.state(); - * if (dpb.test(DevicePipeBlob::isempty_flag) == true) - * ..... - * } - * @endcode - * - * @return The error bit set. - */ - bitset state() {return the_root_blob.state();} -//@} - -/** - * Print a DevicePipe instance - * - * Is an utility function to easily print the contents of a DevicePipe object. This function knows all types - * which could be inserted in a DevicePipe object and print them accordingly. A special string is printed if - * the DevicePipe object is empty - * @code - * DeviceProxy *dev = new DeviceProxy(“...â€); - * DevicePipe out; - * - * out = dev->read_pipe(“MyPipeâ€); - * cout << “Pipe content: †<< out << endl; - * @endcode - * - * @param [in] str The printing stream - * @param [in] dd The instance to be printed - */ - friend ostream &operator<<(ostream &str,DevicePipe &dd); - -public : -///@privatesection - DevicePipe(const DevicePipe &); - DevicePipe & operator=(const DevicePipe &); -#ifdef HAS_RVALUE - DevicePipe(DevicePipe &&); - DevicePipe & operator=(DevicePipe &&); -#endif - ~DevicePipe(); - - void set_time(TimeVal &_ti) {time=_ti;} - DevicePipeBlob &get_root_blob() {return the_root_blob;} - - DevicePipe &operator[](const string &); - -private: - DevicePipeBlob the_root_blob; // Root blob - string name; // Pipe name - TimeVal time; // When pipe has been read - - class DevicePipeExt - { - public: - DevicePipeExt() {}; - }; - -#ifdef HAS_UNIQUE_PTR - unique_ptr ext; -#else - DevicePipeExt *ext; // Class extension -#endif -}; - -/**************************************************************************************** - * * - * Some DevicePipe, DevicePipeBlob and DataElement helper functions * - * ---------------------------------------------------------------- * - * * - ***************************************************************************************/ - -DevicePipe &operator>>(DevicePipe &_dp,char *&datum); - -// -// For DataElement printing -// - -template -ostream &operator<<(ostream &,DataElement &); - -template -ostream &operator<<(ostream &,DataElement > &); - -template -ostream &operator<<(ostream &,DataElement &); - -// -// For DevicePipe insertion -// - -template -DevicePipe &operator<<(DevicePipe &,T &); - -template -DevicePipe &operator<<(DevicePipe &,T *); - -template -DevicePipe &operator<<(DevicePipe &, DataElement &); - -// -// For DevicePipe extraction -// - -template -DevicePipe &operator>>(DevicePipe &,T &); - -template -DevicePipe &operator>>(DevicePipe &,T *); - -template -DevicePipe &operator>>(DevicePipe &, DataElement &); - -// -// For DevicePipeBlob insertion -// - -template -DevicePipeBlob &operator<<(DevicePipeBlob &,T &); - -template -DevicePipeBlob &operator<<(DevicePipeBlob &,T *); - -template -DevicePipeBlob &operator<<(DevicePipeBlob &,DataElement &); - -// -// For DevicePipeBlob extraction -// - -template -DevicePipeBlob &operator>>(DevicePipeBlob &,T &); - -template -DevicePipeBlob &operator>>(DevicePipeBlob &,T *); - -template -DevicePipeBlob &operator>>(DevicePipeBlob &, DataElement &); - - - -/**************************************************************************************** - * * - * Some macros (shame on me, but I am too lazy) * - * ------------------------------------------- * - * * - ***************************************************************************************/ - -// -// A is the required value for the IDL enum descriminator -// B is the IDL enum method to get data -// C is data type name -// - -#define EXTRACT_BASIC_TYPE(A,B,C) \ - failed = false; \ - ext_state.reset(); \ -\ - if (extract_elt_array == Tango_nullptr) \ - ext_state.set(isempty_flag); \ - else if (extract_ctr > (int)extract_elt_array->length() - 1) \ - ext_state.set(notenoughde_flag); \ - else if (extract_ctr == -1 && extract_ind == -1) \ - ext_state.set(mixing_flag); \ - else \ - { \ - int ind; \ - if (extract_ind != -1) \ - ind = extract_ind; \ - else \ - ind = extract_ctr; \ - const AttrValUnion *uni_ptr = &((*extract_elt_array)[ind].value); \ - AttributeDataType adt = uni_ptr->_d(); \ - if (adt != A) \ - { \ - if (adt == ATT_NO_DATA) \ - { \ - if ((*extract_elt_array)[ind].inner_blob.length() == 0) \ - ext_state.set(isempty_flag); \ - else \ - ext_state.set(wrongtype_flag); \ - } \ - else \ - ext_state.set(wrongtype_flag); \ - } \ - else \ - { \ - datum = (uni_ptr->B())[0]; \ - if (extract_ind != -1) \ - extract_ind = -1; \ - else \ - extract_ctr++; \ - } \ - } \ -\ - if (ext_state.any() == true) \ - failed = true; \ -\ - if (ext_state.test(isempty_flag) == true && exceptions_flags.test(isempty_flag) == true) \ - throw_is_empty("operator>>"); \ -\ - if (ext_state.test(notenoughde_flag) == true && exceptions_flags.test(notenoughde_flag) == true) \ - throw_too_many("operator>>",true); \ -\ - if (ext_state.test(mixing_flag) == true && exceptions_flags.test(mixing_flag) == true) \ - throw_mixing("operator>>"); \ -\ - if (ext_state.test(wrongtype_flag) == true && exceptions_flags.test(wrongtype_flag) == true) \ - throw_type_except(C,"operator>>"); - - -// -// A is the required value for the IDL enum descriminator -// B is the IDL enum method to get data -// C is the CORBA sequence type name -// D is data type name -// - -#define EXTRACT_VECTOR_TYPE(A,B,C,D) \ - failed = false; \ - ext_state.reset(); \ -\ - if (extract_elt_array == Tango_nullptr) \ - ext_state.set(isempty_flag); \ - else if (extract_ctr > (int)extract_elt_array->length() - 1) \ - ext_state.set(notenoughde_flag); \ - else if (extract_ctr == -1 && extract_ind == -1) \ - ext_state.set(mixing_flag); \ - else \ - { \ - int ind; \ - if (extract_ind != -1) \ - ind = extract_ind; \ - else \ - ind = extract_ctr; \ - const AttrValUnion *uni_ptr = &((*extract_elt_array)[ind].value); \ - AttributeDataType adt = uni_ptr->_d(); \ - if (adt != A) \ - { \ - if (adt == ATT_NO_DATA) \ - { \ - if ((*extract_elt_array)[ind].inner_blob.length() == 0) \ - ext_state.set(isempty_flag); \ - else \ - ext_state.set(wrongtype_flag); \ - } \ - else \ - ext_state.set(wrongtype_flag); \ - } \ - else \ - { \ - const C &dvsa = uni_ptr->B(); \ - datum << dvsa; \ - if (extract_ind != -1) \ - extract_ind = -1; \ - else \ - extract_ctr++; \ - } \ - } \ -\ - if (ext_state.any() == true) \ - failed = true; \ -\ - if (ext_state.test(isempty_flag) == true && exceptions_flags.test(isempty_flag) == true) \ - throw_is_empty("operator>>"); \ -\ - if (ext_state.test(notenoughde_flag) == true && exceptions_flags.test(notenoughde_flag) == true) \ - throw_too_many("operator>>",true); \ -\ - if (ext_state.test(mixing_flag) == true && exceptions_flags.test(mixing_flag) == true) \ - throw_mixing("operator>>"); \ -\ - if (ext_state.test(wrongtype_flag) == true && exceptions_flags.test(wrongtype_flag) == true) \ - throw_type_except(D,"operator>>"); - -// -// A is the required value for the IDL enum descriminator -// B is the IDL enum method to get data -// C is the CORBA sequence type name -// D is data type name -// - -#define EXTRACT_SEQ_PTR_TYPE(A,B,C,D) \ - failed = false; \ - ext_state.reset(); \ -\ - if (extract_elt_array == Tango_nullptr) \ - ext_state.set(isempty_flag); \ - else if (extract_ctr > (int)extract_elt_array->length() - 1) \ - ext_state.set(notenoughde_flag); \ - else if (extract_ctr == -1 && extract_ind == -1) \ - ext_state.set(mixing_flag); \ - else \ - { \ - int ind; \ - if (extract_ind != -1) \ - ind = extract_ind; \ - else \ - ind = extract_ctr; \ - const AttrValUnion *uni_ptr = &((*extract_elt_array)[ind].value); \ - AttributeDataType adt = uni_ptr->_d(); \ - if (adt != A) \ - { \ - if (adt == ATT_NO_DATA) \ - { \ - if ((*extract_elt_array)[ind].inner_blob.length() == 0) \ - ext_state.set(isempty_flag); \ - else \ - ext_state.set(wrongtype_flag); \ - } \ - else \ - ext_state.set(wrongtype_flag); \ - } \ - else \ - { \ - C &dvsa = const_cast(uni_ptr->B()); \ - CORBA::Long max,len; \ - max = dvsa.maximum(); \ - len = dvsa.length(); \ - datum->replace(max,len,dvsa.get_buffer((CORBA::Boolean)true),true); \ - if (extract_ind != -1) \ - extract_ind = -1; \ - else \ - extract_ctr++; \ - } \ - } \ -\ - if (ext_state.any() == true) \ - failed = true; \ -\ - if (ext_state.test(isempty_flag) == true && exceptions_flags.test(isempty_flag) == true) \ - throw_is_empty("operator>>"); \ -\ - if (ext_state.test(notenoughde_flag) == true && exceptions_flags.test(notenoughde_flag) == true) \ - throw_too_many("operator>>",true); \ -\ - if (ext_state.test(mixing_flag) == true && exceptions_flags.test(mixing_flag) == true) \ - throw_mixing("operator>>"); \ -\ - if (ext_state.test(wrongtype_flag) == true && exceptions_flags.test(wrongtype_flag) == true) \ - throw_type_except(D,"operator>>"); - - -// -// A is the sequence CORBA name -// B is the IDL enum method to set data -// - -#define INSERT_BASIC_TYPE(A,B) \ - failed = false; \ - ext_state.reset(); \ -\ - if (insert_elt_array == Tango_nullptr) \ - ext_state.set(blobdenamenotset_flag); \ - else if (insert_ctr == -1 && insert_ind == -1) \ - ext_state.set(mixing_flag); \ - else \ - { \ - size_t nb_insert = insert_elt_array->length(); \ - if (nb_insert == 0 || insert_ctr > (int)nb_insert - 1) \ - ext_state.set(notenoughde_flag); \ - else \ - { \ - A dvsa; \ - dvsa.length(1); \ - dvsa[0] = datum; \ -\ - if (insert_ind != -1) \ - { \ - (*insert_elt_array)[insert_ind].value.B(dvsa); \ - (*insert_elt_array)[insert_ind].inner_blob_name = CORBA::string_dup(SCALAR_PIPE); \ - insert_ind = -1; \ - } \ - else \ - { \ - (*insert_elt_array)[insert_ctr].value.B(dvsa); \ - (*insert_elt_array)[insert_ctr].inner_blob_name = CORBA::string_dup(SCALAR_PIPE); \ - insert_ctr++; \ - } \ - } \ - } \ -\ - if (ext_state.any() == true) \ - failed = true; \ -\ - if (ext_state.test(blobdenamenotset_flag) == true && exceptions_flags.test(blobdenamenotset_flag) == true) \ - throw_name_not_set("operator<<"); \ -\ - if (ext_state.test(mixing_flag) == true && exceptions_flags.test(mixing_flag) == true) \ - throw_mixing("operator>>"); \ -\ - if (ext_state.test(notenoughde_flag) == true && exceptions_flags.test(notenoughde_flag) == true) \ - throw_too_many("operator<<",false); - - -// -// A is the sequence CORBA name -// B is the IDL enum method to set data -// - -#define INSERT_VECTOR_TYPE(A,B) \ - failed = false; \ - ext_state.reset(); \ -\ - if (insert_elt_array == Tango_nullptr) \ - ext_state.set(blobdenamenotset_flag); \ - else if (insert_ctr == -1 && insert_ind == -1) \ - ext_state.set(mixing_flag); \ - else \ - { \ - size_t nb_insert = insert_elt_array->length(); \ - if (nb_insert == 0 || insert_ctr > (int)nb_insert - 1) \ - ext_state.set(notenoughde_flag); \ - else \ - { \ - A dvsa; \ - if (insert_ind != -1) \ - { \ - (*insert_elt_array)[insert_ind].value.B(dvsa); \ - A &dvsb = (*insert_elt_array)[insert_ind].value.B(); \ - dvsb.replace(datum.size(),datum.size(),&datum[0],false); \ - (*insert_elt_array)[insert_ind].inner_blob_name = CORBA::string_dup(ARRAY_PIPE); \ - insert_ind = -1; \ - } \ - else \ - { \ - (*insert_elt_array)[insert_ctr].value.B(dvsa); \ - A &dvsb = (*insert_elt_array)[insert_ctr].value.B(); \ - dvsb.replace(datum.size(),datum.size(),&datum[0],false); \ - (*insert_elt_array)[insert_ctr].inner_blob_name = CORBA::string_dup(ARRAY_PIPE); \ - insert_ctr++; \ - } \ - } \ - } \ -\ - if (ext_state.any() == true) \ - failed = true; \ -\ - if (ext_state.test(blobdenamenotset_flag) == true && exceptions_flags.test(blobdenamenotset_flag) == true) \ - throw_name_not_set("operator<<"); \ -\ - if (ext_state.test(mixing_flag) == true && exceptions_flags.test(mixing_flag) == true) \ - throw_mixing("operator>>"); \ -\ - if (ext_state.test(notenoughde_flag) == true && exceptions_flags.test(notenoughde_flag) == true) \ - throw_too_many("operator<<",false); - - - -// -// A is the sequence CORBA name -// B is the IDL enum method to set data -// - -#define INSERT_SEQ_TYPE(A,B) \ - failed = false; \ - ext_state.reset(); \ -\ - if (insert_elt_array == Tango_nullptr) \ - ext_state.set(blobdenamenotset_flag); \ - else if (insert_ctr == -1 && insert_ind == -1) \ - ext_state.set(mixing_flag); \ - else \ - { \ - size_t nb_insert = insert_elt_array->length(); \ - if (nb_insert == 0 || insert_ctr > (int)nb_insert - 1) \ - ext_state.set(notenoughde_flag); \ - else \ - { \ - CORBA::Long max,len; \ - max = datum.maximum(); \ - len = datum.length(); \ - A dvsa; \ - if (insert_ind != -1) \ - { \ - (*insert_elt_array)[insert_ind].value.B(dvsa); \ - A &dvsb = (*insert_elt_array)[insert_ind].value.B(); \ - dvsb.replace(max,len,datum.get_buffer(),false); \ - (*insert_elt_array)[insert_ind].inner_blob_name = CORBA::string_dup(ARRAY_PIPE); \ - insert_ind = -1; \ - } \ - else \ - { \ - (*insert_elt_array)[insert_ctr].value.B(dvsa); \ - A &dvsb = (*insert_elt_array)[insert_ctr].value.B(); \ - dvsb.replace(max,len,datum.get_buffer(),false); \ - (*insert_elt_array)[insert_ctr].inner_blob_name = CORBA::string_dup(ARRAY_PIPE); \ - insert_ctr++; \ - } \ - } \ - } \ -\ - if (ext_state.any() == true) \ - failed = true; \ -\ - if (ext_state.test(blobdenamenotset_flag) == true && exceptions_flags.test(blobdenamenotset_flag) == true) \ - throw_name_not_set("operator<<"); \ -\ - if (ext_state.test(mixing_flag) == true && exceptions_flags.test(mixing_flag) == true) \ - throw_mixing("operator>>"); \ -\ - if (ext_state.test(notenoughde_flag) == true && exceptions_flags.test(notenoughde_flag) == true) \ - throw_too_many("operator<<",false); - - - -// -// A is the sequence CORBA name -// B is the IDL enum method to set data -// - -#define INSERT_SEQ_PTR_TYPE(A,B) \ - failed = false; \ - ext_state.reset(); \ -\ - if (insert_elt_array == Tango_nullptr) \ - ext_state.set(blobdenamenotset_flag); \ - else if (insert_ctr == -1 && insert_ind == -1) \ - ext_state.set(mixing_flag); \ - else \ - { \ - size_t nb_insert = insert_elt_array->length(); \ - if (nb_insert == 0 || insert_ctr > (int)nb_insert - 1) \ - ext_state.set(notenoughde_flag); \ - else \ - { \ - A dvsa; \ - CORBA::Long max,len; \ - max = datum->maximum(); \ - len = datum->length(); \ - bool rel = datum->release(); \ - if (rel == false) \ - { \ - datum->replace(max,len,datum->get_buffer(),true); \ - } \ - if (insert_ind != -1) \ - { \ - (*insert_elt_array)[insert_ind].value.B(dvsa); \ - A &dvsb = (*insert_elt_array)[insert_ind].value.B(); \ - dvsb.replace(max,len,datum->get_buffer((CORBA::Boolean)true),true); \ - (*insert_elt_array)[insert_ind].inner_blob_name = CORBA::string_dup(ARRAY_PIPE); \ - insert_ind = -1; \ - } \ - else \ - {\ - (*insert_elt_array)[insert_ctr].value.B(dvsa); \ - A &dvsb = (*insert_elt_array)[insert_ctr].value.B(); \ - dvsb.replace(max,len,datum->get_buffer((CORBA::Boolean)true),true); \ - (*insert_elt_array)[insert_ctr].inner_blob_name = CORBA::string_dup(ARRAY_PIPE); \ - insert_ctr++; \ - } \ - \ - delete datum; \ - } \ - } \ -\ - if (ext_state.any() == true) \ - failed = true; \ -\ - if (ext_state.test(blobdenamenotset_flag) == true && exceptions_flags.test(blobdenamenotset_flag) == true) \ - throw_name_not_set("operator<<"); \ -\ - if (ext_state.test(mixing_flag) == true && exceptions_flags.test(mixing_flag) == true) \ - throw_mixing("operator>>"); \ -\ - if (ext_state.test(notenoughde_flag) == true && exceptions_flags.test(notenoughde_flag) == true) \ - throw_too_many("operator<<",false); - - -#endif /* _DEVICEPIPE_H */ diff --git a/cppapi/client/Makefile.am b/cppapi/client/Makefile.am deleted file mode 100644 index 8e447503a..000000000 --- a/cppapi/client/Makefile.am +++ /dev/null @@ -1,91 +0,0 @@ -SUBDIRS=helpers . - -# We need the ORB to compile and the tango header files to compile -AM_CPPFLAGS = -I$(top_srcdir)/lib/cpp/server \ - -I$(top_srcdir)/lib/cpp/log4tango/include \ - -I$(top_builddir)/lib/cpp/log4tango/include \ - -I$(top_builddir)/lib/cpp/server \ - $(ORB_INCLUDE_PREFIX) $(LIBZMQ_CFLAGS) - -# We're making a shared library with libtool (That's why we use LTLIBRARIES) -lib_LTLIBRARIES = libtango.la - -# We need the libserver to link -libtango_la_LIBADD = ../server/libserver.la \ - ../server/idl/libidl.la \ - ../server/jpeg/libjpeg.la \ - ../server/jpeg_mmx/libjpeg_mmx.la \ - ../log4tango/src/liblog4tango.la \ - $(LIBZMQ_LIBS) - -# We need to set the -version-info for libtool so that libtool will -# generate the correct .so version -libtango_la_LDFLAGS=-version-info $(VERSION_INFO) - -AM_CXXFLAGS=-D_TANGO_LIB - -if DARWIN_ENABLED -AM_LDFLAGS=-flat_namespace --disable-dependency-tracking -endif - -# These are the sources for the library. -libtango_la_SOURCES = dbapi_class.cpp \ - dbapi_server.cpp \ - dbapi_datum.cpp \ - dbapi_base.cpp \ - dbapi_device.cpp \ - dbapi_history.cpp \ - dbapi_attribute.cpp \ - dbapi_cache.cpp \ - dbapi_serverdata.cpp \ - devapi_attr.cpp \ - devapi_base.cpp \ - devapi_data.cpp \ - devapi_datahist.cpp \ - devapi_utils.cpp \ - devapi_pipe.cpp \ - api_util.cpp \ - asynreq.cpp \ - cbthread.cpp \ - proxy_asyn.cpp \ - proxy_asyn_cb.cpp \ - attr_proxy.cpp \ - group.cpp \ - filedatabase.cpp \ - apiexcept.cpp \ - accessproxy.cpp \ - lockthread.cpp \ - event.cpp \ - eventkeepalive.cpp \ - eventqueue.cpp \ - notifdeventconsumer.cpp \ - zmqeventconsumer.cpp - -tangoincludedir = $(includedir)/tango - -tangoinclude_HEADERS = accessproxy.h \ - apiexcept.h \ - cbthread.h \ - dbapi.h \ - devapi.h \ - devasyn.h \ - event.h \ - eventconsumer.h \ - filedatabase.h \ - group.h \ - lockthread.h \ - Database.h \ - DbDevice.h \ - ApiUtil.h \ - DeviceData.h \ - DeviceAttribute.h \ - DevicePipe.h \ - Connection.h \ - DeviceProxy.h \ - AttributeProxy.h \ - event.tpp \ - devapi_attr.tpp \ - devapi_utils.tpp \ - api_util.tpp \ - devapi_pipe.tpp \ - zmq.hpp diff --git a/cppapi/client/Makefile.in b/cppapi/client/Makefile.in deleted file mode 100644 index 73a2b57e1..000000000 --- a/cppapi/client/Makefile.in +++ /dev/null @@ -1,849 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = lib/cpp/client -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(tangoinclude_HEADERS) -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/RSSH_CHECK_OMNIORB.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_PTHREADS.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_SUNPRO_CC.m4 \ - $(top_srcdir)/m4/RSSH_ENABLE_PTHREADS.m4 \ - $(top_srcdir)/m4/ac_cxx_have_class_strstream.m4 \ - $(top_srcdir)/m4/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/m4/ac_cxx_namespaces.m4 \ - $(top_srcdir)/m4/ac_path_mysqlclient.m4 \ - $(top_srcdir)/m4/ac_prog_mysql.m4 \ - $(top_srcdir)/m4/check_zlib.m4 $(top_srcdir)/m4/gcc_release.m4 \ - $(top_srcdir)/m4/java_release.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/mysql_release.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/ac_config.h.tmp -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -libclient_la_LIBADD = -am_libclient_la_OBJECTS = dbapi_class.lo dbapi_server.lo \ - dbapi_datum.lo dbapi_base.lo dbapi_device.lo dbapi_history.lo \ - dbapi_attribute.lo dbapi_cache.lo devapi_attr.lo \ - devapi_base.lo devapi_data.lo devapi_datahist.lo \ - devapi_utils.lo api_util.lo asynreq.lo cbthread.lo \ - proxy_asyn.lo proxy_asyn_cb.lo attr_proxy.lo group.lo \ - filedatabase.lo apiexcept.lo accessproxy.lo lockthread.lo \ - event.lo eventkeepalive.lo eventqueue.lo \ - notifdeventconsumer.lo zmqeventconsumer.lo -libclient_la_OBJECTS = $(am_libclient_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libclient_la_SOURCES) -DIST_SOURCES = $(libclient_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(tangoincludedir)" -HEADERS = $(tangoinclude_HEADERS) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CORBA_INCLUDES = @CORBA_INCLUDES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPP_ELEVEN = @CPP_ELEVEN@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIR = @DATADIR@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -HAVE_ORB_IDL = @HAVE_ORB_IDL@ -IDL = @IDL@ -IDLCXX = @IDLCXX@ -IDLCXXFLAGS = @IDLCXXFLAGS@ -IDLFLAGS = @IDLFLAGS@ -IDL_CLN_CPP = @IDL_CLN_CPP@ -IDL_CLN_CPP_SUFFIX = @IDL_CLN_CPP_SUFFIX@ -IDL_CLN_H = @IDL_CLN_H@ -IDL_CLN_H1_SUFFIX = @IDL_CLN_H1_SUFFIX@ -IDL_CLN_H_SUFFIX = @IDL_CLN_H_SUFFIX@ -IDL_CLN_O = @IDL_CLN_O@ -IDL_CLN_OBJ_SUFFIX = @IDL_CLN_OBJ_SUFFIX@ -IDL_H1_SUFFIX = @IDL_H1_SUFFIX@ -IDL_H_SUFFIX = @IDL_H_SUFFIX@ -IDL_SRV_CPP = @IDL_SRV_CPP@ -IDL_SRV_CPP_SUFFIX = @IDL_SRV_CPP_SUFFIX@ -IDL_SRV_H = @IDL_SRV_H@ -IDL_SRV_H1_SUFFIX = @IDL_SRV_H1_SUFFIX@ -IDL_SRV_H_SUFFIX = @IDL_SRV_H_SUFFIX@ -IDL_SRV_O = @IDL_SRV_O@ -IDL_SRV_OBJ_SUFFIX = @IDL_SRV_OBJ_SUFFIX@ -IDL_TIE_CPP_SUFFIX = @IDL_TIE_CPP_SUFFIX@ -IDL_TIE_H1_SUFFIX = @IDL_TIE_H1_SUFFIX@ -IDL_TIE_H_SUFFIX = @IDL_TIE_H_SUFFIX@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAVA = @JAVA@ -JPEG_LIB_CXXFLAGS = @JPEG_LIB_CXXFLAGS@ -JPEG_MMX_LIB_CXXFLAGS = @JPEG_MMX_LIB_CXXFLAGS@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBZMQ_CFLAGS = @LIBZMQ_CFLAGS@ -LIBZMQ_LIBS = @LIBZMQ_LIBS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MYSQL = @MYSQL@ -MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@ -MYSQLCLIENT_LDFLAGS = @MYSQLCLIENT_LDFLAGS@ -MYSQLCLIENT_LIBS = @MYSQLCLIENT_LIBS@ -MYSQL_ADMIN = @MYSQL_ADMIN@ -MYSQL_ADMIN_PASSWD = @MYSQL_ADMIN_PASSWD@ -MYSQL_HOST = @MYSQL_HOST@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -ORB = @ORB@ -ORB_COSNAMING_LIB = @ORB_COSNAMING_LIB@ -ORB_INCLUDE_PREFIX = @ORB_INCLUDE_PREFIX@ -ORB_PREFIX = @ORB_PREFIX@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -TANGO_DB_NAME = @TANGO_DB_NAME@ -TANGO_RC_FILE = @TANGO_RC_FILE@ -VERSION = @VERSION@ -VERSION_INFO = @VERSION_INFO@ -ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@ -ZLIB_LDFLAGS = @ZLIB_LDFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZMQ_PREFIX = @ZMQ_PREFIX@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_aux_dir = @ac_aux_dir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -omniCOS4_CFLAGS = @omniCOS4_CFLAGS@ -omniCOS4_LIBS = @omniCOS4_LIBS@ -omniORB4_CFLAGS = @omniORB4_CFLAGS@ -omniORB4_LIBS = @omniORB4_LIBS@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = helpers . - -# We need the ORB to compile and the tango header files to compile -INCLUDES = -I$(top_srcdir)/lib/cpp/server \ - -I$(top_srcdir)/lib/cpp/log4tango/include \ - -I$(top_builddir)/lib/cpp/log4tango/include \ - $(ORB_INCLUDE_PREFIX) $(LIBZMQ_CFLAGS) - - -# We're making a libtool convenience library which is not to be installed, -# therefore the automake noinst variable -noinst_LTLIBRARIES = libclient.la -AM_CXXFLAGS = -D_TANGO_LIB @CPP_ELEVEN@ - -# These are the sources for the library. -libclient_la_SOURCES = dbapi_class.cpp \ - dbapi_server.cpp \ - dbapi_datum.cpp \ - dbapi_base.cpp \ - dbapi_device.cpp \ - dbapi_history.cpp \ - dbapi_attribute.cpp \ - dbapi_cache.cpp \ - devapi_attr.cpp \ - devapi_base.cpp \ - devapi_data.cpp \ - devapi_datahist.cpp \ - devapi_utils.cpp \ - api_util.cpp \ - asynreq.cpp \ - cbthread.cpp \ - proxy_asyn.cpp \ - proxy_asyn_cb.cpp \ - attr_proxy.cpp \ - group.cpp \ - filedatabase.cpp \ - apiexcept.cpp \ - accessproxy.cpp \ - lockthread.cpp \ - event.cpp \ - eventkeepalive.cpp \ - eventqueue.cpp \ - notifdeventconsumer.cpp \ - zmqeventconsumer.cpp - -tangoincludedir = $(includedir)/tango -tangoinclude_HEADERS = accessproxy.h \ - apiexcept.h \ - cbthread.h \ - dbapi.h \ - devapi.h \ - devasyn.h \ - event.h \ - eventconsumer.h \ - filedatabase.h \ - group.h \ - lockthread.h \ - zmq.hpp - -all: all-recursive - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/cpp/client/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu lib/cpp/client/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libclient.la: $(libclient_la_OBJECTS) $(libclient_la_DEPENDENCIES) $(EXTRA_libclient_la_DEPENDENCIES) - $(CXXLINK) $(libclient_la_OBJECTS) $(libclient_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accessproxy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/api_util.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apiexcept.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asynreq.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/attr_proxy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbthread.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbapi_attribute.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbapi_base.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbapi_cache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbapi_class.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbapi_datum.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbapi_device.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbapi_history.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbapi_server.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/devapi_attr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/devapi_base.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/devapi_data.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/devapi_datahist.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/devapi_utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eventkeepalive.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eventqueue.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filedatabase.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/group.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lockthread.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notifdeventconsumer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxy_asyn.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxy_asyn_cb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zmqeventconsumer.Plo@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-tangoincludeHEADERS: $(tangoinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(tangoincludedir)" || $(MKDIR_P) "$(DESTDIR)$(tangoincludedir)" - @list='$(tangoinclude_HEADERS)'; test -n "$(tangoincludedir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(tangoincludedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(tangoincludedir)" || exit $$?; \ - done - -uninstall-tangoincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(tangoinclude_HEADERS)'; test -n "$(tangoincludedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(tangoincludedir)'; $(am__uninstall_files_from_dir) - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(LTLIBRARIES) $(HEADERS) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(tangoincludedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: install-tangoincludeHEADERS - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-tangoincludeHEADERS - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip install-tangoincludeHEADERS installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-tangoincludeHEADERS - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/cppapi/client/helpers/CMakeLists.txt b/cppapi/client/helpers/CMakeLists.txt deleted file mode 100644 index e54af39b7..000000000 --- a/cppapi/client/helpers/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -set(HELPERS DeviceProxyHelper.h - PogoHelper.h - TangoExceptionsHelper.h - Xstring.h) - -install(FILES ${HELPERS} DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}") \ No newline at end of file diff --git a/cppapi/client/helpers/Makefile.am b/cppapi/client/helpers/Makefile.am deleted file mode 100644 index b1ef63e07..000000000 --- a/cppapi/client/helpers/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ - -tangoincludedir = $(includedir)/tango - -tangoinclude_HEADERS = DeviceProxyHelper.h \ - PogoHelper.h \ - TangoExceptionsHelper.h \ - Xstring.h diff --git a/cppapi/client/helpers/Makefile.in b/cppapi/client/helpers/Makefile.in deleted file mode 100644 index bc60859b6..000000000 --- a/cppapi/client/helpers/Makefile.in +++ /dev/null @@ -1,543 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = lib/cpp/client/helpers -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(tangoinclude_HEADERS) -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/RSSH_CHECK_OMNIORB.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_PTHREADS.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_SUNPRO_CC.m4 \ - $(top_srcdir)/m4/RSSH_ENABLE_PTHREADS.m4 \ - $(top_srcdir)/m4/ac_cxx_have_class_strstream.m4 \ - $(top_srcdir)/m4/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/m4/ac_cxx_namespaces.m4 \ - $(top_srcdir)/m4/ac_path_mysqlclient.m4 \ - $(top_srcdir)/m4/ac_prog_mysql.m4 \ - $(top_srcdir)/m4/check_zlib.m4 $(top_srcdir)/m4/gcc_release.m4 \ - $(top_srcdir)/m4/java_release.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/mysql_release.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/ac_config.h.tmp -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(tangoincludedir)" -HEADERS = $(tangoinclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CORBA_INCLUDES = @CORBA_INCLUDES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPP_ELEVEN = @CPP_ELEVEN@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIR = @DATADIR@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -HAVE_ORB_IDL = @HAVE_ORB_IDL@ -IDL = @IDL@ -IDLCXX = @IDLCXX@ -IDLCXXFLAGS = @IDLCXXFLAGS@ -IDLFLAGS = @IDLFLAGS@ -IDL_CLN_CPP = @IDL_CLN_CPP@ -IDL_CLN_CPP_SUFFIX = @IDL_CLN_CPP_SUFFIX@ -IDL_CLN_H = @IDL_CLN_H@ -IDL_CLN_H1_SUFFIX = @IDL_CLN_H1_SUFFIX@ -IDL_CLN_H_SUFFIX = @IDL_CLN_H_SUFFIX@ -IDL_CLN_O = @IDL_CLN_O@ -IDL_CLN_OBJ_SUFFIX = @IDL_CLN_OBJ_SUFFIX@ -IDL_H1_SUFFIX = @IDL_H1_SUFFIX@ -IDL_H_SUFFIX = @IDL_H_SUFFIX@ -IDL_SRV_CPP = @IDL_SRV_CPP@ -IDL_SRV_CPP_SUFFIX = @IDL_SRV_CPP_SUFFIX@ -IDL_SRV_H = @IDL_SRV_H@ -IDL_SRV_H1_SUFFIX = @IDL_SRV_H1_SUFFIX@ -IDL_SRV_H_SUFFIX = @IDL_SRV_H_SUFFIX@ -IDL_SRV_O = @IDL_SRV_O@ -IDL_SRV_OBJ_SUFFIX = @IDL_SRV_OBJ_SUFFIX@ -IDL_TIE_CPP_SUFFIX = @IDL_TIE_CPP_SUFFIX@ -IDL_TIE_H1_SUFFIX = @IDL_TIE_H1_SUFFIX@ -IDL_TIE_H_SUFFIX = @IDL_TIE_H_SUFFIX@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAVA = @JAVA@ -JPEG_LIB_CXXFLAGS = @JPEG_LIB_CXXFLAGS@ -JPEG_MMX_LIB_CXXFLAGS = @JPEG_MMX_LIB_CXXFLAGS@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBZMQ_CFLAGS = @LIBZMQ_CFLAGS@ -LIBZMQ_LIBS = @LIBZMQ_LIBS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MYSQL = @MYSQL@ -MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@ -MYSQLCLIENT_LDFLAGS = @MYSQLCLIENT_LDFLAGS@ -MYSQLCLIENT_LIBS = @MYSQLCLIENT_LIBS@ -MYSQL_ADMIN = @MYSQL_ADMIN@ -MYSQL_ADMIN_PASSWD = @MYSQL_ADMIN_PASSWD@ -MYSQL_HOST = @MYSQL_HOST@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -ORB = @ORB@ -ORB_COSNAMING_LIB = @ORB_COSNAMING_LIB@ -ORB_INCLUDE_PREFIX = @ORB_INCLUDE_PREFIX@ -ORB_PREFIX = @ORB_PREFIX@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -TANGO_DB_NAME = @TANGO_DB_NAME@ -TANGO_RC_FILE = @TANGO_RC_FILE@ -VERSION = @VERSION@ -VERSION_INFO = @VERSION_INFO@ -ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@ -ZLIB_LDFLAGS = @ZLIB_LDFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZMQ_PREFIX = @ZMQ_PREFIX@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_aux_dir = @ac_aux_dir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -omniCOS4_CFLAGS = @omniCOS4_CFLAGS@ -omniCOS4_LIBS = @omniCOS4_LIBS@ -omniORB4_CFLAGS = @omniORB4_CFLAGS@ -omniORB4_LIBS = @omniORB4_LIBS@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -tangoincludedir = $(includedir)/tango -tangoinclude_HEADERS = DeviceProxyHelper.h \ - PogoHelper.h \ - TangoExceptionsHelper.h \ - Xstring.h - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/cpp/client/helpers/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu lib/cpp/client/helpers/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-tangoincludeHEADERS: $(tangoinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(tangoincludedir)" || $(MKDIR_P) "$(DESTDIR)$(tangoincludedir)" - @list='$(tangoinclude_HEADERS)'; test -n "$(tangoincludedir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(tangoincludedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(tangoincludedir)" || exit $$?; \ - done - -uninstall-tangoincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(tangoinclude_HEADERS)'; test -n "$(tangoincludedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(tangoincludedir)'; $(am__uninstall_files_from_dir) - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(tangoincludedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-tangoincludeHEADERS - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-tangoincludeHEADERS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip \ - install-tangoincludeHEADERS installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags uninstall uninstall-am \ - uninstall-tangoincludeHEADERS - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/cppapi/cr_dir b/cppapi/cr_dir deleted file mode 100755 index 918b40675..000000000 --- a/cppapi/cr_dir +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ ! -d $1 ] -then - echo "Creating directory $1" - mkdir -p $1 -fi diff --git a/cppapi/doxygen/CMakeLists.txt b/cppapi/doxygen/CMakeLists.txt deleted file mode 100644 index 89b1b8e2c..000000000 --- a/cppapi/doxygen/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_custom_target(doc doxygen ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../server - SOURCES Doxyfile) \ No newline at end of file diff --git a/cppapi/server/CMakeLists.txt b/cppapi/server/CMakeLists.txt deleted file mode 100644 index ec31e6640..000000000 --- a/cppapi/server/CMakeLists.txt +++ /dev/null @@ -1,141 +0,0 @@ -set(SOURCES attrdesc.cpp - attrgetsetprop.cpp - attribute.cpp - attrsetval.cpp - attrmanip.cpp - basiccommand.cpp - blackbox.cpp - class_factory.cpp - classattribute.cpp - command.cpp - coutappender.cpp - classpipe.cpp - dev_event.cpp - dev_poll.cpp - device.cpp - device_2.cpp - device_3.cpp - device_4.cpp - device_5.cpp - deviceclass.cpp - devicelog.cpp - devintr.cpp - dintrthread.cpp - dserver.cpp - dserverclass.cpp - dserverlock.cpp - dserverlog.cpp - dserverpoll.cpp - dserversignal.cpp - encoded_attribute.cpp - eventcmds.cpp - eventsupplier.cpp - except.cpp - fwdattrdesc.cpp - fwdattribute.cpp - logcmds.cpp - logging.cpp - logstream.cpp - multiattribute.cpp - notifdeventsupplier.cpp - pipe.cpp - pollcmds.cpp - pollobj.cpp - pollring.cpp - pollthread.cpp - rootattreg.cpp - seqvec.cpp - subdev_diag.cpp - tangoappender.cpp - tangorollingfileappender.cpp - templ_inst.cpp - thsig.cpp - utils.cpp - utils_polling.cpp - utils_shut.cpp - w_attribute.cpp - w_pipe.cpp - zmqeventsupplier.cpp) - -set(HEADERS attrdesc.h - attribute.h - attribute.tpp - attrsetval.tpp - attribute_spec.tpp - attrmanip.h - attrprop.h - attrprop.tpp - auto_tango_monitor.h - basiccommand.h - blackbox.h - classattribute.h - classpipe.h - command.h - pipe.h - pipe.tpp - coutappender.h - coutbuf.h - device.h - device_2.h - device_3.h - device_3.tpp - device_4.h - device_5.h - deviceclass.h - devintr.h - dintrthread.h - dserver.h - dserverclass.h - dserversignal.h - eventsupplier.h - except.h - fwdattrdesc.h - fwdattribute.h - fwdattribute.tpp - fwdattribute_spec.tpp - log4tango.h - logcmds.h - logging.h - logstream.h - multiattribute.h - ntservice.h - pipedesc.h - pollcmds.h - pollext.h - pollext.tpp - pollobj.h - pollring.h - pollring.tpp - pollthread.h - pollthread.tpp - readers_writers_lock.h - rootattreg.h - seqvec.h - tango.h - tango_config.h - tango_const.h - tango_monitor.h - tangoappender.h - tangorollingfileappender.h - utils.h - utils.tpp - utils_spec.tpp - w32win.h - w_attribute.h - w_attribute.tpp - w_attrsetval.tpp - w_attribute_spec.tpp - w_pipe.h - w_pipe.tpp - subdev_diag.h - encoded_attribute.h - encoded_format.h) - -add_subdirectory(idl) -add_subdirectory(jpeg) -add_subdirectory(jpeg_mmx) - -add_library(server_objects OBJECT ${SOURCES}) -target_compile_options(server_objects PRIVATE -fPIC) - -install(FILES ${HEADERS} DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}") \ No newline at end of file diff --git a/cppapi/server/Makefile.am b/cppapi/server/Makefile.am deleted file mode 100644 index 5589adf40..000000000 --- a/cppapi/server/Makefile.am +++ /dev/null @@ -1,150 +0,0 @@ -SUBDIRS=idl jpeg jpeg_mmx . - -# We need the ORB to compile and the tango header files to compile -AM_CPPFLAGS = -I$(top_srcdir)/lib/cpp/client \ - -I$(top_srcdir)/lib/cpp/log4tango/include \ - -I$(top_builddir)/lib/cpp/log4tango/include \ - -I$(top_builddir)/lib/cpp/server \ - $(ORB_INCLUDE_PREFIX) $(LIBZMQ_CFLAGS) - -# We're making a libtool convenience library which is not to be installed, -# therefore the automake noinst variable -noinst_LTLIBRARIES=libserver.la - -AM_CXXFLAGS=-D_TANGO_LIB - -# The sources -libserver_la_SOURCES = attrdesc.cpp \ - attrgetsetprop.cpp \ - attribute.cpp \ - attrsetval.cpp \ - attrmanip.cpp \ - basiccommand.cpp \ - blackbox.cpp \ - class_factory.cpp \ - classattribute.cpp \ - command.cpp \ - coutappender.cpp \ - classpipe.cpp \ - dev_event.cpp \ - dev_poll.cpp \ - device.cpp \ - device_2.cpp \ - device_3.cpp \ - device_4.cpp \ - device_5.cpp \ - deviceclass.cpp \ - devicelog.cpp \ - devintr.cpp \ - dintrthread.cpp \ - dserver.cpp \ - dserverclass.cpp \ - dserverlock.cpp \ - dserverlog.cpp \ - dserverpoll.cpp \ - dserversignal.cpp \ - encoded_attribute.cpp \ - eventcmds.cpp \ - eventsupplier.cpp \ - except.cpp \ - fwdattrdesc.cpp \ - fwdattribute.cpp \ - logcmds.cpp \ - logging.cpp \ - logstream.cpp \ - multiattribute.cpp \ - notifdeventsupplier.cpp \ - pipe.cpp \ - pollcmds.cpp \ - pollobj.cpp \ - pollring.cpp \ - pollthread.cpp \ - rootattreg.cpp \ - seqvec.cpp \ - subdev_diag.cpp \ - tangoappender.cpp \ - tangorollingfileappender.cpp \ - templ_inst.cpp \ - thsig.cpp \ - utils.cpp \ - utils_polling.cpp \ - utils_shut.cpp \ - w_attribute.cpp \ - w_pipe.cpp \ - zmqeventsupplier.cpp - - -tangoincludedir = $(includedir)/tango - -tangoinclude_HEADERS = attrdesc.h \ - attribute.h \ - attrmanip.h \ - attrprop.h \ - auto_tango_monitor.h \ - basiccommand.h \ - blackbox.h \ - classattribute.h \ - classpipe.h \ - command.h \ - coutappender.h \ - coutbuf.h \ - device.h \ - device_2.h \ - device_3.h \ - device_4.h \ - device_5.h \ - deviceclass.h \ - devintr.h \ - dintrthread.h \ - dserver.h \ - dserverclass.h \ - dserversignal.h \ - encoded_attribute.h \ - encoded_format.h \ - eventsupplier.h \ - except.h \ - fwdattrdesc.h \ - fwdattribute.h \ - log4tango.h \ - logcmds.h \ - logging.h \ - logstream.h \ - multiattribute.h \ - ntservice.h \ - pipe.h \ - pipedesc.h \ - pollcmds.h \ - pollext.h \ - pollobj.h \ - pollring.h \ - pollthread.h \ - readers_writers_lock.h \ - rootattreg.h \ - seqvec.h \ - subdev_diag.h \ - tango.h \ - tango_config.h \ - tango_const.h \ - tango_monitor.h \ - tangoappender.h \ - tangorollingfileappender.h \ - utils.h \ - w_attribute.h \ - w_pipe.h \ - attribute.tpp \ - attribute_spec.tpp \ - attrprop.tpp \ - attrsetval.tpp \ - device_3.tpp \ - fwdattribute.tpp \ - fwdattribute_spec.tpp \ - pipe.tpp \ - pollext.tpp \ - pollring.tpp \ - pollthread.tpp \ - utils.tpp \ - utils_spec.tpp \ - w_attribute.tpp \ - w_attribute_spec.tpp \ - w_attrsetval.tpp \ - w_pipe.tpp diff --git a/cppapi/server/Makefile.in b/cppapi/server/Makefile.in deleted file mode 100644 index 67f3a6856..000000000 --- a/cppapi/server/Makefile.in +++ /dev/null @@ -1,968 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = lib/cpp/server -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(tangoinclude_HEADERS) -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/RSSH_CHECK_OMNIORB.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_PTHREADS.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_SUNPRO_CC.m4 \ - $(top_srcdir)/m4/RSSH_ENABLE_PTHREADS.m4 \ - $(top_srcdir)/m4/ac_cxx_have_class_strstream.m4 \ - $(top_srcdir)/m4/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/m4/ac_cxx_namespaces.m4 \ - $(top_srcdir)/m4/ac_path_mysqlclient.m4 \ - $(top_srcdir)/m4/ac_prog_mysql.m4 \ - $(top_srcdir)/m4/check_zlib.m4 $(top_srcdir)/m4/gcc_release.m4 \ - $(top_srcdir)/m4/java_release.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/mysql_release.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/ac_config.h.tmp -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(tangoincludedir)" -LTLIBRARIES = $(lib_LTLIBRARIES) -libtango_la_DEPENDENCIES = ../client/libclient.la \ - ../log4tango/src/liblog4tango.la jpeg/libjpeg.la \ - jpeg_mmx/libjpeg_mmx.la -am_libtango_la_OBJECTS = tangoSK.lo tangoDynSK.lo attrdesc.lo \ - attribute.lo attrmanip.lo basiccommand.lo blackbox.lo \ - class_factory.lo classattribute.lo command.lo coutappender.lo \ - dev_event.lo dev_poll.lo device.lo device_2.lo device_3.lo \ - device_4.lo deviceclass.lo devicelog.lo dserver.lo \ - dserverclass.lo dserverlock.lo dserverlog.lo dserverpoll.lo \ - dserversignal.lo encoded_attribute.lo eventcmds.lo \ - eventsupplier.lo except.lo logcmds.lo logging.lo logstream.lo \ - multiattribute.lo notifdeventsupplier.lo pollcmds.lo \ - pollobj.lo pollring.lo pollthread.lo seqvec.lo subdev_diag.lo \ - tangoappender.lo tangorollingfileappender.lo thsig.lo utils.lo \ - utils_polling.lo utils_shut.lo w_attribute.lo \ - zmqeventsupplier.lo -libtango_la_OBJECTS = $(am_libtango_la_OBJECTS) -libtango_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libtango_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libtango_la_SOURCES) -DIST_SOURCES = $(libtango_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -HEADERS = $(tangoinclude_HEADERS) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CORBA_INCLUDES = @CORBA_INCLUDES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPP_ELEVEN = @CPP_ELEVEN@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIR = @DATADIR@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -HAVE_ORB_IDL = @HAVE_ORB_IDL@ -IDL = @IDL@ -IDLCXX = @IDLCXX@ -IDLCXXFLAGS = @IDLCXXFLAGS@ -IDLFLAGS = @IDLFLAGS@ -IDL_CLN_CPP = @IDL_CLN_CPP@ -IDL_CLN_CPP_SUFFIX = @IDL_CLN_CPP_SUFFIX@ -IDL_CLN_H = @IDL_CLN_H@ -IDL_CLN_H1_SUFFIX = @IDL_CLN_H1_SUFFIX@ -IDL_CLN_H_SUFFIX = @IDL_CLN_H_SUFFIX@ -IDL_CLN_O = @IDL_CLN_O@ -IDL_CLN_OBJ_SUFFIX = @IDL_CLN_OBJ_SUFFIX@ -IDL_H1_SUFFIX = @IDL_H1_SUFFIX@ -IDL_H_SUFFIX = @IDL_H_SUFFIX@ -IDL_SRV_CPP = @IDL_SRV_CPP@ -IDL_SRV_CPP_SUFFIX = @IDL_SRV_CPP_SUFFIX@ -IDL_SRV_H = @IDL_SRV_H@ -IDL_SRV_H1_SUFFIX = @IDL_SRV_H1_SUFFIX@ -IDL_SRV_H_SUFFIX = @IDL_SRV_H_SUFFIX@ -IDL_SRV_O = @IDL_SRV_O@ -IDL_SRV_OBJ_SUFFIX = @IDL_SRV_OBJ_SUFFIX@ -IDL_TIE_CPP_SUFFIX = @IDL_TIE_CPP_SUFFIX@ -IDL_TIE_H1_SUFFIX = @IDL_TIE_H1_SUFFIX@ -IDL_TIE_H_SUFFIX = @IDL_TIE_H_SUFFIX@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAVA = @JAVA@ -JPEG_LIB_CXXFLAGS = @JPEG_LIB_CXXFLAGS@ -JPEG_MMX_LIB_CXXFLAGS = @JPEG_MMX_LIB_CXXFLAGS@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBZMQ_CFLAGS = @LIBZMQ_CFLAGS@ -LIBZMQ_LIBS = @LIBZMQ_LIBS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MYSQL = @MYSQL@ -MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@ -MYSQLCLIENT_LDFLAGS = @MYSQLCLIENT_LDFLAGS@ -MYSQLCLIENT_LIBS = @MYSQLCLIENT_LIBS@ -MYSQL_ADMIN = @MYSQL_ADMIN@ -MYSQL_ADMIN_PASSWD = @MYSQL_ADMIN_PASSWD@ -MYSQL_HOST = @MYSQL_HOST@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -ORB = @ORB@ -ORB_COSNAMING_LIB = @ORB_COSNAMING_LIB@ -ORB_INCLUDE_PREFIX = @ORB_INCLUDE_PREFIX@ -ORB_PREFIX = @ORB_PREFIX@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -TANGO_DB_NAME = @TANGO_DB_NAME@ -TANGO_RC_FILE = @TANGO_RC_FILE@ -VERSION = @VERSION@ -VERSION_INFO = @VERSION_INFO@ -ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@ -ZLIB_LDFLAGS = @ZLIB_LDFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_aux_dir = @ac_aux_dir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -omniCOS4_CFLAGS = @omniCOS4_CFLAGS@ -omniCOS4_LIBS = @omniCOS4_LIBS@ -omniORB4_CFLAGS = @omniORB4_CFLAGS@ -omniORB4_LIBS = @omniORB4_LIBS@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = idl jpeg jpeg_mmx . - -# We need the ORB to compile and the tango header files to compile -INCLUDES = -I$(top_srcdir)/lib/cpp/client \ - -I$(top_srcdir)/lib/cpp/log4tango/include \ - -I$(top_builddir)/lib/cpp/log4tango/include \ - $(ORB_INCLUDE_PREFIX) $(LIBZMQ_CFLAGS) - - -# We're making a shared library with libtool (that's why we use LTLIBRARIES) -lib_LTLIBRARIES = libtango.la - -# We need the libclient to link -libtango_la_LIBADD = ../client/libclient.la \ - ../log4tango/src/liblog4tango.la \ - jpeg/libjpeg.la \ - jpeg_mmx/libjpeg_mmx.la - - -# We need to set the -version-info for libtool so that libtool will -# generate the correct .so version -libtango_la_LDFLAGS = -version-info $(VERSION_INFO) -AM_CXXFLAGS = -D_TANGO_LIB @CPP_ELEVEN@ -@DARWIN_ENABLED_TRUE@AM_LDFLAGS = -flat_namespace --disable-dependency-tracking - -# The sources -libtango_la_SOURCES = tangoSK.cpp \ - tangoDynSK.cpp \ - attrdesc.cpp \ - attribute.cpp \ - attrmanip.cpp \ - basiccommand.cpp \ - blackbox.cpp \ - class_factory.cpp \ - classattribute.cpp \ - command.cpp \ - coutappender.cpp \ - dev_event.cpp \ - dev_poll.cpp \ - device.cpp \ - device_2.cpp \ - device_3.cpp \ - device_4.cpp \ - deviceclass.cpp \ - devicelog.cpp \ - dserver.cpp \ - dserverclass.cpp \ - dserverlock.cpp \ - dserverlog.cpp \ - dserverpoll.cpp \ - dserversignal.cpp \ - encoded_attribute.cpp \ - eventcmds.cpp \ - eventsupplier.cpp \ - except.cpp \ - logcmds.cpp \ - logging.cpp \ - logstream.cpp \ - multiattribute.cpp \ - notifdeventsupplier.cpp \ - pollcmds.cpp \ - pollobj.cpp \ - pollring.cpp \ - pollthread.cpp \ - seqvec.cpp \ - subdev_diag.cpp \ - tangoappender.cpp \ - tangorollingfileappender.cpp \ - thsig.cpp \ - utils.cpp \ - utils_polling.cpp \ - utils_shut.cpp \ - w_attribute.cpp \ - zmqeventsupplier.cpp - -tangoincludedir = $(includedir)/tango -tangoinclude_HEADERS = attrdesc.h \ - attribute.h \ - attrmanip.h \ - attrprop.h \ - auto_tango_monitor.h \ - basiccommand.h \ - blackbox.h \ - classattribute.h \ - command.h \ - coutappender.h \ - coutbuf.h \ - device.h \ - device_2.h \ - device_3.h \ - device_4.h \ - deviceclass.h \ - dserver.h \ - dserverclass.h \ - dserversignal.h \ - encoded_attribute.h \ - encoded_format.h \ - eventcmds.h \ - eventsupplier.h \ - except.h \ - locked_att_value.h \ - log4tango.h \ - logcmds.h \ - logging.h \ - logstream.h \ - multiattribute.h \ - ntservice.h \ - pollcmds.h \ - pollext.h \ - pollobj.h \ - pollring.h \ - pollthread.h \ - readers_writers_lock.h \ - seqvec.h \ - subdev_diag.h \ - tango.h \ - tango_config.h \ - tango_const.h \ - tango_monitor.h \ - tangoappender.h \ - tangorollingfileappender.h \ - utils.h \ - w_attribute.h \ - attribute.tpp \ - utils.tpp \ - w_attribute.tpp \ - attrprop.tpp - -all: all-recursive - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/cpp/server/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu lib/cpp/server/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libtango.la: $(libtango_la_OBJECTS) $(libtango_la_DEPENDENCIES) $(EXTRA_libtango_la_DEPENDENCIES) - $(libtango_la_LINK) -rpath $(libdir) $(libtango_la_OBJECTS) $(libtango_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/attrdesc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/attribute.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/attrmanip.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basiccommand.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blackbox.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/class_factory.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/classattribute.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coutappender.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dev_event.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dev_poll.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/device.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/device_2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/device_3.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/device_4.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deviceclass.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/devicelog.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dserver.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dserverclass.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dserverlock.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dserverlog.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dserverpoll.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dserversignal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/encoded_attribute.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eventcmds.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eventsupplier.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/except.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logcmds.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logging.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logstream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiattribute.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notifdeventsupplier.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pollcmds.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pollobj.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pollring.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pollthread.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seqvec.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subdev_diag.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tangoDynSK.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tangoSK.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tangoappender.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tangorollingfileappender.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thsig.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils_polling.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils_shut.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/w_attribute.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zmqeventsupplier.Plo@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-tangoincludeHEADERS: $(tangoinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(tangoincludedir)" || $(MKDIR_P) "$(DESTDIR)$(tangoincludedir)" - @list='$(tangoinclude_HEADERS)'; test -n "$(tangoincludedir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(tangoincludedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(tangoincludedir)" || exit $$?; \ - done - -uninstall-tangoincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(tangoinclude_HEADERS)'; test -n "$(tangoincludedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(tangoincludedir)'; $(am__uninstall_files_from_dir) - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(LTLIBRARIES) $(HEADERS) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(tangoincludedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: install-tangoincludeHEADERS - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: install-libLTLIBRARIES - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-libLTLIBRARIES uninstall-tangoincludeHEADERS - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-tangoincludeHEADERS installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-libLTLIBRARIES uninstall-tangoincludeHEADERS - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/cppapi/server/idl/Makefile.am b/cppapi/server/idl/Makefile.am deleted file mode 100644 index 21af0abb8..000000000 --- a/cppapi/server/idl/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ - -# We need the ORB to compile and the tango header files to compile -AM_CPPFLAGS = $(ORB_INCLUDE_PREFIX) - -IDL_BASE_DIR = $(top_srcdir)/lib/idl - -BUILT_SOURCES = tangoSK.cpp - -tangoSK.cpp: Makefile - $(IDL) -I$(IDL_BASE_DIR) -bcxx -Wbh=.h -Wbs=SK.cpp -Wbd=DynSK.cpp -Wba $(IDL_BASE_DIR)/tango.idl - @SED@ -i '/typedef\ _CORBA_ConstrType_Variable_Var/a \/\/Added by Tango team\ -virtual ~DevPipeData() {if (mut_ptr != NULL)mut_ptr->unlock();}\ -DevPipeData() {mut_ptr=NULL;}\ -void set_pipe_mutex(omni_mutex *ptr) {mut_ptr=ptr;}\ -void rel_pipe_mutex() {if (mut_ptr != NULL){mut_ptr->unlock();mut_ptr=NULL;}}\ -omni_mutex *mut_ptr;' tango.h - @SED@ -i '/typedef\ _CORBA_ConstrType_Variable_Var/a \/\/Added by Tango team\ -virtual ~AttributeValue_4() {if (mut_ptr != NULL)mut_ptr->unlock();}\ -AttributeValue_4() {mut_ptr=NULL;}\ -void set_attr_mutex(omni_mutex *ptr) {mut_ptr=ptr;}\ -void rel_attr_mutex() {if (mut_ptr != NULL){mut_ptr->unlock();mut_ptr=NULL;}}\ -omni_mutex *get_attr_mutex() {return mut_ptr;}\ -omni_mutex *mut_ptr;' tango.h - @SED@ -i '/typedef\ _CORBA_ConstrType_Variable_Var/a \/\/Added by Tango team\ -virtual ~AttributeValue_5() {if (mut_ptr != NULL)mut_ptr->unlock();}\ -AttributeValue_5() {mut_ptr=NULL;}\ -void set_attr_mutex(omni_mutex *ptr) {mut_ptr=ptr;}\ -void rel_attr_mutex() {if (mut_ptr != NULL){mut_ptr->unlock();mut_ptr=NULL;}}\ -omni_mutex *get_attr_mutex() {return mut_ptr;}\ -omni_mutex *mut_ptr;' tango.h - -# We're making a libtool convenience library which is not to be installed, -# therefore the automake noinst variable -noinst_LTLIBRARIES = libidl.la - - -# These are the sources for the library. -nodist_libidl_la_SOURCES = tangoSK.cpp \ - tangoDynSK.cpp \ - tango.h - -idldir=${includedir}/tango/idl - -install-data-local: - mkdir -p $(DESTDIR)/$(idldir) - cp -f tango.h $(DESTDIR)/$(idldir)/tango.h - chmod u+w $(DESTDIR)/$(idldir)/tango.h - -uninstall-local: - rm $(DESTDIR)/$(idldir)/tango.h - rmdir $(DESTDIR)/$(idldir) - -clean-local: clean-local-check -.PHONY: clean-local-check -clean-local-check: - -rm *.cpp - -rm *.h - - -#idl_HEADERS=tango.h - diff --git a/cppapi/server/idl/Makefile.in b/cppapi/server/idl/Makefile.in deleted file mode 100644 index a43c49a43..000000000 --- a/cppapi/server/idl/Makefile.in +++ /dev/null @@ -1,537 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = lib/cpp/server/idl -DIST_COMMON = $(idl_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/RSSH_CHECK_OMNIORB.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_PTHREADS.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_SUNPRO_CC.m4 \ - $(top_srcdir)/m4/RSSH_ENABLE_PTHREADS.m4 \ - $(top_srcdir)/m4/ac_cxx_have_class_strstream.m4 \ - $(top_srcdir)/m4/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/m4/ac_cxx_namespaces.m4 \ - $(top_srcdir)/m4/ac_path_mysqlclient.m4 \ - $(top_srcdir)/m4/ac_prog_mysql.m4 \ - $(top_srcdir)/m4/check_zlib.m4 $(top_srcdir)/m4/gcc_release.m4 \ - $(top_srcdir)/m4/java_release.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/mysql_release.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/ac_config.h.tmp -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(idldir)" -HEADERS = $(idl_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CORBA_INCLUDES = @CORBA_INCLUDES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPP_ELEVEN = @CPP_ELEVEN@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIR = @DATADIR@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -HAVE_ORB_IDL = @HAVE_ORB_IDL@ -IDL = @IDL@ -IDLCXX = @IDLCXX@ -IDLCXXFLAGS = @IDLCXXFLAGS@ -IDLFLAGS = @IDLFLAGS@ -IDL_CLN_CPP = @IDL_CLN_CPP@ -IDL_CLN_CPP_SUFFIX = @IDL_CLN_CPP_SUFFIX@ -IDL_CLN_H = @IDL_CLN_H@ -IDL_CLN_H1_SUFFIX = @IDL_CLN_H1_SUFFIX@ -IDL_CLN_H_SUFFIX = @IDL_CLN_H_SUFFIX@ -IDL_CLN_O = @IDL_CLN_O@ -IDL_CLN_OBJ_SUFFIX = @IDL_CLN_OBJ_SUFFIX@ -IDL_H1_SUFFIX = @IDL_H1_SUFFIX@ -IDL_H_SUFFIX = @IDL_H_SUFFIX@ -IDL_SRV_CPP = @IDL_SRV_CPP@ -IDL_SRV_CPP_SUFFIX = @IDL_SRV_CPP_SUFFIX@ -IDL_SRV_H = @IDL_SRV_H@ -IDL_SRV_H1_SUFFIX = @IDL_SRV_H1_SUFFIX@ -IDL_SRV_H_SUFFIX = @IDL_SRV_H_SUFFIX@ -IDL_SRV_O = @IDL_SRV_O@ -IDL_SRV_OBJ_SUFFIX = @IDL_SRV_OBJ_SUFFIX@ -IDL_TIE_CPP_SUFFIX = @IDL_TIE_CPP_SUFFIX@ -IDL_TIE_H1_SUFFIX = @IDL_TIE_H1_SUFFIX@ -IDL_TIE_H_SUFFIX = @IDL_TIE_H_SUFFIX@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAVA = @JAVA@ -JPEG_LIB_CXXFLAGS = @JPEG_LIB_CXXFLAGS@ -JPEG_MMX_LIB_CXXFLAGS = @JPEG_MMX_LIB_CXXFLAGS@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBZMQ_CFLAGS = @LIBZMQ_CFLAGS@ -LIBZMQ_LIBS = @LIBZMQ_LIBS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MYSQL = @MYSQL@ -MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@ -MYSQLCLIENT_LDFLAGS = @MYSQLCLIENT_LDFLAGS@ -MYSQLCLIENT_LIBS = @MYSQLCLIENT_LIBS@ -MYSQL_ADMIN = @MYSQL_ADMIN@ -MYSQL_ADMIN_PASSWD = @MYSQL_ADMIN_PASSWD@ -MYSQL_HOST = @MYSQL_HOST@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -ORB = @ORB@ -ORB_COSNAMING_LIB = @ORB_COSNAMING_LIB@ -ORB_INCLUDE_PREFIX = @ORB_INCLUDE_PREFIX@ -ORB_PREFIX = @ORB_PREFIX@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -TANGO_DB_NAME = @TANGO_DB_NAME@ -TANGO_RC_FILE = @TANGO_RC_FILE@ -VERSION = @VERSION@ -VERSION_INFO = @VERSION_INFO@ -ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@ -ZLIB_LDFLAGS = @ZLIB_LDFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_aux_dir = @ac_aux_dir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -omniCOS4_CFLAGS = @omniCOS4_CFLAGS@ -omniCOS4_LIBS = @omniCOS4_LIBS@ -omniORB4_CFLAGS = @omniORB4_CFLAGS@ -omniORB4_LIBS = @omniORB4_LIBS@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -idldir = ${includedir}/tango/idl -idl_HEADERS = tango.h -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/cpp/server/idl/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu lib/cpp/server/idl/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-idlHEADERS: $(idl_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(idldir)" || $(MKDIR_P) "$(DESTDIR)$(idldir)" - @list='$(idl_HEADERS)'; test -n "$(idldir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(idldir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(idldir)" || exit $$?; \ - done - -uninstall-idlHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(idl_HEADERS)'; test -n "$(idldir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(idldir)'; $(am__uninstall_files_from_dir) - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(idldir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-idlHEADERS - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-idlHEADERS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am \ - install-idlHEADERS install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-idlHEADERS - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/cppapi/server/idl/idl2cpp b/cppapi/server/idl/idl2cpp deleted file mode 100755 index 52cc692c6..000000000 --- a/cppapi/server/idl/idl2cpp +++ /dev/null @@ -1,17 +0,0 @@ -# -# -# This script file translte idl file to cpp files -# -# - -TANGO_HOME=/home/taurel/tango; export TANGO_HOME -SRC_DIR=$TANGO_HOME/idl; export SRC_DIR -OMNIIDL_HOME=/segfs/tango/ORB/omniORB4.2.0/ubuntu1404/bin export OMNIIDL_HOME -#OMNIIDL_HOME=/segfs/tango/ORB/omniORB4.1.7/ubuntu1204/bin export OMNIIDL_HOME -#OMNIIDL_HOME=/local/tango/omniorb/bin export OMNIIDL_HOME - -# - -echo "Generating files" -$OMNIIDL_HOME/omniidl -I$SRC_DIR \ - -bcxx -Wbh=.h -Wbs=SK.cpp -Wbd=DynSK.cpp -Wba $SRC_DIR/tango.idl diff --git a/cppapi/server/jpeg/CMakeLists.txt b/cppapi/server/jpeg/CMakeLists.txt deleted file mode 100644 index c0e9a6f08..000000000 --- a/cppapi/server/jpeg/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -set(SOURCES jpeg_bitstream.cpp - jpeg_color.cpp - jpeg_dct.cpp - jpeg_decoder.cpp - jpeg_encoder.cpp - jpeg_memory.cpp) - -add_library(jpeg_objects OBJECT ${SOURCES}) -target_compile_options(jpeg_objects PRIVATE -fPIC) diff --git a/cppapi/server/jpeg/Makefile.am b/cppapi/server/jpeg/Makefile.am deleted file mode 100644 index b90bd2fe5..000000000 --- a/cppapi/server/jpeg/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ - - -# We need the ORB to compile and the tango header files to compile -AM_CPPFLAGS = -I$(top_srcdir)/lib/cpp/server \ - -I$(top_srcdir)/lib/cpp/log4tango/include \ - -I$(top_builddir)/lib/cpp/log4tango/include \ - -I$(top_builddir)/lib/cpp/server \ - $(ORB_INCLUDE_PREFIX) $(LIBZMQ_CFLAGS) - -# We're making a libtool convenience library which is not to be installed, -# therefore the automake noinst variable -noinst_LTLIBRARIES = libjpeg.la - -AM_CXXFLAGS=@JPEG_LIB_CXXFLAGS@ - -# These are the sources for the library. -libjpeg_la_SOURCES = jpeg_bitstream.cpp \ - jpeg_color.cpp \ - jpeg_dct.cpp \ - jpeg_decoder.cpp \ - jpeg_encoder.cpp \ - jpeg_memory.cpp \ - jpeg_bitstream.h \ - jpeg_const.h \ - jpeg_lib.h \ - jpeg_memory.h - diff --git a/cppapi/server/jpeg/Makefile.in b/cppapi/server/jpeg/Makefile.in deleted file mode 100644 index 14108967d..000000000 --- a/cppapi/server/jpeg/Makefile.in +++ /dev/null @@ -1,587 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = lib/cpp/server/jpeg -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/RSSH_CHECK_OMNIORB.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_PTHREADS.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_SUNPRO_CC.m4 \ - $(top_srcdir)/m4/RSSH_ENABLE_PTHREADS.m4 \ - $(top_srcdir)/m4/ac_cxx_have_class_strstream.m4 \ - $(top_srcdir)/m4/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/m4/ac_cxx_namespaces.m4 \ - $(top_srcdir)/m4/ac_path_mysqlclient.m4 \ - $(top_srcdir)/m4/ac_prog_mysql.m4 \ - $(top_srcdir)/m4/check_zlib.m4 $(top_srcdir)/m4/gcc_release.m4 \ - $(top_srcdir)/m4/java_release.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/mysql_release.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/ac_config.h.tmp -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -libjpeg_la_LIBADD = -am_libjpeg_la_OBJECTS = jpeg_bitstream.lo jpeg_color.lo jpeg_dct.lo \ - jpeg_decoder.lo jpeg_encoder.lo jpeg_memory.lo -libjpeg_la_OBJECTS = $(am_libjpeg_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libjpeg_la_SOURCES) -DIST_SOURCES = $(libjpeg_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CORBA_INCLUDES = @CORBA_INCLUDES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPP_ELEVEN = @CPP_ELEVEN@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIR = @DATADIR@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -HAVE_ORB_IDL = @HAVE_ORB_IDL@ -IDL = @IDL@ -IDLCXX = @IDLCXX@ -IDLCXXFLAGS = @IDLCXXFLAGS@ -IDLFLAGS = @IDLFLAGS@ -IDL_CLN_CPP = @IDL_CLN_CPP@ -IDL_CLN_CPP_SUFFIX = @IDL_CLN_CPP_SUFFIX@ -IDL_CLN_H = @IDL_CLN_H@ -IDL_CLN_H1_SUFFIX = @IDL_CLN_H1_SUFFIX@ -IDL_CLN_H_SUFFIX = @IDL_CLN_H_SUFFIX@ -IDL_CLN_O = @IDL_CLN_O@ -IDL_CLN_OBJ_SUFFIX = @IDL_CLN_OBJ_SUFFIX@ -IDL_H1_SUFFIX = @IDL_H1_SUFFIX@ -IDL_H_SUFFIX = @IDL_H_SUFFIX@ -IDL_SRV_CPP = @IDL_SRV_CPP@ -IDL_SRV_CPP_SUFFIX = @IDL_SRV_CPP_SUFFIX@ -IDL_SRV_H = @IDL_SRV_H@ -IDL_SRV_H1_SUFFIX = @IDL_SRV_H1_SUFFIX@ -IDL_SRV_H_SUFFIX = @IDL_SRV_H_SUFFIX@ -IDL_SRV_O = @IDL_SRV_O@ -IDL_SRV_OBJ_SUFFIX = @IDL_SRV_OBJ_SUFFIX@ -IDL_TIE_CPP_SUFFIX = @IDL_TIE_CPP_SUFFIX@ -IDL_TIE_H1_SUFFIX = @IDL_TIE_H1_SUFFIX@ -IDL_TIE_H_SUFFIX = @IDL_TIE_H_SUFFIX@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAVA = @JAVA@ -JPEG_LIB_CXXFLAGS = @JPEG_LIB_CXXFLAGS@ -JPEG_MMX_LIB_CXXFLAGS = @JPEG_MMX_LIB_CXXFLAGS@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBZMQ_CFLAGS = @LIBZMQ_CFLAGS@ -LIBZMQ_LIBS = @LIBZMQ_LIBS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MYSQL = @MYSQL@ -MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@ -MYSQLCLIENT_LDFLAGS = @MYSQLCLIENT_LDFLAGS@ -MYSQLCLIENT_LIBS = @MYSQLCLIENT_LIBS@ -MYSQL_ADMIN = @MYSQL_ADMIN@ -MYSQL_ADMIN_PASSWD = @MYSQL_ADMIN_PASSWD@ -MYSQL_HOST = @MYSQL_HOST@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -ORB = @ORB@ -ORB_COSNAMING_LIB = @ORB_COSNAMING_LIB@ -ORB_INCLUDE_PREFIX = @ORB_INCLUDE_PREFIX@ -ORB_PREFIX = @ORB_PREFIX@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -TANGO_DB_NAME = @TANGO_DB_NAME@ -TANGO_RC_FILE = @TANGO_RC_FILE@ -VERSION = @VERSION@ -VERSION_INFO = @VERSION_INFO@ -ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@ -ZLIB_LDFLAGS = @ZLIB_LDFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_aux_dir = @ac_aux_dir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -omniCOS4_CFLAGS = @omniCOS4_CFLAGS@ -omniCOS4_LIBS = @omniCOS4_LIBS@ -omniORB4_CFLAGS = @omniORB4_CFLAGS@ -omniORB4_LIBS = @omniORB4_LIBS@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# We need the ORB to compile and the tango header files to compile -INCLUDES = -I$(top_srcdir)/lib/cpp/server \ - -I$(top_srcdir)/lib/cpp/log4tango/include \ - -I$(top_builddir)/lib/cpp/log4tango/include \ - $(ORB_INCLUDE_PREFIX) $(LIBZMQ_CFLAGS) - - -# We're making a libtool convenience library which is not to be installed, -# therefore the automake noinst variable -noinst_LTLIBRARIES = libjpeg.la -AM_CXXFLAGS = @JPEG_LIB_CXXFLAGS@ - -# These are the sources for the library. -libjpeg_la_SOURCES = jpeg_bitstream.cpp \ - jpeg_color.cpp \ - jpeg_dct.cpp \ - jpeg_decoder.cpp \ - jpeg_encoder.cpp \ - jpeg_memory.cpp \ - jpeg_bitstream.h \ - jpeg_const.h \ - jpeg_lib.h \ - jpeg_memory.h - -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/cpp/server/jpeg/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu lib/cpp/server/jpeg/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libjpeg.la: $(libjpeg_la_OBJECTS) $(libjpeg_la_DEPENDENCIES) $(EXTRA_libjpeg_la_DEPENDENCIES) - $(CXXLINK) $(libjpeg_la_OBJECTS) $(libjpeg_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpeg_bitstream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpeg_color.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpeg_dct.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpeg_decoder.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpeg_encoder.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpeg_memory.Plo@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/cppapi/server/jpeg_mmx/Makefile.am b/cppapi/server/jpeg_mmx/Makefile.am deleted file mode 100644 index 89552b228..000000000 --- a/cppapi/server/jpeg_mmx/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ - - -# We need the ORB to compile and the tango header files to compile -AM_CPPFLAGS = -I$(top_srcdir)/lib/cpp/server \ - -I$(top_srcdir)/lib/cpp/log4tango/include \ - -I$(top_builddir)/lib/cpp/log4tango/include \ - -I$(top_builddir)/lib/cpp/server \ - -I$(top_srcdir)/lib/cpp/server/jpeg \ - $(ORB_INCLUDE_PREFIX) $(LIBZMQ_CFLAGS) - -# We're making a libtool convenience library which is not to be installed, -# therefore the automake noinst variable -noinst_LTLIBRARIES = libjpeg_mmx.la - -libjpeg_mmx_la_CXXFLAGS=@JPEG_MMX_LIB_CXXFLAGS@ -O0 - -# These are the sources for the library. -libjpeg_mmx_la_SOURCES = jpeg_color_mmx.cpp \ - jpeg_dct_mmx.cpp - diff --git a/cppapi/server/jpeg_mmx/Makefile.in b/cppapi/server/jpeg_mmx/Makefile.in deleted file mode 100644 index 77535779b..000000000 --- a/cppapi/server/jpeg_mmx/Makefile.in +++ /dev/null @@ -1,585 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = lib/cpp/server/jpeg_mmx -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/RSSH_CHECK_OMNIORB.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_PTHREADS.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_SUNPRO_CC.m4 \ - $(top_srcdir)/m4/RSSH_ENABLE_PTHREADS.m4 \ - $(top_srcdir)/m4/ac_cxx_have_class_strstream.m4 \ - $(top_srcdir)/m4/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/m4/ac_cxx_namespaces.m4 \ - $(top_srcdir)/m4/ac_path_mysqlclient.m4 \ - $(top_srcdir)/m4/ac_prog_mysql.m4 \ - $(top_srcdir)/m4/check_zlib.m4 $(top_srcdir)/m4/gcc_release.m4 \ - $(top_srcdir)/m4/java_release.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/mysql_release.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/ac_config.h.tmp -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -libjpeg_mmx_la_LIBADD = -am_libjpeg_mmx_la_OBJECTS = libjpeg_mmx_la-jpeg_color_mmx.lo \ - libjpeg_mmx_la-jpeg_dct_mmx.lo -libjpeg_mmx_la_OBJECTS = $(am_libjpeg_mmx_la_OBJECTS) -libjpeg_mmx_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ - $(libjpeg_mmx_la_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libjpeg_mmx_la_SOURCES) -DIST_SOURCES = $(libjpeg_mmx_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CORBA_INCLUDES = @CORBA_INCLUDES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPP_ELEVEN = @CPP_ELEVEN@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIR = @DATADIR@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -HAVE_ORB_IDL = @HAVE_ORB_IDL@ -IDL = @IDL@ -IDLCXX = @IDLCXX@ -IDLCXXFLAGS = @IDLCXXFLAGS@ -IDLFLAGS = @IDLFLAGS@ -IDL_CLN_CPP = @IDL_CLN_CPP@ -IDL_CLN_CPP_SUFFIX = @IDL_CLN_CPP_SUFFIX@ -IDL_CLN_H = @IDL_CLN_H@ -IDL_CLN_H1_SUFFIX = @IDL_CLN_H1_SUFFIX@ -IDL_CLN_H_SUFFIX = @IDL_CLN_H_SUFFIX@ -IDL_CLN_O = @IDL_CLN_O@ -IDL_CLN_OBJ_SUFFIX = @IDL_CLN_OBJ_SUFFIX@ -IDL_H1_SUFFIX = @IDL_H1_SUFFIX@ -IDL_H_SUFFIX = @IDL_H_SUFFIX@ -IDL_SRV_CPP = @IDL_SRV_CPP@ -IDL_SRV_CPP_SUFFIX = @IDL_SRV_CPP_SUFFIX@ -IDL_SRV_H = @IDL_SRV_H@ -IDL_SRV_H1_SUFFIX = @IDL_SRV_H1_SUFFIX@ -IDL_SRV_H_SUFFIX = @IDL_SRV_H_SUFFIX@ -IDL_SRV_O = @IDL_SRV_O@ -IDL_SRV_OBJ_SUFFIX = @IDL_SRV_OBJ_SUFFIX@ -IDL_TIE_CPP_SUFFIX = @IDL_TIE_CPP_SUFFIX@ -IDL_TIE_H1_SUFFIX = @IDL_TIE_H1_SUFFIX@ -IDL_TIE_H_SUFFIX = @IDL_TIE_H_SUFFIX@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAVA = @JAVA@ -JPEG_LIB_CXXFLAGS = @JPEG_LIB_CXXFLAGS@ -JPEG_MMX_LIB_CXXFLAGS = @JPEG_MMX_LIB_CXXFLAGS@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBZMQ_CFLAGS = @LIBZMQ_CFLAGS@ -LIBZMQ_LIBS = @LIBZMQ_LIBS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MYSQL = @MYSQL@ -MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@ -MYSQLCLIENT_LDFLAGS = @MYSQLCLIENT_LDFLAGS@ -MYSQLCLIENT_LIBS = @MYSQLCLIENT_LIBS@ -MYSQL_ADMIN = @MYSQL_ADMIN@ -MYSQL_ADMIN_PASSWD = @MYSQL_ADMIN_PASSWD@ -MYSQL_HOST = @MYSQL_HOST@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -ORB = @ORB@ -ORB_COSNAMING_LIB = @ORB_COSNAMING_LIB@ -ORB_INCLUDE_PREFIX = @ORB_INCLUDE_PREFIX@ -ORB_PREFIX = @ORB_PREFIX@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -TANGO_DB_NAME = @TANGO_DB_NAME@ -TANGO_RC_FILE = @TANGO_RC_FILE@ -VERSION = @VERSION@ -VERSION_INFO = @VERSION_INFO@ -ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@ -ZLIB_LDFLAGS = @ZLIB_LDFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_aux_dir = @ac_aux_dir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -omniCOS4_CFLAGS = @omniCOS4_CFLAGS@ -omniCOS4_LIBS = @omniCOS4_LIBS@ -omniORB4_CFLAGS = @omniORB4_CFLAGS@ -omniORB4_LIBS = @omniORB4_LIBS@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# We need the ORB to compile and the tango header files to compile -INCLUDES = -I$(top_srcdir)/lib/cpp/server \ - -I$(top_srcdir)/lib/cpp/log4tango/include \ - -I$(top_builddir)/lib/cpp/log4tango/include \ - -I$(top_srcdir)/lib/cpp/server/jpeg \ - $(ORB_INCLUDE_PREFIX) $(LIBZMQ_CFLAGS) - - -# We're making a libtool convenience library which is not to be installed, -# therefore the automake noinst variable -noinst_LTLIBRARIES = libjpeg_mmx.la -libjpeg_mmx_la_CXXFLAGS = @JPEG_MMX_LIB_CXXFLAGS@ -O0 - -# These are the sources for the library. -libjpeg_mmx_la_SOURCES = jpeg_color_mmx.cpp \ - jpeg_dct_mmx.cpp - -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/cpp/server/jpeg_mmx/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu lib/cpp/server/jpeg_mmx/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libjpeg_mmx.la: $(libjpeg_mmx_la_OBJECTS) $(libjpeg_mmx_la_DEPENDENCIES) $(EXTRA_libjpeg_mmx_la_DEPENDENCIES) - $(libjpeg_mmx_la_LINK) $(libjpeg_mmx_la_OBJECTS) $(libjpeg_mmx_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjpeg_mmx_la-jpeg_color_mmx.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjpeg_mmx_la-jpeg_dct_mmx.Plo@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -libjpeg_mmx_la-jpeg_color_mmx.lo: jpeg_color_mmx.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjpeg_mmx_la_CXXFLAGS) $(CXXFLAGS) -MT libjpeg_mmx_la-jpeg_color_mmx.lo -MD -MP -MF $(DEPDIR)/libjpeg_mmx_la-jpeg_color_mmx.Tpo -c -o libjpeg_mmx_la-jpeg_color_mmx.lo `test -f 'jpeg_color_mmx.cpp' || echo '$(srcdir)/'`jpeg_color_mmx.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libjpeg_mmx_la-jpeg_color_mmx.Tpo $(DEPDIR)/libjpeg_mmx_la-jpeg_color_mmx.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='jpeg_color_mmx.cpp' object='libjpeg_mmx_la-jpeg_color_mmx.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjpeg_mmx_la_CXXFLAGS) $(CXXFLAGS) -c -o libjpeg_mmx_la-jpeg_color_mmx.lo `test -f 'jpeg_color_mmx.cpp' || echo '$(srcdir)/'`jpeg_color_mmx.cpp - -libjpeg_mmx_la-jpeg_dct_mmx.lo: jpeg_dct_mmx.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjpeg_mmx_la_CXXFLAGS) $(CXXFLAGS) -MT libjpeg_mmx_la-jpeg_dct_mmx.lo -MD -MP -MF $(DEPDIR)/libjpeg_mmx_la-jpeg_dct_mmx.Tpo -c -o libjpeg_mmx_la-jpeg_dct_mmx.lo `test -f 'jpeg_dct_mmx.cpp' || echo '$(srcdir)/'`jpeg_dct_mmx.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libjpeg_mmx_la-jpeg_dct_mmx.Tpo $(DEPDIR)/libjpeg_mmx_la-jpeg_dct_mmx.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='jpeg_dct_mmx.cpp' object='libjpeg_mmx_la-jpeg_dct_mmx.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjpeg_mmx_la_CXXFLAGS) $(CXXFLAGS) -c -o libjpeg_mmx_la-jpeg_dct_mmx.lo `test -f 'jpeg_dct_mmx.cpp' || echo '$(srcdir)/'`jpeg_dct_mmx.cpp - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/cppapi/win32/makedef.pl b/cppapi/win32/makedef.pl deleted file mode 100755 index 0deb608c4..000000000 --- a/cppapi/win32/makedef.pl +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/perl -# ********************************************************************** -# -# Copyright (c) 2000 -# Object Oriented Concepts, Inc. -# Billerica, MA, USA -# -# All Rights Reserved -# -# ********************************************************************** - -$def = $ARGV[0]; -shift @ARGV; -$lib = $ARGV[0]; -shift @ARGV; -$dumpbin = "dumpbin /symbols /out:dump.out @ARGV"; - -system($dumpbin); -open(DUMP,"dump.out") - || die "Can't open dumpbin output file (dump.out)"; - -open(DEF, "> $def") - || die "Can't open `$def': $!.\n"; - -print DEF "LIBRARY $lib\n"; -print DEF "EXPORTS\n"; - -while() -{ - if(!/\bUNDEF\b/ && /\bExternal\b/) - { - s/^.*\|\s+//; - @values = split; - $_ = $values[0]; - - if(!/^\?\?_G/ && !/^\?\?_E/) - { - print DEF " $_\n"; - } - } -} - -close(DUMP); -system("del dump.out") diff --git a/cppapi/win32/resources/dancing.bmp b/cppapi/win32/resources/dancing.bmp deleted file mode 100755 index f7e1f1087..000000000 Binary files a/cppapi/win32/resources/dancing.bmp and /dev/null differ diff --git a/cppapi/win32/resources/resource.h b/cppapi/win32/resources/resource.h deleted file mode 100755 index bb530d062..000000000 --- a/cppapi/win32/resources/resource.h +++ /dev/null @@ -1,40 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by tango.rc -// -#define TANGO_BITMAP1 102 -#define TANGO_MENU1 103 -#define TANGO_ICON1 104 -#define TANGO_ABOUT1 106 -#define TANGO_ABOUT_TEXT1 1000 -#define TANGO_ABOUT_TEXT2 1001 -#define TANGO_ABOUT_TEXT3 1002 -#define TANGO_ABOUT_TEXT4 1003 -#define TANGO_ABOUT_TEXT5 1004 -#define IDC_EDIT1 1005 -#define ID_FILE_EXIT 40001 -#define ID_VIEW_CONSOLE 40002 -#define ID_DEBUG_LEVEL0 40003 -#define ID_DEBUG_LEVEL1 40004 -#define ID_DEBUG_LEVEL2 40005 -#define ID_DEBUG_LEVEL3 40006 -#define ID_DEBUG_LEVEL4 40007 -#define TANGO_APP_ABOUT 40008 -#define ID_DEV_DEBUG_LEVEL0 40009 -#define ID_DEV_DEBUG_LEVEL1 40010 -#define ID_DEV_DEBUG_LEVEL2 40011 -#define ID_DEV_DEBUG_LEVEL3 40012 -#define ID_DEV_DEBUG_LEVEL4 40013 -#define ID_DEBUG_LEVEL5 40014 -#define ID_DEV_DEBUG_LEVEL5 40015 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 107 -#define _APS_NEXT_COMMAND_VALUE 40016 -#define _APS_NEXT_CONTROL_VALUE 1006 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/cppapi/win32/resources/tango.ico b/cppapi/win32/resources/tango.ico deleted file mode 100755 index 11d8fb5f2..000000000 Binary files a/cppapi/win32/resources/tango.ico and /dev/null differ diff --git a/cppapi/win32/resources/tango.rc b/cppapi/win32/resources/tango.rc deleted file mode 100755 index 47302fa4b..000000000 --- a/cppapi/win32/resources/tango.rc +++ /dev/null @@ -1,151 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -TANGO_BITMAP1 BITMAP DISCARDABLE "dancing.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -TANGO_MENU1 MENU DISCARDABLE -BEGIN - POPUP "&File" - BEGIN - MENUITEM "E&xit", ID_FILE_EXIT - END - POPUP "&View" - BEGIN - MENUITEM "&Console", ID_VIEW_CONSOLE - END - POPUP "&Debug" - BEGIN - MENUITEM "Level 0", ID_DEBUG_LEVEL0 - MENUITEM "Level 1", ID_DEBUG_LEVEL1 - MENUITEM "Level 2", ID_DEBUG_LEVEL2 - MENUITEM "Level 3", ID_DEBUG_LEVEL3 - MENUITEM "Level 4", ID_DEBUG_LEVEL4 - END - POPUP "&Help", HELP - BEGIN - MENUITEM "&About", TANGO_APP_ABOUT - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -TANGO_ICON1 ICON DISCARDABLE "tango.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -TANGO_ABOUT1 DIALOG DISCARDABLE 20, 20, 191, 126 -STYLE DS_MODALFRAME | WS_POPUP -FONT 8, "MS Sans Serif" -BEGIN - DEFPUSHBUTTON "OK",IDOK,71,98,50,14 - ICON TANGO_ICON1,IDC_STATIC,13,14,20,20 - CTEXT "TANGO device server",TANGO_ABOUT_TEXT1,48,15,96,10, - SS_CENTERIMAGE - CTEXT "X",TANGO_ABOUT_TEXT2,15,32,163,10 - CTEXT "Y",TANGO_ABOUT_TEXT3,15,43,163,9 - CTEXT "Z",TANGO_ABOUT_TEXT4,14,53,164,8 - CTEXT "European Synchrotron Radiation Facility (ESRF)", - IDC_STATIC,14,86,164,10,SS_CENTERIMAGE - CTEXT "Q",TANGO_ABOUT_TEXT5,14,62,164,9,SS_CENTERIMAGE -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - TANGO_ABOUT1, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 184 - VERTGUIDE, 96 - TOPMARGIN, 7 - BOTTOMMARGIN, 119 - END -END -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/cppapi/win32/resources/tango.res b/cppapi/win32/resources/tango.res deleted file mode 100755 index dfd917925..000000000 Binary files a/cppapi/win32/resources/tango.res and /dev/null differ diff --git a/cppapi/win32/resources/tango_small.ico b/cppapi/win32/resources/tango_small.ico deleted file mode 100755 index 3372eb387..000000000 Binary files a/cppapi/win32/resources/tango_small.ico and /dev/null differ diff --git a/cppapi/win32/tango_vc10/tango_dll/tango_dll.vcxproj b/cppapi/win32/tango_vc10/tango_dll/tango_dll.vcxproj deleted file mode 100644 index ad9ef78cc..000000000 --- a/cppapi/win32/tango_vc10/tango_dll/tango_dll.vcxproj +++ /dev/null @@ -1,798 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54} - - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\Release\ - .\Release\ - true - false - C:\tango_src\ci\win32\lib\vc10_dll\ - .\Debug\ - true - true - tango925d - tango925 - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/tango_dll.tlb - - - - - Disabled - ..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\resources;$(OMNI_BASE)\win32\include\vc10;$(ZMQ_BASE)\win32\include\vc10;$(LOG4TANGO_BASE)\win32\include\vc10;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;_TANGO_LIB;_CRT_SECURE_NO_DEPRECATE;JPG_USE_ASM;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - .\Release/tango_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level2 - true - Default - /MP2 %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Build def file... - C:\perl\bin\perl ..\..\makedef.pl tango.def tango925 release\*.obj - - - log4tango.lib;omniorb421_rt.lib;omnidynamic421_rt.lib;omnithread40_rt.lib;COS421_rt.lib;zmq.lib;ws2_32.lib;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win32\lib\vc10_dll\tango925.dll - 9.2.5 - true - $(OMNI_BASE)\win32\lib\vc10_dll;$(ZMQ_BASE)\win32\lib\vc10_dll;$(LOG4TANGO_BASE)\win32\lib\vc10_dll;%(AdditionalLibraryDirectories) - tango.def - .\Release/tango925.pdb - false - - - $(PREFIX)\win32\lib\vc10_dll\tango.lib - MachineX86 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/tango_dll.tlb - - - - - Disabled - ..;..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\resources;$(OMNI_BASE)\win32\include\vc10;$(ZMQ_BASE)\win32\include\vc10;$(LOG4TANGO_BASE)\win32\include\vc10;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_TANGO_LIB;LOG4TANGO_HAS_DLL;JPG_USE_ASM;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - - - .\Debug/tango_dll.pch - .\Debug/ - .\Debug/ - - - Level2 - true - ProgramDatabase - Default - /MP2 %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Build def file... - C:\perl\bin\perl ..\..\makedef.pl tango.def tango925d debug\*.obj - - - log4tangod.lib;omniORB421_rtd.lib;omniDynamic421_rtd.lib;COS421_rtd.lib;omnithread40_rtd.lib;zmqd.lib;ws2_32.lib;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - LinkVerboseLib - $(PREFIX)\win32\lib\vc10_dll\tango925d.dll - 9.2.5 - $(ZMQ_BASE)\win32\lib\vc10_dll;$(OMNI_BASE)\win32\lib\vc10_dll;$(LOG4TANGO_BASE)\win32\lib\vc10_dll;%(AdditionalLibraryDirectories) - tango.def - true - $(PREFIX)\win32\lib\vc10_dll\tangod.9.2.5.pdb - false - - - $(PREFIX)\win32\lib\vc10_dll\tangod.lib - MachineX86 - - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_TANGO_LIB;LOG4TANGO_HAS_DLL - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cppapi/win32/tango_vc10/tango_static/tango_static.vcxproj b/cppapi/win32/tango_vc10/tango_static/tango_static.vcxproj deleted file mode 100644 index d35b74f3e..000000000 --- a/cppapi/win32/tango_vc10/tango_static/tango_static.vcxproj +++ /dev/null @@ -1,746 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {1514B691-6515-47BC-BDFB-9BD45C483577} - - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - C:\tango_src\ci\win32\lib\vc10\ - .\Release\ - C:\tango_src\ci\win32\lib\vc10\ - .\Debug\ - tangod - tango - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\server\jpeg;..\..\..\server;..\..\..\client;..\..\resources;$(OMNI_BASE)\win32\include\vc10;$(ZMQ_BASE)\win32\include\vc10;$(LOG4TANGO_BASE)\win32\include\vc10;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_WINSTATIC;_TANGO_LIB;_CRT_SECURE_NO_DEPRECATE;JPG_USE_ASM;ZMQ_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - - - .\Release/tango_static.pch - .\Release/ - .\Release/ - .\Release/ - Level2 - true - Default - /MP2 %(AdditionalOptions) - - - 0x0409 - - - $(PREFIX)\win32\lib\vc10\tango.lib - - - %(AdditionalLibraryDirectories) - - - - - - - Disabled - ..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\resources;$(OMNI_BASE)\win32\include\vc10;$(ZMQ_BASE)\win32\include\vc10;$(LOG4TANGO_BASE)\win32\include\vc10;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_WINDOWS;_WINSTATIC;_TANGO_LIB;_MBCS;_CRT_SECURE_NO_DEPRECATE;JPG_USE_ASM;ZMQ_STATIC;%(PreprocessorDefinitions) - MultiThreadedDebug - true - .\Debug/tango_static.pch - .\Debug/ - .\Debug/ - $(PREFIX)\win32\lib\vc10\tangod.9.2.5.pdb - Level2 - true - ProgramDatabase - Cdecl - Default - - - 0x0409 - - - $(PREFIX)\win32\lib\vc10\tangod.lib - false - - - %(AdditionalLibraryDirectories) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cppapi/win32/tango_vc10/winnt_lib.sln b/cppapi/win32/tango_vc10/winnt_lib.sln deleted file mode 100644 index 6eab26242..000000000 --- a/cppapi/win32/tango_vc10/winnt_lib.sln +++ /dev/null @@ -1,25 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tango_dll", "tango_dll\tango_dll.vcxproj", "{6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tango_static", "tango_static\tango_static.vcxproj", "{1514B691-6515-47BC-BDFB-9BD45C483577}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|Win32.ActiveCfg = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|Win32.Build.0 = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|Win32.ActiveCfg = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|Win32.Build.0 = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|Win32.ActiveCfg = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|Win32.Build.0 = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|Win32.ActiveCfg = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|Win32.Build.0 = Debug|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/cppapi/win32/tango_vc6/tango_dll/tango_dll.dsp b/cppapi/win32/tango_vc6/tango_dll/tango_dll.dsp deleted file mode 100755 index 7cf7837d1..000000000 --- a/cppapi/win32/tango_vc6/tango_dll/tango_dll.dsp +++ /dev/null @@ -1,566 +0,0 @@ -# Microsoft Developer Studio Project File - Name="tango_dll" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=tango_dll - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "tango_dll.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "tango_dll.mak" CFG="tango_dll - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "tango_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "tango_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "tango_dll - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TANGO_DLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /I "..\..\..\server" /I "..\..\..\client" /I "..\..\resources" /I "$(OMNI_BASE)\win32_dll\include" /I "$(LOG4TANGO_BASE)\win32_dll\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LOG4TANGO_HAS_DLL" /D "_TANGO_LIB" /YX /FD /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 log4tango.lib omniorb405_rt.lib omnidynamic405_rt.lib omnithread30_rt.lib COS405_rt.lib ws2_32.lib mswsock.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:5.5 /dll /machine:I386 /def:"tango.def" /out:"lib/tango552.dll" /implib:"Release/tango.lib" /libpath:"$(OMNI_BASE)\win32_dll\lib" /libpath:"$(LOG4TANGO_BASE)\win32_dll\lib" -# SUBTRACT LINK32 /pdb:none /map -# Begin Special Build Tool -SOURCE="$(InputPath)" -PreLink_Desc=Build def file... -PreLink_Cmds=C:\perl\bin\perl ..\..\makedef.pl tango.def tango552 release\*.obj -# End Special Build Tool - -!ELSEIF "$(CFG)" == "tango_dll - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TANGO_DLL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "..\..\..\server" /I "..\..\..\client" /I "..\..\resources" /I "$(OMNI_BASE)\win32_dll\include" /I "$(LOG4TANGO_BASE)\win32_dll\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_TANGO_LIB" /D "LOG4TANGO_HAS_DLL" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 log4tangod.lib omniORB405_rtd.lib omniDynamic405_rtd.lib COS405_rtd.lib omnithread30_rtd.lib ws2_32.lib mswsock.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /version:5.5 /dll /debug /machine:I386 /def:"tango.def" /out:"lib/tango552d.dll" /implib:"Debug/tangod.lib" /pdbtype:sept /libpath:"$(OMNI_BASE)\win32_dll\lib" /libpath:"$(LOG4TANGO_BASE)\win32_dll\lib" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PreLink_Desc=Build def file... -PreLink_Cmds=C:\perl\bin\perl ..\..\makedef.pl tango.def tango552d debug\*.obj -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "tango_dll - Win32 Release" -# Name "tango_dll - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\client\api_util.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\apiexcept.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\asynreq.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\attr_proxy.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\attrdesc.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\attribute.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\attrmanip.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\basiccommand.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\blackbox.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\cbthread.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\class_factory.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\classattribute.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\command.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\coutappender.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\coutbuf.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\dbapi_attribute.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\dbapi_base.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\dbapi_class.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\dbapi_datum.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\dbapi_device.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\dbapi_server.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dev_event.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\devapi_attr.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\devapi_base.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\devapi_data.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\devapi_datahist.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\device.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\device_2.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\device_3.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\deviceclass.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\devicelog.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dserver.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dserverclass.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dserverlog.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dserverpoll.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dserversignal.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\event.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\eventcmds.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\eventsupplier.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\except.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\filedatabase.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\group.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\logcmds.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\logging.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\logstream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\multiattribute.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\ntservice.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollcmds.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollobj.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollring.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollthread.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\proxy_asyn.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\proxy_asyn_cb.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\seqvec.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\tangoappender.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\idl\tangoDynSK.cpp -# ADD CPP /D "_OMNIORB_STUB_DLL" /D "__WIN32__" /D "__x86__" /D _WIN32_WINNT=0x0400 /D "__NT__" /D __OSVERSION=4 -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\tangorollingfileappender.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\idl\tangoSK.cpp -# ADD CPP /D "_OMNIORB_STUB_DLL" /D "__WIN32__" /D "__x86__" /D _WIN32_WINNT=0x0400 /D "__NT__" /D __OSVERSION=4 -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\thsig.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\utils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\w32win.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\w_attribute.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\..\client\apiexcept.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\attrdesc.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\attribute.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\attrmanip.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\auto_tango_monitor.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\basiccommand.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\blackbox.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\cbthread.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\classattribute.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\command.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\coutappender.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\coutbuf.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\dbapi.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\devapi.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\devasyn.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\device.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\device_2.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\device_3.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\deviceclass.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dserver.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dserverclass.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dserversignal.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\event.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\eventcmds.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\eventsupplier.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\except.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\filedatabase.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\group.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\log4tango.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\logcmds.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\logging.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\logstream.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\multiattribute.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\ntservice.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollcmds.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollext.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollobj.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollring.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollthread.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\seqvec.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\idl\tango.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\tango.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\tango_config.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\tango_const.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\tango_monitor.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\tangoappender.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\tangorollingfileappender.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\utils.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\w32win.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\w_attribute.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/cppapi/win32/tango_vc6/tango_static/tango_static.dsp b/cppapi/win32/tango_vc6/tango_static/tango_static.dsp deleted file mode 100755 index caa47f94e..000000000 --- a/cppapi/win32/tango_vc6/tango_static/tango_static.dsp +++ /dev/null @@ -1,551 +0,0 @@ -# Microsoft Developer Studio Project File - Name="tango_static" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=tango_static - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "tango_static.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "tango_static.mak" CFG="tango_static - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "tango_static - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "tango_static - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "tango_static - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\server" /I "..\..\..\client" /I "..\..\resources" /I "$(OMNI_BASE)\win32\include" /I "$(LOG4TANGO_BASE)\win32\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_WINSTATIC" /D "_TANGO_LIB" /YX /FD /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /out:"lib\tango.5.5.2.lib" - -!ELSEIF "$(CFG)" == "tango_static - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GR /GX /Zi /Od /I "..\..\..\server" /I "..\..\..\client" /I "..\..\resources" /I "$(OMNI_BASE)\win32\include" /I "$(LOG4TANGO_BASE)\win32\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_WINSTATIC" /D "_TANGO_LIB" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /out:"lib\tangod.5.5.2.lib" - -!ENDIF - -# Begin Target - -# Name "tango_static - Win32 Release" -# Name "tango_static - Win32 Debug" -# Begin Group "Header files" - -# PROP Default_Filter ".h" -# Begin Source File - -SOURCE=..\..\..\client\apiexcept.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\attrdesc.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\attribute.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\attrmanip.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\auto_tango_monitor.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\basiccommand.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\blackbox.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\cbthread.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\classattribute.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\command.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\coutappender.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\coutbuf.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\dbapi.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\devapi.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\devasyn.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\device.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\device_2.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\device_3.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\deviceclass.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dserver.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dserverclass.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dserversignal.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\event.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\eventcmds.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\eventsupplier.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\except.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\filedatabase.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\group.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\log4tango.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\logcmds.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\logging.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\logstream.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\multiattribute.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\ntservice.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollcmds.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollext.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollobj.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollring.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollthread.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\seqvec.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\idl\tango.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\tango.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\tango_config.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\tango_const.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\tango_monitor.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\tangoappender.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\tangorollingfileappender.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\utils.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\w32win.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\w_attribute.h -# End Source File -# End Group -# Begin Group "Source Files" - -# PROP Default_Filter ".cpp" -# Begin Source File - -SOURCE=..\..\..\client\api_util.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\apiexcept.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\asynreq.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\attr_proxy.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\attrdesc.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\attribute.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\attrmanip.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\basiccommand.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\blackbox.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\cbthread.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\class_factory.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\classattribute.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\command.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\coutappender.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\coutbuf.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\dbapi_attribute.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\dbapi_base.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\dbapi_class.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\dbapi_datum.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\dbapi_device.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\dbapi_server.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dev_event.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\devapi_attr.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\devapi_base.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\devapi_data.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\devapi_datahist.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\device.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\device_2.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\device_3.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\deviceclass.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\devicelog.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dserver.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dserverclass.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dserverlog.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dserverpoll.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\dserversignal.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\event.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\eventcmds.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\eventsupplier.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\except.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\filedatabase.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\group.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\logcmds.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\logging.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\logstream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\multiattribute.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\ntservice.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollcmds.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollobj.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollring.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\pollthread.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\proxy_asyn.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\client\proxy_asyn_cb.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\seqvec.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\tangoappender.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\idl\tangoDynSK.cpp -# ADD CPP /D "__WIN32__" /D "__x86__" /D _WIN32_WINNT=0x0400 /D "__NT__" /D __OSVERSION=4 -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\tangorollingfileappender.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\idl\tangoSK.cpp -# ADD CPP /D "__WIN32__" /D "__x86__" /D _WIN32_WINNT=0x0400 /D "__NT__" /D __OSVERSION=4 -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\thsig.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\utils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\w32win.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\server\w_attribute.cpp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\resources\tango.ico -# End Source File -# Begin Source File - -SOURCE=..\..\resources\tango.rc -# End Source File -# End Target -# End Project diff --git a/cppapi/win32/tango_vc6/winnt_lib.dsw b/cppapi/win32/tango_vc6/winnt_lib.dsw deleted file mode 100755 index 6ffc84fff..000000000 --- a/cppapi/win32/tango_vc6/winnt_lib.dsw +++ /dev/null @@ -1,41 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "tango_dll"=.\tango_dll\tango_dll.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "tango_static"=.\tango_static\tango_static.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/cppapi/win32/tango_vc7/tango_dll/tango_dll.vcproj b/cppapi/win32/tango_vc7/tango_dll/tango_dll.vcproj deleted file mode 100755 index f782d0fc7..000000000 --- a/cppapi/win32/tango_vc7/tango_dll/tango_dll.vcproj +++ /dev/null @@ -1,1911 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cppapi/win32/tango_vc7/tango_static/tango_static.vcproj b/cppapi/win32/tango_vc7/tango_static/tango_static.vcproj deleted file mode 100755 index 7fe37b61a..000000000 --- a/cppapi/win32/tango_vc7/tango_static/tango_static.vcproj +++ /dev/null @@ -1,1860 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cppapi/win32/tango_vc7/winnt_lib.sln b/cppapi/win32/tango_vc7/winnt_lib.sln deleted file mode 100755 index f00374240..000000000 --- a/cppapi/win32/tango_vc7/winnt_lib.sln +++ /dev/null @@ -1,46 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tango_dll", "tango_dll\tango_dll.vcproj", "{6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tango_static", "tango_static\tango_static.vcproj", "{1514B691-6515-47BC-BDFB-9BD45C483577}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug.ActiveCfg = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug.Build.0 = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release.ActiveCfg = Release|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release.Build.0 = Release|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug.ActiveCfg = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug.Build.0 = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release.ActiveCfg = Release|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|Win32.ActiveCfg = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|Win32.Build.0 = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|Win32.ActiveCfg = Release|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|Win32.Build.0 = Release|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|Win32.ActiveCfg = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|Win32.Build.0 = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|Win32.ActiveCfg = Release|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/cppapi/win32/tango_vc7/winnt_lib.suo b/cppapi/win32/tango_vc7/winnt_lib.suo deleted file mode 100755 index 51c547a1d..000000000 Binary files a/cppapi/win32/tango_vc7/winnt_lib.suo and /dev/null differ diff --git a/cppapi/win32/tango_vc8/tango_dll/tango_dll.vcproj b/cppapi/win32/tango_vc8/tango_dll/tango_dll.vcproj deleted file mode 100755 index 7c0f220f5..000000000 --- a/cppapi/win32/tango_vc8/tango_dll/tango_dll.vcproj +++ /dev/null @@ -1,2047 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cppapi/win32/tango_vc8/tango_static/tango_static.vcproj b/cppapi/win32/tango_vc8/tango_static/tango_static.vcproj deleted file mode 100755 index fc7c8d639..000000000 --- a/cppapi/win32/tango_vc8/tango_static/tango_static.vcproj +++ /dev/null @@ -1,1976 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cppapi/win32/tango_vc8/winnt_lib.sln b/cppapi/win32/tango_vc8/winnt_lib.sln deleted file mode 100755 index 929de0474..000000000 --- a/cppapi/win32/tango_vc8/winnt_lib.sln +++ /dev/null @@ -1,24 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tango_dll", "tango_dll\tango_dll.vcproj", "{6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tango_static", "tango_static\tango_static.vcproj", "{1514B691-6515-47BC-BDFB-9BD45C483577}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|Win32.ActiveCfg = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|Win32.Build.0 = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|Win32.ActiveCfg = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|Win32.Build.0 = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|Win32.ActiveCfg = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|Win32.ActiveCfg = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|Win32.Build.0 = Debug|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/cppapi/win32/tango_vc8/winnt_lib.suo b/cppapi/win32/tango_vc8/winnt_lib.suo deleted file mode 100755 index 25b4d474c..000000000 Binary files a/cppapi/win32/tango_vc8/winnt_lib.suo and /dev/null differ diff --git a/cppapi/win32/tango_vc9/tango_dll/tango_dll.vcproj b/cppapi/win32/tango_vc9/tango_dll/tango_dll.vcproj deleted file mode 100644 index 1471521e8..000000000 --- a/cppapi/win32/tango_vc9/tango_dll/tango_dll.vcproj +++ /dev/null @@ -1,2208 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cppapi/win32/tango_vc9/tango_static/tango_static.vcproj b/cppapi/win32/tango_vc9/tango_static/tango_static.vcproj deleted file mode 100644 index a62924b33..000000000 --- a/cppapi/win32/tango_vc9/tango_static/tango_static.vcproj +++ /dev/null @@ -1,2143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cppapi/win32/tango_vc9/winnt_lib.sln b/cppapi/win32/tango_vc9/winnt_lib.sln deleted file mode 100644 index 80aa778b4..000000000 --- a/cppapi/win32/tango_vc9/winnt_lib.sln +++ /dev/null @@ -1,25 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tango_dll", "tango_dll\tango_dll.vcproj", "{6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tango_static", "tango_static\tango_static.vcproj", "{1514B691-6515-47BC-BDFB-9BD45C483577}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|Win32.ActiveCfg = Release|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|Win32.Build.0 = Release|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|Win32.ActiveCfg = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|Win32.Build.0 = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|Win32.ActiveCfg = Release|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|Win32.Build.0 = Release|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|Win32.ActiveCfg = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|Win32.Build.0 = Debug|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/cppapi/win64/tango_vc10/tango_dll/tango_dll.vcxproj b/cppapi/win64/tango_vc10/tango_dll/tango_dll.vcxproj deleted file mode 100644 index d603aeac2..000000000 --- a/cppapi/win64/tango_vc10/tango_dll/tango_dll.vcxproj +++ /dev/null @@ -1,1281 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54} - - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - Windows7.1SDK - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\Release\ - $(PREFIX)\win64\lib\vc10_dll\ - .\Release\ - .\Release\ - true - true - false - false - .\Debug\ - $(PREFIX)\win64\lib\vc10_dll\ - .\Debug\ - .\Debug\ - true - true - true - true - tango925d - tango925 - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Lib\x64;$(LibraryPath) - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Lib\x64;$(LibraryPath) - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Bin\x64;$(ExecutablePath) - false - false - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Bin\x64;$(ExecutablePath) - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/tango_dll.tlb - - - - - Disabled - ..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\resources;$(OMNI_BASE)\win32_dll\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32_dll\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;_TANGO_LIB;_CRT_SECURE_NO_DEPRECATE;JPG_USE_ASM;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - .\Release/tango_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level2 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Build def file... - C:\perl\bin\perl ..\..\makedef.pl tango.def tango727 release\*.obj - - - log4tango.lib;omniorb416_rt.lib;omnidynamic416_rt.lib;omnithread34_rt.lib;COS416_rt.lib;zmq.lib;ws2_32.lib;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win32\lib\vc9_dll\tango727.dll - 8.1.0 - true - $(OMNI_BASE)\win32_dll\lib;$(ZMQ_BASE)\win32\lib\vc9_dll;$(LOG4TANGO_BASE)\win32_dll\lib;%(AdditionalLibraryDirectories) - tango.def - .\Release/tango810.pdb - false - - - $(PREFIX)\win32\lib\vc9_dll\tango.lib - MachineX86 - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/tango_dll.tlb - - - - - Disabled - ..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\..\win32\resources;$(OMNI_BASE)\include\vc10;$(ZMQ_BASE)\win64\include\vc10;$(LOG4TANGO_BASE)\win64\include\vc10;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;_TANGO_LIB;_CRT_SECURE_NO_DEPRECATE;_64BITS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - .\Release/tango_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level2 - true - Default - /MP8 %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Build def file... - C:\perl64\bin\perl ..\..\..\win32\makedef.pl tango.def tango925 release\*.obj - - - log4tango.lib;omniorb421_rt.lib;omnidynamic421_rt.lib;omnithread40_rt.lib;COS421_rt.lib;zmq.lib;ws2_32.lib;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win64\lib\vc10_dll\tango925.dll - 9.2.5 - true - $(OMNI_BASE)\lib\vc10_dll;$(ZMQ_BASE)\win64\lib\vc10_dll;$(LOG4TANGO_BASE)\win64\lib\vc10_dll;%(AdditionalLibraryDirectories) - tango.def - .\Release/tango925.pdb - false - - - $(PREFIX)\win64\lib\vc10_dll\tango.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/tango_dll.tlb - - - - - Disabled - ..;..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\resources;$(OMNI_BASE)\win32_dll\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32_dll\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_TANGO_LIB;LOG4TANGO_HAS_DLL;JPG_USE_ASM;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - - - .\Debug/tango_dll.pch - .\Debug/ - .\Debug/ - $(PREFIX)\win32\lib\vc9_dll\tangod.7.2.6.pdb - Level2 - true - ProgramDatabase - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Build def file... - C:\perl\bin\perl ..\..\makedef.pl tango.def tango727d debug\*.obj - - - log4tangod.lib;omniORB416_rtd.lib;omniDynamic416_rtd.lib;COS416_rtd.lib;omnithread34_rtd.lib;zmqd.lib;ws2_32.lib;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - LinkVerboseLib - $(PREFIX)\win32\lib\vc9_dll\tango727d.dll - 7.2.7 - $(ZMQ_BASE)\win32\lib\vc9_dll;$(OMNI_BASE)\win32_dll\lib;$(LOG4TANGO_BASE)\win32_dll\lib;%(AdditionalLibraryDirectories) - tango.def - true - .\Debug/tango727d.pdb - false - - - $(PREFIX)\win32\lib\vc9_dll\tangod.lib - MachineX86 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/tango_dll.tlb - - - - - Disabled - ..;..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\..\win32\resources;$(OMNI_BASE)\include\vc10;$(ZMQ_BASE)\win64\include\vc10;$(LOG4TANGO_BASE)\win64\include\vc10;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_TANGO_LIB;LOG4TANGO_HAS_DLL;_64BITS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - - - .\Debug/tango_dll.pch - .\Debug/ - .\Debug/ - - - Level2 - true - ProgramDatabase - Default - /MP8 %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Build def file... - C:\perl64\bin\perl ..\..\..\win32\makedef.pl tango.def tango925d debug\*.obj - - - log4tangod.lib;omniORB421_rtd.lib;omniDynamic421_rtd.lib;COS421_rtd.lib;omnithread40_rtd.lib;zmqd.lib;ws2_32.lib;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - NotSet - $(PREFIX)\win64\lib\vc10_dll\tango925d.dll - 9.2.5 - $(ZMQ_BASE)\win64\lib\vc10_dll;$(OMNI_BASE)\lib\vc10_dll;$(LOG4TANGO_BASE)\win64\lib\vc10_dll;%(AdditionalLibraryDirectories) - tango.def - true - .\Debug/tango925d.pdb - false - - - $(PREFIX)\win64\lib\vc10_dll\tangod.lib - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_TANGO_LIB;LOG4TANGO_HAS_DLL - WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_TANGO_LIB;LOG4TANGO_HAS_DLL - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cppapi/win64/tango_vc10/tango_static/tango_static.vcxproj b/cppapi/win64/tango_vc10/tango_static/tango_static.vcxproj deleted file mode 100644 index 56064bd96..000000000 --- a/cppapi/win64/tango_vc10/tango_static/tango_static.vcxproj +++ /dev/null @@ -1,1174 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {1514B691-6515-47BC-BDFB-9BD45C483577} - - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - Windows7.1SDK - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\Release\ - $(PREFIX)\win64\lib\vc10\ - .\Release\ - .\Release\ - .\Debug\ - $(PREFIX)\win64\lib\vc10\ - .\Debug\ - .\Debug\ - tangod - tango - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Lib\x64;$(LibraryPath) - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Include;$(IncludePath) - C:\Program Files %28x86%29\Microsoft SDKs\Windows\v7.1A\Lib\x64;$(LibraryPath) - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\server\jpeg;..\..\..\server;..\..\..\client;..\..\resources;$(OMNI_BASE)\win32\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_WINSTATIC;_TANGO_LIB;_CRT_SECURE_NO_DEPRECATE;JPG_USE_ASM;STATIC_EXPORT;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - - - .\Release/tango_static.pch - .\Release/ - .\Release/ - .\Release/ - Level2 - true - Default - - - 0x0409 - - - $(PREFIX)\win32\lib\vc9\tango.lib - - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\server\jpeg;..\..\..\server;..\..\..\client;..\..\..\win32\resources;$(OMNI_BASE)\include\vc10;$(ZMQ_BASE)\win64\include\vc10;$(LOG4TANGO_BASE)\win64\include\vc10;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_WINSTATIC;_TANGO_LIB;_CRT_SECURE_NO_DEPRECATE;_64BITS;ZMQ_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - - - .\Release/tango_static.pch - .\Release/ - .\Release/ - .\Release/ - Level2 - true - Default - /MP8 %(AdditionalOptions) - - - 0x0409 - - - $(PREFIX)\win64\lib\vc10\tango.lib - libpgm.lib - C:\cmake\openpgm5.2.122\vc10\static\lib\Release;%(AdditionalLibraryDirectories) - libpgm.lib - - - - - Disabled - ..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\resources;$(OMNI_BASE)\win32\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_WINDOWS;_WINSTATIC;_TANGO_LIB;_MBCS;_CRT_SECURE_NO_DEPRECATE;JPG_USE_ASM;STATIC_EXPORT;%(PreprocessorDefinitions) - MultiThreadedDebug - true - .\Debug/tango_static.pch - .\Debug/ - .\Debug/ - $(PREFIX)\win32\lib\vc9\tangod.7.2.7.pdb - Level2 - true - ProgramDatabase - Cdecl - Default - - - 0x0409 - - - $(PREFIX)\win32\lib\vc9\tangod.lib - true - - - - - Disabled - ..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\..\win32\resources;$(OMNI_BASE)\include\vc10;$(ZMQ_BASE)\win64\include\vc10;$(LOG4TANGO_BASE)\win64\include\vc10;%(AdditionalIncludeDirectories) - WIN32,_LIB;_DEBUG;_WINDOWS;_64BITS;_WINSTATIC;_TANGO_LIB;_MBCS;_CRT_SECURE_NO_DEPRECATE;ZMQ_STATIC;%(PreprocessorDefinitions) - MultiThreadedDebug - true - .\Debug/tango_static.pch - .\Debug/ - .\Debug/ - $(PREFIX)\win64\lib\vc10\tangod.9.2.5.pdb - Level2 - true - ProgramDatabase - Cdecl - Default - /MP8 %(AdditionalOptions) - - - 0x0409 - - - - - false - - - $(PREFIX)\win64\lib\vc10\tangod.lib - false - libpgmd.lib - C:\cmake\openpgm5.2.122\vc10\static\lib\Debug;%(AdditionalLibraryDirectories) - libpgmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - diff --git a/cppapi/win64/tango_vc10/winnt_lib.sln b/cppapi/win64/tango_vc10/winnt_lib.sln deleted file mode 100644 index 2c2dc8bd4..000000000 --- a/cppapi/win64/tango_vc10/winnt_lib.sln +++ /dev/null @@ -1,35 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tango_dll", "tango_dll\tango_dll.vcxproj", "{6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tango_static", "tango_static\tango_static.vcxproj", "{1514B691-6515-47BC-BDFB-9BD45C483577}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|Win32.ActiveCfg = Release|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|Win32.Build.0 = Release|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|x64.ActiveCfg = Debug|x64 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|x64.Build.0 = Debug|x64 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|Win32.ActiveCfg = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|Win32.Build.0 = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|x64.ActiveCfg = Release|x64 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|x64.Build.0 = Release|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|Win32.ActiveCfg = Release|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|Win32.Build.0 = Release|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|x64.ActiveCfg = Debug|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|x64.Build.0 = Debug|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|Win32.ActiveCfg = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|Win32.Build.0 = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|x64.ActiveCfg = Release|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/cppapi/win64/tango_vc11/tango_dll/tango_dll.vcxproj b/cppapi/win64/tango_vc11/tango_dll/tango_dll.vcxproj deleted file mode 100644 index e30581a88..000000000 --- a/cppapi/win64/tango_vc11/tango_dll/tango_dll.vcxproj +++ /dev/null @@ -1,1265 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54} - - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - v110 - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\Release\ - $(PREFIX)\win64\lib\vc11_dll\ - .\Release\ - .\Release\ - true - true - false - false - .\Debug\ - $(PREFIX)\win64\lib\vc11_dll\ - .\Debug\ - .\Debug\ - true - true - true - true - tango902d - tango902 - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/tango_dll.tlb - - - - - Disabled - ..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\resources;$(OMNI_BASE)\win32_dll\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32_dll\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;_TANGO_LIB;_CRT_SECURE_NO_DEPRECATE;JPG_USE_ASM;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - .\Release/tango_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level2 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Build def file... - C:\perl\bin\perl ..\..\makedef.pl tango.def tango727 release\*.obj - - - log4tango.lib;omniorb416_rt.lib;omnidynamic416_rt.lib;omnithread34_rt.lib;COS416_rt.lib;zmq.lib;ws2_32.lib;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win32\lib\vc9_dll\tango727.dll - 8.1.0 - true - $(OMNI_BASE)\win32_dll\lib;$(ZMQ_BASE)\win32\lib\vc9_dll;$(LOG4TANGO_BASE)\win32_dll\lib;%(AdditionalLibraryDirectories) - tango.def - .\Release/tango810.pdb - false - - - $(PREFIX)\win32\lib\vc9_dll\tango.lib - MachineX86 - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/tango_dll.tlb - - - - - Disabled - ..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\..\win32\resources;$(OMNI_BASE)\include\vc11;$(ZMQ_BASE)\win64\include\vc11;$(LOG4TANGO_BASE)\win64\include\vc11;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;_TANGO_LIB;_CRT_SECURE_NO_DEPRECATE;_64BITS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - .\Release/tango_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level2 - true - Default - /MP8 %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Build def file... - C:\perl64\bin\perl ..\..\..\win32\makedef.pl tango.def tango902 release\*.obj - - - log4tango.lib;omniorb417_rt.lib;omnidynamic417_rt.lib;omnithread34_rt.lib;COS417_rt.lib;zmq.lib;ws2_32.lib;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win64\lib\vc11_dll\tango902.dll - 9.0 - true - $(OMNI_BASE)\lib\vc11_dll;$(ZMQ_BASE)\win64\lib\vc11_dll;$(LOG4TANGO_BASE)\win64\lib\vc11_dll;%(AdditionalLibraryDirectories) - tango.def - .\Release/tango812.pdb - false - - - $(PREFIX)\win64\lib\vc11_dll\tango.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/tango_dll.tlb - - - - - Disabled - ..;..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\resources;$(OMNI_BASE)\win32_dll\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32_dll\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_TANGO_LIB;LOG4TANGO_HAS_DLL;JPG_USE_ASM;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - - - .\Debug/tango_dll.pch - .\Debug/ - .\Debug/ - $(PREFIX)\win32\lib\vc9_dll\tangod.7.2.6.pdb - Level2 - true - ProgramDatabase - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Build def file... - C:\perl\bin\perl ..\..\makedef.pl tango.def tango727d debug\*.obj - - - log4tangod.lib;omniORB416_rtd.lib;omniDynamic416_rtd.lib;COS416_rtd.lib;omnithread34_rtd.lib;zmqd.lib;ws2_32.lib;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - LinkVerboseLib - $(PREFIX)\win32\lib\vc9_dll\tango727d.dll - 7.2.7 - $(ZMQ_BASE)\win32\lib\vc9_dll;$(OMNI_BASE)\win32_dll\lib;$(LOG4TANGO_BASE)\win32_dll\lib;%(AdditionalLibraryDirectories) - tango.def - true - .\Debug/tango727d.pdb - false - - - $(PREFIX)\win32\lib\vc9_dll\tangod.lib - MachineX86 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/tango_dll.tlb - - - - - Disabled - ..;..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\..\win32\resources;$(OMNI_BASE)\include\vc11;$(ZMQ_BASE)\win64\include\vc11;$(LOG4TANGO_BASE)\win64\include\vc11;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_TANGO_LIB;LOG4TANGO_HAS_DLL;_64BITS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - - - .\Debug/tango_dll.pch - .\Debug/ - .\Debug/ - $(PREFIX)\win64\lib\vc11_dll\tangod.9.0.2.pdb - Level2 - true - ProgramDatabase - Default - /MP8 %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Build def file... - C:\perl64\bin\perl ..\..\..\win32\makedef.pl tango.def tango902d debug\*.obj - - - log4tangod.lib;omniORB417_rtd.lib;omniDynamic417_rtd.lib;COS417_rtd.lib;omnithread34_rtd.lib;zmqd.lib;ws2_32.lib;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - NotSet - $(PREFIX)\win64\lib\vc11_dll\tango902d.dll - $(ZMQ_BASE)\win64\lib\vc11_dll;$(OMNI_BASE)\lib\vc11_dll;$(LOG4TANGO_BASE)\win64\lib\vc11_dll;%(AdditionalLibraryDirectories) - tango.def - true - .\Debug/tango812d.pdb - false - - - $(PREFIX)\win64\lib\vc11_dll\tangod.lib - 9.0 - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_TANGO_LIB;LOG4TANGO_HAS_DLL - WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_TANGO_LIB;LOG4TANGO_HAS_DLL - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cppapi/win64/tango_vc11/tango_static/tango_static.vcxproj b/cppapi/win64/tango_vc11/tango_static/tango_static.vcxproj deleted file mode 100644 index 7ab4ba0fb..000000000 --- a/cppapi/win64/tango_vc11/tango_static/tango_static.vcxproj +++ /dev/null @@ -1,1154 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {1514B691-6515-47BC-BDFB-9BD45C483577} - - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - v110 - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\Release\ - $(PREFIX)\win64\lib\vc11\ - .\Release\ - .\Release\ - .\Debug\ - $(PREFIX)\win64\lib\vc11\ - .\Debug\ - .\Debug\ - tangod - tango - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\server\jpeg;..\..\..\server;..\..\..\client;..\..\resources;$(OMNI_BASE)\win32\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_WINSTATIC;_TANGO_LIB;_CRT_SECURE_NO_DEPRECATE;JPG_USE_ASM;STATIC_EXPORT;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - - - .\Release/tango_static.pch - .\Release/ - .\Release/ - .\Release/ - Level2 - true - Default - - - 0x0409 - - - $(PREFIX)\win32\lib\vc9\tango.lib - - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\server\jpeg;..\..\..\server;..\..\..\client;..\..\..\win32\resources;$(OMNI_BASE)\include\vc11;$(ZMQ_BASE)\win64\include\vc11;$(LOG4TANGO_BASE)\win64\include\vc11;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_WINSTATIC;_TANGO_LIB;_CRT_SECURE_NO_DEPRECATE;_64BITS;STATIC_EXPORT;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - - - .\Release/tango_static.pch - .\Release/ - .\Release/ - .\Release/ - Level2 - true - Default - /MP8 %(AdditionalOptions) - - - 0x0409 - - - $(PREFIX)\win64\lib\vc11\tango.lib - - - - - Disabled - ..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\resources;$(OMNI_BASE)\win32\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_WINDOWS;_WINSTATIC;_TANGO_LIB;_MBCS;_CRT_SECURE_NO_DEPRECATE;JPG_USE_ASM;STATIC_EXPORT;%(PreprocessorDefinitions) - MultiThreadedDebug - true - .\Debug/tango_static.pch - .\Debug/ - .\Debug/ - $(PREFIX)\win32\lib\vc9\tangod.7.2.7.pdb - Level2 - true - ProgramDatabase - Cdecl - Default - - - 0x0409 - - - $(PREFIX)\win32\lib\vc9\tangod.lib - true - - - - - Disabled - ..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\..\win32\resources;$(OMNI_BASE)\include\vc11;$(ZMQ_BASE)\win64\include\vc11;$(LOG4TANGO_BASE)\win64\include\vc11;%(AdditionalIncludeDirectories) - WIN32,_LIB;_DEBUG;_WINDOWS;_64BITS;_WINSTATIC;_TANGO_LIB;_MBCS;_CRT_SECURE_NO_DEPRECATE;STATIC_EXPORT;%(PreprocessorDefinitions) - MultiThreadedDebug - true - .\Debug/tango_static.pch - .\Debug/ - .\Debug/ - $(PREFIX)\win64\lib\vc11\tangod.9.0.2.pdb - Level2 - true - ProgramDatabase - Cdecl - Default - /MP8 %(AdditionalOptions) - - - 0x0409 - - - - - false - - - $(PREFIX)\win64\lib\vc11\tangod.lib - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cppapi/win64/tango_vc11/winnt_lib.sln b/cppapi/win64/tango_vc11/winnt_lib.sln deleted file mode 100644 index e74bfe9ef..000000000 --- a/cppapi/win64/tango_vc11/winnt_lib.sln +++ /dev/null @@ -1,34 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2012 for Windows Desktop -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tango_dll", "tango_dll\tango_dll.vcxproj", "{6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tango_static", "tango_static\tango_static.vcxproj", "{1514B691-6515-47BC-BDFB-9BD45C483577}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|Win32.ActiveCfg = Debug|x64 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|Win32.Build.0 = Debug|x64 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|x64.ActiveCfg = Debug|x64 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|x64.Build.0 = Debug|x64 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|Win32.ActiveCfg = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|Win32.Build.0 = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|x64.ActiveCfg = Release|x64 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|x64.Build.0 = Release|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|Win32.ActiveCfg = Release|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|x64.ActiveCfg = Debug|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|x64.Build.0 = Debug|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|Win32.ActiveCfg = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|Win32.Build.0 = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|x64.ActiveCfg = Release|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/cppapi/win64/tango_vc12/tango_dll/tango_dll.vcxproj b/cppapi/win64/tango_vc12/tango_dll/tango_dll.vcxproj deleted file mode 100644 index b2428e39e..000000000 --- a/cppapi/win64/tango_vc12/tango_dll/tango_dll.vcxproj +++ /dev/null @@ -1,1279 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54} - - - - DynamicLibrary - false - MultiByte - v120 - - - DynamicLibrary - false - MultiByte - v120 - - - DynamicLibrary - false - MultiByte - v120 - - - DynamicLibrary - false - MultiByte - v120 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\Release\ - $(PREFIX)\win64\lib\vc12_dll\ - .\Release\ - .\Release\ - true - true - false - false - .\Debug\ - $(PREFIX)\win64\lib\vc12_dll\ - .\Debug\ - .\Debug\ - true - true - true - true - tango925d - tango925 - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/tango_dll.tlb - - - - - Disabled - ..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\resources;$(OMNI_BASE)\win32_dll\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32_dll\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;_TANGO_LIB;_CRT_SECURE_NO_DEPRECATE;JPG_USE_ASM;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - .\Release/tango_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level2 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Build def file... - C:\perl\bin\perl ..\..\makedef.pl tango.def tango727 release\*.obj - - - log4tango.lib;omniorb416_rt.lib;omnidynamic416_rt.lib;omnithread34_rt.lib;COS416_rt.lib;zmq.lib;ws2_32.lib;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win32\lib\vc9_dll\tango727.dll - 8.1.0 - true - $(OMNI_BASE)\win32_dll\lib;$(ZMQ_BASE)\win32\lib\vc9_dll;$(LOG4TANGO_BASE)\win32_dll\lib;%(AdditionalLibraryDirectories) - tango.def - .\Release/tango810.pdb - false - - - $(PREFIX)\win32\lib\vc9_dll\tango.lib - MachineX86 - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/tango_dll.tlb - - - - - Disabled - ..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\..\win32\resources;$(OMNI_BASE)\include\vc12;$(ZMQ_BASE)\win64\include\vc12;$(LOG4TANGO_BASE)\win64\include\vc12;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;_TANGO_LIB;_CRT_SECURE_NO_DEPRECATE;_64BITS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - .\Release/tango_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level2 - true - Default - /MP8 %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Build def file... - C:\perl64\bin\perl ..\..\..\win32\makedef.pl tango.def tango925 release\*.obj - - - log4tango.lib;omniorb421_rt.lib;omnidynamic421_rt.lib;omnithread40_rt.lib;COS421_rt.lib;zmq.lib;ws2_32.lib;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(PREFIX)\win64\lib\vc12_dll\tango925.dll - 9.2 - true - $(OMNI_BASE)\lib\vc12_dll;$(ZMQ_BASE)\win64\lib\vc12_dll;$(LOG4TANGO_BASE)\win64\lib\vc12_dll;%(AdditionalLibraryDirectories) - tango.def - .\Release/tango925.pdb - false - - - $(PREFIX)\win64\lib\vc12_dll\tango.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/tango_dll.tlb - - - - - Disabled - ..;..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\resources;$(OMNI_BASE)\win32_dll\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32_dll\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_TANGO_LIB;LOG4TANGO_HAS_DLL;JPG_USE_ASM;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - - - .\Debug/tango_dll.pch - .\Debug/ - .\Debug/ - $(PREFIX)\win32\lib\vc9_dll\tangod.7.2.6.pdb - Level2 - true - ProgramDatabase - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Build def file... - C:\perl\bin\perl ..\..\makedef.pl tango.def tango727d debug\*.obj - - - log4tangod.lib;omniORB416_rtd.lib;omniDynamic416_rtd.lib;COS416_rtd.lib;omnithread34_rtd.lib;zmqd.lib;ws2_32.lib;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - LinkVerboseLib - $(PREFIX)\win32\lib\vc9_dll\tango727d.dll - 7.2.7 - $(ZMQ_BASE)\win32\lib\vc9_dll;$(OMNI_BASE)\win32_dll\lib;$(LOG4TANGO_BASE)\win32_dll\lib;%(AdditionalLibraryDirectories) - tango.def - true - .\Debug/tango727d.pdb - false - - - $(PREFIX)\win32\lib\vc9_dll\tangod.lib - MachineX86 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/tango_dll.tlb - - - - - Disabled - ..;..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\..\win32\resources;$(OMNI_BASE)\include\vc12;$(ZMQ_BASE)\win64\include\vc12;$(LOG4TANGO_BASE)\win64\include\vc12;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_TANGO_LIB;LOG4TANGO_HAS_DLL;_64BITS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - - - .\Debug/tango_dll.pch - .\Debug/ - .\Debug/ - $(PREFIX)\win64\lib\vc12_dll\tangod.9.2.5.pdb - Level2 - true - ProgramDatabase - Default - /MP8 %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Build def file... - C:\perl64\bin\perl ..\..\..\win32\makedef.pl tango.def tango925d debug\*.obj - - - log4tangod.lib;omniORB421_rtd.lib;omniDynamic421_rtd.lib;COS421_rtd.lib;omnithread40_rtd.lib;zmqd.lib;ws2_32.lib;mswsock.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - NotSet - $(PREFIX)\win64\lib\vc12_dll\tango925d.dll - $(ZMQ_BASE)\win64\lib\vc12_dll;$(OMNI_BASE)\lib\vc12_dll;$(LOG4TANGO_BASE)\win64\lib\vc12_dll;%(AdditionalLibraryDirectories) - tango.def - true - .\Debug/tango925d.pdb - false - - - $(PREFIX)\win64\lib\vc12_dll\tangod.lib - 9.2 - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_TANGO_LIB;LOG4TANGO_HAS_DLL - WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_TANGO_LIB;LOG4TANGO_HAS_DLL - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - _OMNIORB_STUB_DLL;__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - EnableFastChecks - EnableFastChecks - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cppapi/win64/tango_vc12/tango_static/tango_static.vcxproj b/cppapi/win64/tango_vc12/tango_static/tango_static.vcxproj deleted file mode 100644 index 94b503214..000000000 --- a/cppapi/win64/tango_vc12/tango_static/tango_static.vcxproj +++ /dev/null @@ -1,1168 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {1514B691-6515-47BC-BDFB-9BD45C483577} - - - - StaticLibrary - false - MultiByte - v120 - - - StaticLibrary - false - MultiByte - v120 - - - StaticLibrary - false - MultiByte - v120 - - - StaticLibrary - false - MultiByte - v120 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\Release\ - $(PREFIX)\win64\lib\vc12\ - .\Release\ - .\Release\ - .\Debug\ - $(PREFIX)\win64\lib\vc12\ - .\Debug\ - .\Debug\ - tangod - tango - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\server\jpeg;..\..\..\server;..\..\..\client;..\..\resources;$(OMNI_BASE)\win32\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_WINSTATIC;_TANGO_LIB;_CRT_SECURE_NO_DEPRECATE;JPG_USE_ASM;STATIC_EXPORT;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - - - .\Release/tango_static.pch - .\Release/ - .\Release/ - .\Release/ - Level2 - true - Default - - - 0x0409 - - - $(PREFIX)\win32\lib\vc9\tango.lib - - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\server\jpeg;..\..\..\server;..\..\..\client;..\..\..\win32\resources;$(OMNI_BASE)\include\vc12;$(ZMQ_BASE)\win64\include\vc12;$(LOG4TANGO_BASE)\win64\include\vc12;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;ZMQ_STATIC;_WINDOWS;_WINSTATIC;_TANGO_LIB;_CRT_SECURE_NO_DEPRECATE;_64BITS;STATIC_EXPORT;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - - - .\Release/tango_static.pch - .\Release/ - .\Release/ - .\Release/ - Level2 - true - Default - /MP8 %(AdditionalOptions) - - - 0x0409 - - - $(PREFIX)\win64\lib\vc12\tango.lib - - - - - Disabled - ..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\resources;$(OMNI_BASE)\win32\include;$(ZMQ_BASE)\win32\include\vc9;$(LOG4TANGO_BASE)\win32\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_WINDOWS;_WINSTATIC;_TANGO_LIB;_MBCS;_CRT_SECURE_NO_DEPRECATE;JPG_USE_ASM;STATIC_EXPORT;%(PreprocessorDefinitions) - MultiThreadedDebug - true - .\Debug/tango_static.pch - .\Debug/ - .\Debug/ - $(PREFIX)\win32\lib\vc9\tangod.7.2.7.pdb - Level2 - true - ProgramDatabase - Cdecl - Default - - - 0x0409 - - - $(PREFIX)\win32\lib\vc9\tangod.lib - true - - - - - Disabled - ..\..\..\server;..\..\..\client;..\..\..\server\jpeg;..\..\..\win32\resources;$(OMNI_BASE)\include\vc12;$(ZMQ_BASE)\win64\include\vc12;$(LOG4TANGO_BASE)\win64\include\vc12;%(AdditionalIncludeDirectories) - WIN32,_LIB;ZMQ_STATIC;_DEBUG;_WINDOWS;_64BITS;_WINSTATIC;_TANGO_LIB;_MBCS;_CRT_SECURE_NO_DEPRECATE;STATIC_EXPORT;%(PreprocessorDefinitions) - MultiThreadedDebug - true - .\Debug/tango_static.pch - .\Debug/ - .\Debug/ - $(PREFIX)\win64\lib\vc12\tangod.9.2.5.pdb - Level2 - true - ProgramDatabase - Cdecl - Default - /MP8 %(AdditionalOptions) - - - 0x0409 - - - - - false - - - $(PREFIX)\win64\lib\vc12\tangod.lib - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - __x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - Disabled - Disabled - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cppapi/win64/tango_vc12/winnt_lib.sln b/cppapi/win64/tango_vc12/winnt_lib.sln deleted file mode 100644 index 6ad393523..000000000 --- a/cppapi/win64/tango_vc12/winnt_lib.sln +++ /dev/null @@ -1,36 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tango_dll", "tango_dll\tango_dll.vcxproj", "{6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tango_static", "tango_static\tango_static.vcxproj", "{1514B691-6515-47BC-BDFB-9BD45C483577}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|Win32.ActiveCfg = Debug|x64 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|Win32.Build.0 = Debug|x64 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|x64.ActiveCfg = Debug|x64 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|x64.Build.0 = Debug|x64 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|Win32.ActiveCfg = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|Win32.Build.0 = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|x64.ActiveCfg = Release|x64 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|x64.Build.0 = Release|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|Win32.ActiveCfg = Debug|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|x64.ActiveCfg = Debug|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|x64.Build.0 = Debug|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|Win32.ActiveCfg = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|Win32.Build.0 = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|x64.ActiveCfg = Release|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/cppapi/win64/tango_vc9/tango_dll/tango_dll.vcproj b/cppapi/win64/tango_vc9/tango_dll/tango_dll.vcproj deleted file mode 100644 index eb0b9f7fe..000000000 --- a/cppapi/win64/tango_vc9/tango_dll/tango_dll.vcproj +++ /dev/null @@ -1,3714 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cppapi/win64/tango_vc9/tango_static/tango_static.vcproj b/cppapi/win64/tango_vc9/tango_static/tango_static.vcproj deleted file mode 100644 index b8c64df69..000000000 --- a/cppapi/win64/tango_vc9/tango_static/tango_static.vcproj +++ /dev/null @@ -1,3573 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cppapi/win64/tango_vc9/winnt_lib.sln b/cppapi/win64/tango_vc9/winnt_lib.sln deleted file mode 100644 index 22c846496..000000000 --- a/cppapi/win64/tango_vc9/winnt_lib.sln +++ /dev/null @@ -1,32 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tango_dll", "tango_dll\tango_dll.vcproj", "{6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tango_static", "tango_static\tango_static.vcproj", "{1514B691-6515-47BC-BDFB-9BD45C483577}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|Win32.ActiveCfg = Release|x64 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Debug|x64.ActiveCfg = Release|x64 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|Win32.ActiveCfg = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|Win32.Build.0 = Debug|Win32 - {6535FE7D-DC8B-4E01-AAC0-FC9167E10A54}.Release|x64.ActiveCfg = Release|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|Win32.ActiveCfg = Release|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|Win32.Build.0 = Release|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|x64.ActiveCfg = Debug|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Debug|x64.Build.0 = Debug|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|Win32.ActiveCfg = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|Win32.Build.0 = Debug|Win32 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|x64.ActiveCfg = Release|x64 - {1514B691-6515-47BC-BDFB-9BD45C483577}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/doxygen/CMakeLists.txt b/doxygen/CMakeLists.txt new file mode 100644 index 000000000..0d7aac816 --- /dev/null +++ b/doxygen/CMakeLists.txt @@ -0,0 +1,8 @@ +if(DOXYGEN_FOUND) + configure_file(Doxyfile.cmake Doxyfile @ONLY) + add_custom_target(docs ${DOXYGEN_EXECUTABLE} Doxyfile + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + + add_custom_target(clean-docs rm -rf ${PROJECT_SOURCE_DIR}/docs) + #TODO install +endif() \ No newline at end of file diff --git a/cppapi/doxygen/Doxyfile b/doxygen/Doxyfile.cmake similarity index 97% rename from cppapi/doxygen/Doxyfile rename to doxygen/Doxyfile.cmake index 0f69f84b4..b5ac2d2e4 100644 --- a/cppapi/doxygen/Doxyfile +++ b/doxygen/Doxyfile.cmake @@ -38,7 +38,7 @@ PROJECT_NAME = "Tango Core Classes Reference " # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 9.3.0 +PROJECT_NUMBER = @LIBRARY_VERSION@ # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a @@ -51,14 +51,14 @@ PROJECT_BRIEF = # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo # to the output directory. -PROJECT_LOGO = ../doxygen/logo.jpg +PROJECT_LOGO = @CMAKE_CURRENT_SOURCE_DIR@/logo.jpg # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = ./doxygen +OUTPUT_DIRECTORY = @PROJECT_BINARY_DIR@/docs # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and @@ -68,7 +68,7 @@ OUTPUT_DIRECTORY = ./doxygen # performance problems for the file system. # The default value is: NO. -CREATE_SUBDIRS = NO +CREATE_SUBDIRS = YES # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this @@ -398,7 +398,7 @@ LOOKUP_CACHE_SIZE = 0 # normally produced when WARNINGS is set to YES. # The default value is: NO. -EXTRACT_ALL = NO +EXTRACT_ALL = YES # If the EXTRACT_PRIVATE tag is set to YES all private members of a class will # be included in the documentation. @@ -449,7 +449,7 @@ EXTRACT_ANON_NSPACES = NO # section is generated. This option has no effect if EXTRACT_ALL is enabled. # The default value is: NO. -HIDE_UNDOC_MEMBERS = YES +HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set @@ -457,14 +457,14 @@ HIDE_UNDOC_MEMBERS = YES # no effect if EXTRACT_ALL is enabled. # The default value is: NO. -HIDE_UNDOC_CLASSES = YES +HIDE_UNDOC_CLASSES = NO # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend # (class|struct|union) declarations. If set to NO these declarations will be # included in the documentation. # The default value is: NO. -HIDE_FRIEND_COMPOUNDS = YES +HIDE_FRIEND_COMPOUNDS = NO # If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any # documentation blocks found inside the body of a function. If set to NO these @@ -631,14 +631,14 @@ SHOW_USED_FILES = YES # (if specified). # The default value is: YES. -SHOW_FILES = NO +SHOW_FILES = YES # Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces # page. This will remove the Namespaces entry from the Quick Index and from the # Folder Tree View (if specified). # The default value is: YES. -SHOW_NAMESPACES = NO +SHOW_NAMESPACES = YES # The FILE_VERSION_FILTER tag can be used to specify a program or script that # doxygen should invoke to get the current version for each file (typically from @@ -725,7 +725,7 @@ WARN_NO_PARAMDOC = NO # FILE_VERSION_FILTER) # The default value is: $file:$line: $text. -WARN_FORMAT = +WARN_FORMAT = "$file:$line: $text" # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard @@ -743,36 +743,38 @@ WARN_LOGFILE = # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = device.h \ - deviceclass.h \ - command.h \ - utils.h \ - except.h \ - attrdesc.h \ - fwdattrdesc.h \ - pipedesc.h \ - tango_const.h \ - attribute.h \ - multiattribute.h \ - pollext.h \ - device_2.h \ - w_attribute.h \ - pipe.h \ - w_pipe.h \ - device_3.h \ - device_4.h \ - device_5.h \ - encoded_attribute.h \ - attrprop.h \ - ../client/dbapi.h \ - ../client/apiexcept.h \ - ../client/devapi.h \ - ../client/doc.h \ - ../client/devasyn.h \ - ../client/event.h \ - ../client/group.h \ - tango.h \ - seqvec.h +INPUT = @PROJECT_SOURCE_DIR@/include/tango/server/device.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/deviceclass.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/command.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/utils.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/except.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/attrdesc.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/fwdattrdesc.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/pipedesc.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/tango_const.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/attribute.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/multiattribute.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/pollext.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/device_2.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/w_attribute.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/pipe.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/w_pipe.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/device_3.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/device_4.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/device_5.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/encoded_attribute.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/attrprop.h \ + @PROJECT_SOURCE_DIR@/include/tango/client/dbapi.h \ + @PROJECT_SOURCE_DIR@/include/tango/client/apiexcept.h \ + @PROJECT_SOURCE_DIR@/include/tango/client/devapi.h \ + @PROJECT_SOURCE_DIR@/include/tango/client/doc.h \ + @PROJECT_SOURCE_DIR@/include/tango/client/devasyn.h \ + @PROJECT_SOURCE_DIR@/include/tango/client/event.h \ + @PROJECT_SOURCE_DIR@/include/tango/client/group.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/tango.h \ + @PROJECT_SOURCE_DIR@/include/tango/server/seqvec.h \ + @PROJECT_SOURCE_DIR@/include/log4tango \ + @PROJECT_SOURCE_DIR@/src/log4tango # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses @@ -798,7 +800,7 @@ FILE_PATTERNS = # be searched for input files as well. # The default value is: NO. -RECURSIVE = NO +RECURSIVE = YES # The EXCLUDE tag can be used to specify files and/or directories that should be # excluded from the INPUT source files. This way you can easily exclude a @@ -994,7 +996,7 @@ USE_HTAGS = NO # See also: Section \class. # The default value is: YES. -VERBATIM_HEADERS = NO +VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- # Configuration options related to the alphabetical class index @@ -1037,7 +1039,7 @@ GENERATE_HTML = YES # The default directory is: html. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_OUTPUT = ../doc_html +HTML_OUTPUT = . # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each # generated HTML page (for example: .htm, .php, .asp). diff --git a/cppapi/doxygen/alba.jpg b/doxygen/alba.jpg similarity index 100% rename from cppapi/doxygen/alba.jpg rename to doxygen/alba.jpg diff --git a/cppapi/doxygen/elettra_logo.gif b/doxygen/elettra_logo.gif old mode 100755 new mode 100644 similarity index 100% rename from cppapi/doxygen/elettra_logo.gif rename to doxygen/elettra_logo.gif diff --git a/cppapi/doxygen/footer.html b/doxygen/footer.html similarity index 100% rename from cppapi/doxygen/footer.html rename to doxygen/footer.html diff --git a/cppapi/doxygen/header.html b/doxygen/header.html similarity index 100% rename from cppapi/doxygen/header.html rename to doxygen/header.html diff --git a/cppapi/doxygen/logo.jpg b/doxygen/logo.jpg similarity index 100% rename from cppapi/doxygen/logo.jpg rename to doxygen/logo.jpg diff --git a/cppapi/doxygen/logo_desy.gif b/doxygen/logo_desy.gif similarity index 100% rename from cppapi/doxygen/logo_desy.gif rename to doxygen/logo_desy.gif diff --git a/cppapi/doxygen/soleil_logo.gif b/doxygen/soleil_logo.gif similarity index 100% rename from cppapi/doxygen/soleil_logo.gif rename to doxygen/soleil_logo.gif diff --git a/generated/idl/CMakeLists.txt b/generated/idl/CMakeLists.txt new file mode 100644 index 000000000..c8f50f01a --- /dev/null +++ b/generated/idl/CMakeLists.txt @@ -0,0 +1,14 @@ +add_custom_command( + OUTPUT tango.h tangoSK.cpp tangoDynSK.cpp + COMMAND ${CMAKE_COMMAND} -DOMNIIDL_PATH=${OMNIIDL_PATH} -DIDL_PKG_INCLUDE_DIRS=${IDL_PKG_INCLUDE_DIRS} + -DCMAKE_INSTALL_FULL_INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR} -DPATCHES_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/generate.cmake + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +) + +set(SOURCES tangoSK.cpp + tangoDynSK.cpp) + +add_library(idl_objects OBJECT ${SOURCES} tango.h) +target_compile_options(idl_objects PRIVATE -fPIC) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tango.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/idl") \ No newline at end of file diff --git a/cppapi/server/idl/EnhanceAttributeValue_4 b/generated/idl/EnhanceAttributeValue_4 similarity index 100% rename from cppapi/server/idl/EnhanceAttributeValue_4 rename to generated/idl/EnhanceAttributeValue_4 diff --git a/cppapi/server/idl/EnhanceAttributeValue_5 b/generated/idl/EnhanceAttributeValue_5 similarity index 100% rename from cppapi/server/idl/EnhanceAttributeValue_5 rename to generated/idl/EnhanceAttributeValue_5 diff --git a/cppapi/server/idl/EnhanceDevPipeData b/generated/idl/EnhanceDevPipeData similarity index 100% rename from cppapi/server/idl/EnhanceDevPipeData rename to generated/idl/EnhanceDevPipeData diff --git a/cppapi/server/idl/CMakeLists.txt b/generated/idl/generate.cmake similarity index 53% rename from cppapi/server/idl/CMakeLists.txt rename to generated/idl/generate.cmake index 356e182de..017e3a502 100644 --- a/cppapi/server/idl/CMakeLists.txt +++ b/generated/idl/generate.cmake @@ -1,31 +1,26 @@ message("Generate tango.h, tangoSK.cpp and tangoDybSK.cpp from idl") +message("Using OMNIIDL_PATH=${OMNIIDL_PATH}") +message("Using IDL=${IDL_PKG_INCLUDE_DIRS}") execute_process(COMMAND ${OMNIIDL_PATH}omniidl -I${IDL_PKG_INCLUDE_DIRS} -bcxx -Wbh=.h -Wbs=SK.cpp -Wbd=DynSK.cpp -Wba ${IDL_PKG_INCLUDE_DIRS}/tango.idl - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - RESULT_VARIABLE FAILED) + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + RESULT_VARIABLE FAILED) if(${FAILED}) message(SEND_ERROR " Failed to generate source files from idl. rv=${FAILED}") endif() -FILE(GLOB ENHANCEMENTS Enhance*) +message("Using PATCHES_SOURCE_DIR=${PATCHES_SOURCE_DIR}") + +FILE(GLOB ENHANCEMENTS ${PATCHES_SOURCE_DIR}/Enhance*) foreach(ENHANCEMENT ${ENHANCEMENTS}) message("Applying enhancement ${ENHANCEMENT}") execute_process(COMMAND sed -i -f ${ENHANCEMENT} tango.h - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - RESULT_VARIABLE FAILED) - - #non-zero + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + RESULT_VARIABLE FAILED) + #non-zero if(${FAILED}) message(SEND_ERROR " Failed to apply ${ENHANCEMENT}. rv=${FAILED}") endif() -endforeach(ENHANCEMENT) - -set(SOURCES tangoSK.cpp - tangoDynSK.cpp) - -add_library(idl_objects OBJECT ${SOURCES} tango.h) -target_compile_options(idl_objects PRIVATE -fPIC) - -install(FILES tango.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/idl") +endforeach(ENHANCEMENT) \ No newline at end of file diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt new file mode 100644 index 000000000..4ede46d9c --- /dev/null +++ b/include/CMakeLists.txt @@ -0,0 +1,152 @@ +set(LOG4TANGO_HEADERS + log4tango/Appender.hh + log4tango/AppenderAttachable.hh + log4tango/LayoutAppender.hh + log4tango/FileAppender.hh + log4tango/RollingFileAppender.hh + log4tango/OstreamAppender.hh + log4tango/Layout.hh + log4tango/PatternLayout.hh + log4tango/XmlLayout.hh + log4tango/Logger.hh + log4tango/LogSeparator.hh + log4tango/LoggerStream.hh + log4tango/LogStream.hh + log4tango/LogStreambuf.hh + log4tango/LoggingEvent.hh + log4tango/Level.hh + log4tango/NDC.hh + log4tango/TimeStamp.hh + log4tango/Filter.hh + log4tango/Export.hh + log4tango/Portability.hh) + +set(LOG4TANGO_THREADING + log4tango/threading/DummyThreads.hh + log4tango/threading/PThreads.hh + log4tango/threading/MSThreads.hh + log4tango/threading/Threading.hh) + +set(CLIENT_HEADERS + tango/client/accessproxy.h + tango/client/apiexcept.h + tango/client/cbthread.h + tango/client/dbapi.h + tango/client/devapi.h + tango/client/devasyn.h + tango/client/event.h + tango/client/eventconsumer.h + tango/client/filedatabase.h + tango/client/group.h + tango/client/lockthread.h + tango/client/Database.h + tango/client/DbDevice.h + tango/client/ApiUtil.h + tango/client/DeviceData.h + tango/client/DeviceAttribute.h + tango/client/DevicePipe.h + tango/client/Connection.h + tango/client/DeviceProxy.h + tango/client/AttributeProxy.h) + +set(CLIENT_HELPERS + tango/client/helpers/DeviceProxyHelper.h + tango/client/helpers/PogoHelper.h + tango/client/helpers/TangoExceptionsHelper.h + tango/client/helpers/Xstring.h) + +set(CLIENT_TEMPLATES + tango/client/event.tpp + tango/client/devapi_attr.tpp + tango/client/devapi_utils.tpp + tango/client/api_util.tpp + tango/client/devapi_pipe.tpp) + +set(SERVER_HEADERS tango/server/attrdesc.h + tango/server/attribute.h + tango/server/attrmanip.h + tango/server/attrprop.h + tango/server/auto_tango_monitor.h + tango/server/basiccommand.h + tango/server/blackbox.h + tango/server/classattribute.h + tango/server/classpipe.h + tango/server/command.h + tango/server/pipe.h + tango/server/coutappender.h + tango/server/coutbuf.h + tango/server/device.h + tango/server/device_2.h + tango/server/device_3.h + tango/server/device_4.h + tango/server/device_5.h + tango/server/deviceclass.h + tango/server/devintr.h + tango/server/dintrthread.h + tango/server/dserver.h + tango/server/dserverclass.h + tango/server/dserversignal.h + tango/server/eventsupplier.h + tango/server/except.h + tango/server/fwdattrdesc.h + tango/server/fwdattribute.h + tango/server/log4tango.h + tango/server/logcmds.h + tango/server/logging.h + tango/server/logstream.h + tango/server/multiattribute.h + tango/server/ntservice.h + tango/server/pipedesc.h + tango/server/pollcmds.h + tango/server/pollext.h + tango/server/pollobj.h + tango/server/pollring.h + tango/server/pollthread.h + tango/server/readers_writers_lock.h + tango/server/rootattreg.h + tango/server/seqvec.h + tango/server/tango_config.h + tango/server/tango_const.h + tango/server/tango_monitor.h + tango/server/tangoappender.h + tango/server/tangorollingfileappender.h + tango/server/utils.h + tango/server/w32win.h + tango/server/w_attribute.h + tango/server/w_pipe.h + tango/server/subdev_diag.h + tango/server/encoded_attribute.h + tango/server/encoded_format.h) + + +set(SERVER_TEMPLATES + tango/server/attribute.tpp + tango/server/attrsetval.tpp + tango/server/attribute_spec.tpp + tango/server/attrprop.tpp + tango/server/utils.tpp + tango/server/pipe.tpp + tango/server/device_3.tpp + tango/server/fwdattribute.tpp + tango/server/fwdattribute_spec.tpp + tango/server/pollext.tpp + tango/server/pollring.tpp + tango/server/pollthread.tpp + tango/server/utils.tpp + tango/server/utils_spec.tpp + tango/server/w_attribute.tpp + tango/server/w_attrsetval.tpp + tango/server/w_attribute_spec.tpp + tango/server/w_pipe.tpp) + +add_library(include_objects OBJECT tango.h ${SERVER_HEADERS} ${CLIENT_HEADERS} ${CLIENT_HELPERS} ${LOG4TANGO_HEADERS} ${LOG4TANGO_THREADING}) + +install(FILES tango.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}") +install(FILES ${SERVER_HEADERS} ${SERVER_TEMPLATES} DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/tango/server") +install(FILES ${CLIENT_HEADERS} ${CLIENT_TEMPLATES} ${CLIENT_HELPERS} DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/tango/client") + +install(FILES ${LOG4TANGO_HEADERS} + DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/log4tango) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/log4tango/config.h DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/log4tango) +install(FILES ${LOG4TANGO_THREADING} + DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/log4tango/threading) diff --git a/log4tango/include/log4tango/Appender.hh b/include/log4tango/Appender.hh similarity index 96% rename from log4tango/include/log4tango/Appender.hh rename to include/log4tango/Appender.hh index aca045976..cb6bb6d80 100644 --- a/log4tango/include/log4tango/Appender.hh +++ b/include/log4tango/Appender.hh @@ -25,14 +25,14 @@ // You should have received a copy of the GNU Lesser General Public License // along with Log4Tango. If not, see . -#include +#include "Portability.hh" #include #include #include -#include -#include -#include -#include +#include "Level.hh" +#include "Layout.hh" +#include "LoggingEvent.hh" +#include "threading/Threading.hh" #ifndef _LOG4TANGO_APPENDER_H #define _LOG4TANGO_APPENDER_H diff --git a/log4tango/include/log4tango/AppenderAttachable.hh b/include/log4tango/AppenderAttachable.hh similarity index 96% rename from log4tango/include/log4tango/AppenderAttachable.hh rename to include/log4tango/AppenderAttachable.hh index c3d739a96..6cc7650cf 100644 --- a/log4tango/include/log4tango/AppenderAttachable.hh +++ b/include/log4tango/AppenderAttachable.hh @@ -28,11 +28,11 @@ #ifndef _LOG4TANGO_APPENDER_ATTACHABLE_H #define _LOG4TANGO_APPENDER_ATTACHABLE_H -#include +#include "Portability.hh" #include #include -#include -#include +#include "Appender.hh" +#include "threading/Threading.hh" namespace log4tango { diff --git a/log4tango/include/log4tango/Export.hh b/include/log4tango/Export.hh similarity index 100% rename from log4tango/include/log4tango/Export.hh rename to include/log4tango/Export.hh diff --git a/log4tango/include/log4tango/FileAppender.hh b/include/log4tango/FileAppender.hh similarity index 97% rename from log4tango/include/log4tango/FileAppender.hh rename to include/log4tango/FileAppender.hh index 534975edc..ac9f5af74 100644 --- a/log4tango/include/log4tango/FileAppender.hh +++ b/include/log4tango/FileAppender.hh @@ -28,8 +28,8 @@ #ifndef _LOG4TANGO_FILEAPPENDER_H #define _LOG4TANGO_FILEAPPENDER_H -#include -#include +#include "Portability.hh" +#include "LayoutAppender.hh" namespace log4tango { diff --git a/log4tango/include/log4tango/Filter.hh b/include/log4tango/Filter.hh similarity index 100% rename from log4tango/include/log4tango/Filter.hh rename to include/log4tango/Filter.hh diff --git a/log4tango/include/log4tango/Layout.hh b/include/log4tango/Layout.hh similarity index 94% rename from log4tango/include/log4tango/Layout.hh rename to include/log4tango/Layout.hh index 100489e24..fc9563583 100644 --- a/log4tango/include/log4tango/Layout.hh +++ b/include/log4tango/Layout.hh @@ -28,9 +28,9 @@ #ifndef _LOG4TANGO_LAYOUT_H #define _LOG4TANGO_LAYOUT_H -#include -#include -#include +#include "Portability.hh" +#include "threading/Threading.hh" +#include "LoggingEvent.hh" #include namespace log4tango { diff --git a/log4tango/include/log4tango/LayoutAppender.hh b/include/log4tango/LayoutAppender.hh similarity index 94% rename from log4tango/include/log4tango/LayoutAppender.hh rename to include/log4tango/LayoutAppender.hh index 5ac68fa23..ece308882 100644 --- a/log4tango/include/log4tango/LayoutAppender.hh +++ b/include/log4tango/LayoutAppender.hh @@ -28,10 +28,10 @@ #ifndef _LOG4TANGO_LAYOUTAPPENDER_H #define _LOG4TANGO_LAYOUTAPPENDER_H -#include +#include "Portability.hh" #include -#include -#include +#include "Appender.hh" +#include "PatternLayout.hh" namespace log4tango { diff --git a/log4tango/include/log4tango/Level.hh b/include/log4tango/Level.hh similarity index 98% rename from log4tango/include/log4tango/Level.hh rename to include/log4tango/Level.hh index 5e6c576a9..fe5f44118 100644 --- a/log4tango/include/log4tango/Level.hh +++ b/include/log4tango/Level.hh @@ -28,7 +28,7 @@ #ifndef _LOG4TANGO_LEVEL_H #define _LOG4TANGO_LEVEL_H -#include +#include "Portability.hh" #include #include diff --git a/log4tango/include/log4tango/LogSeparator.hh b/include/log4tango/LogSeparator.hh similarity index 97% rename from log4tango/include/log4tango/LogSeparator.hh rename to include/log4tango/LogSeparator.hh index 946354213..e573c1edd 100644 --- a/log4tango/include/log4tango/LogSeparator.hh +++ b/include/log4tango/LogSeparator.hh @@ -28,7 +28,7 @@ #ifndef _LOG4TANGO_LOG_SEPARATOR_H #define _LOG4TANGO_LOG_SEPARATOR_H -#include +#include "Portability.hh" namespace log4tango { diff --git a/log4tango/include/log4tango/LogStream.hh b/include/log4tango/LogStream.hh similarity index 100% rename from log4tango/include/log4tango/LogStream.hh rename to include/log4tango/LogStream.hh diff --git a/log4tango/include/log4tango/LogStreambuf.hh b/include/log4tango/LogStreambuf.hh similarity index 100% rename from log4tango/include/log4tango/LogStreambuf.hh rename to include/log4tango/LogStreambuf.hh diff --git a/log4tango/include/log4tango/Logger.hh b/include/log4tango/Logger.hh similarity index 98% rename from log4tango/include/log4tango/Logger.hh rename to include/log4tango/Logger.hh index 4934ee4fd..134c5fbbf 100644 --- a/log4tango/include/log4tango/Logger.hh +++ b/include/log4tango/Logger.hh @@ -33,12 +33,12 @@ //----------------------------------------------------------------------------- //#define LOG4TANGO_LOGGERS_USE_LOGSTREAM -#include -#include -#include -#include +#include "Portability.hh" +#include "AppenderAttachable.hh" +#include "LoggingEvent.hh" +#include "Level.hh" #ifndef LOG4TANGO_LOGGERS_USE_LOGSTREAM -# include +# include "LoggerStream.hh" #endif namespace log4tango { diff --git a/log4tango/include/log4tango/LoggerStream.hh b/include/log4tango/LoggerStream.hh similarity index 98% rename from log4tango/include/log4tango/LoggerStream.hh rename to include/log4tango/LoggerStream.hh index 74e766b4f..8cbe3c320 100644 --- a/log4tango/include/log4tango/LoggerStream.hh +++ b/include/log4tango/LoggerStream.hh @@ -28,12 +28,12 @@ #ifndef _LOG4TANGO_LOGGER_STREAM_H #define _LOG4TANGO_LOGGER_STREAM_H -#include -#include +#include "Portability.hh" +#include "Level.hh" #ifdef LOG4TANGO_HAVE_SSTREAM # include #endif -#include +#include "LogSeparator.hh" namespace log4tango { diff --git a/log4tango/include/log4tango/LoggingEvent.hh b/include/log4tango/LoggingEvent.hh similarity index 97% rename from log4tango/include/log4tango/LoggingEvent.hh rename to include/log4tango/LoggingEvent.hh index 242b8ef06..5e639133e 100644 --- a/log4tango/include/log4tango/LoggingEvent.hh +++ b/include/log4tango/LoggingEvent.hh @@ -28,11 +28,11 @@ #ifndef _LOG4TANGO_LOGGINGEVENT_H #define _LOG4TANGO_LOGGINGEVENT_H -#include +#include "Portability.hh" #include -#include -#include +#include "Level.hh" +#include "TimeStamp.hh" namespace log4tango { diff --git a/log4tango/include/log4tango/NDC.hh b/include/log4tango/NDC.hh similarity index 100% rename from log4tango/include/log4tango/NDC.hh rename to include/log4tango/NDC.hh diff --git a/log4tango/include/log4tango/OstreamAppender.hh b/include/log4tango/OstreamAppender.hh similarity index 95% rename from log4tango/include/log4tango/OstreamAppender.hh rename to include/log4tango/OstreamAppender.hh index 5c1d9cb77..d2005abb3 100644 --- a/log4tango/include/log4tango/OstreamAppender.hh +++ b/include/log4tango/OstreamAppender.hh @@ -28,10 +28,10 @@ #ifndef _LOG4TANGO_OSTREAMAPPENDER_H #define _LOG4TANGO_OSTREAMAPPENDER_H -#include +#include "Portability.hh" #include #include -#include +#include "LayoutAppender.hh" namespace log4tango { diff --git a/log4tango/include/log4tango/PatternLayout.hh b/include/log4tango/PatternLayout.hh similarity index 98% rename from log4tango/include/log4tango/PatternLayout.hh rename to include/log4tango/PatternLayout.hh index a44ccbdf8..0e616ddd8 100644 --- a/log4tango/include/log4tango/PatternLayout.hh +++ b/include/log4tango/PatternLayout.hh @@ -28,8 +28,8 @@ #ifndef _LOG4TANGO_PATTERNLAYOUT_H #define _LOG4TANGO_PATTERNLAYOUT_H -#include -#include +#include "Portability.hh" +#include "Layout.hh" #include #ifdef LOG4TANGO_HAVE_SSTREAM # include diff --git a/log4tango/include/log4tango/Portability.hh b/include/log4tango/Portability.hh similarity index 98% rename from log4tango/include/log4tango/Portability.hh rename to include/log4tango/Portability.hh index 4de79c729..91f5942e5 100644 --- a/log4tango/include/log4tango/Portability.hh +++ b/include/log4tango/Portability.hh @@ -34,7 +34,7 @@ # include #endif -#include +#include "Export.hh" #if defined(_MSC_VER) # pragma warning( disable : 4786 ) // 255 char debug symbol limit diff --git a/log4tango/include/log4tango/RollingFileAppender.hh b/include/log4tango/RollingFileAppender.hh similarity index 96% rename from log4tango/include/log4tango/RollingFileAppender.hh rename to include/log4tango/RollingFileAppender.hh index d3f82ef22..e90c997d9 100644 --- a/log4tango/include/log4tango/RollingFileAppender.hh +++ b/include/log4tango/RollingFileAppender.hh @@ -28,8 +28,8 @@ #ifndef _LOG4TANGO_ROLLINGFILEAPPENDER_H #define _LOG4TANGO_ROLLINGFILEAPPENDER_H -#include -#include +#include "Portability.hh" +#include "FileAppender.hh" namespace log4tango { diff --git a/log4tango/include/log4tango/TimeStamp.hh b/include/log4tango/TimeStamp.hh similarity index 98% rename from log4tango/include/log4tango/TimeStamp.hh rename to include/log4tango/TimeStamp.hh index c2d14578a..45c01d6a4 100644 --- a/log4tango/include/log4tango/TimeStamp.hh +++ b/include/log4tango/TimeStamp.hh @@ -28,7 +28,7 @@ #ifndef _LOG4TANGO_TIMESTAMP_H #define _LOG4TANGO_TIMESTAMP_H -#include +#include "Portability.hh" namespace log4tango { diff --git a/log4tango/include/log4tango/XmlLayout.hh b/include/log4tango/XmlLayout.hh similarity index 96% rename from log4tango/include/log4tango/XmlLayout.hh rename to include/log4tango/XmlLayout.hh index 31c25bb26..3155ed682 100644 --- a/log4tango/include/log4tango/XmlLayout.hh +++ b/include/log4tango/XmlLayout.hh @@ -28,8 +28,8 @@ #ifndef _LOG4TANGO_XML_LAYOUT_H #define _LOG4TANGO_XML_LAYOUT_H -#include -#include +#include "Portability.hh" +#include "Layout.hh" namespace log4tango { diff --git a/log4tango/include/log4tango/config-win32.h b/include/log4tango/config-win32.h similarity index 100% rename from log4tango/include/log4tango/config-win32.h rename to include/log4tango/config-win32.h diff --git a/log4tango/include/log4tango/threading/DummyThreads.hh b/include/log4tango/threading/DummyThreads.hh similarity index 100% rename from log4tango/include/log4tango/threading/DummyThreads.hh rename to include/log4tango/threading/DummyThreads.hh diff --git a/log4tango/include/log4tango/threading/MSThreads.hh b/include/log4tango/threading/MSThreads.hh similarity index 100% rename from log4tango/include/log4tango/threading/MSThreads.hh rename to include/log4tango/threading/MSThreads.hh diff --git a/log4tango/include/log4tango/threading/PThreads.hh b/include/log4tango/threading/PThreads.hh similarity index 99% rename from log4tango/include/log4tango/threading/PThreads.hh rename to include/log4tango/threading/PThreads.hh index 4447bd82b..c336b3006 100644 --- a/log4tango/include/log4tango/threading/PThreads.hh +++ b/include/log4tango/threading/PThreads.hh @@ -28,7 +28,7 @@ #ifndef _LOG4TANGO_THREADING_PTHREADS_H #define _LOG4TANGO_THREADING_PTHREADS_H -#include +#include "../Portability.hh" #include #include #include diff --git a/log4tango/include/log4tango/threading/Threading.hh b/include/log4tango/threading/Threading.hh similarity index 94% rename from log4tango/include/log4tango/threading/Threading.hh rename to include/log4tango/threading/Threading.hh index adf4c3b63..16ecd5616 100644 --- a/log4tango/include/log4tango/threading/Threading.hh +++ b/include/log4tango/threading/Threading.hh @@ -28,7 +28,7 @@ #ifndef _LOG4TANGO_THREADING_THREADING_H #define _LOG4TANGO_THREADING_THREADING_H -#include +#include "../Portability.hh" #ifdef LOG4TANGO_HAVE_THREADING @@ -36,7 +36,7 @@ # include # endif # ifdef LOG4TANGO_USE_PTHREADS -# include +# include "PThreads.hh" # endif #else diff --git a/cppapi/server/tango.h b/include/tango.h similarity index 61% rename from cppapi/server/tango.h rename to include/tango.h index 32713fa16..1e0ff0d23 100644 --- a/cppapi/server/tango.h +++ b/include/tango.h @@ -37,7 +37,7 @@ // Include the Tango config file // -#include +#include // // Include IDL generated files which includes CORBA include files @@ -45,6 +45,14 @@ #include +// +// A short inline function to hide the CORBA::string_dup function +// +namespace Tango { + inline char *string_dup(char *s) { return CORBA::string_dup(s); } + + inline char *string_dup(const char *s) { return CORBA::string_dup(s); } +} // // Some Windows specific include (necessary when used with MFC) // @@ -80,25 +88,25 @@ // Include API files (device and database) // -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include // // Include Tango utility files // -#include -#include -#include -#include +#include +#include +#include +#include #if !defined(TANGO_CLIENT) && defined TANGO_HAS_LOG4TANGO - #include + #include #endif // @@ -107,30 +115,30 @@ // #ifndef TANGO_CLIENT - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include #endif -#include +#include // // minor is also defined (Linux) in sysmacros.h. We want the compiler to diff --git a/cppapi/client/ApiUtil.h b/include/tango/client/ApiUtil.h similarity index 54% rename from cppapi/client/ApiUtil.h rename to include/tango/client/ApiUtil.h index 146c85c9c..4330309ce 100644 --- a/cppapi/client/ApiUtil.h +++ b/include/tango/client/ApiUtil.h @@ -50,10 +50,9 @@ * @headerfile tango.h * @ingroup Client */ - -class ApiUtil -{ -public: +namespace Tango { + class ApiUtil { + public: /** * Retrieve the ApiUtil instance * @@ -61,14 +60,23 @@ class ApiUtil * * @return The singleton instance */ - TANGO_IMP_EXP static ApiUtil *instance(); + TANGO_IMP_EXP static ApiUtil + * + + instance(); + /** * Destroy the ApiUtil instance * * Destroy the ApiUtil singleton instance. */ - TANGO_IMP_EXP static inline void cleanup() - {if (_instance != NULL){delete _instance;_instance=NULL;}} + TANGO_IMP_EXP static inline void cleanup() { + if (_instance != NULL) { + delete _instance; + _instance = NULL; + } + } + /** * Get environment variable * @@ -81,7 +89,8 @@ class ApiUtil * @param [out] value The environment variable value * @return Set to -1 if the environment varaibel is not found */ - TANGO_IMP_EXP static int get_env_var(const char *name,string &value); + TANGO_IMP_EXP static int get_env_var(const char *name, string &value); + /** * Get pending asynchronous requets number * @@ -90,10 +99,12 @@ class ApiUtil * @param [in] ty Asynchronous request type * @return Pending asynchronous request number */ - size_t pending_asynch_call(asyn_req_type ty) - {if (ty==POLLING)return asyn_p_table->get_request_nb(); - else if (ty==CALL_BACK)return asyn_p_table->get_cb_request_nb(); - else return (asyn_p_table->get_request_nb()+asyn_p_table->get_cb_request_nb());} + size_t pending_asynch_call(asyn_req_type ty) { + if (ty == POLLING)return asyn_p_table->get_request_nb(); + else if (ty == CALL_BACK)return asyn_p_table->get_cb_request_nb(); + else return (asyn_p_table->get_request_nb() + asyn_p_table->get_cb_request_nb()); + } + /** * Fire callback methods for asynchronous request(s) * @@ -101,7 +112,8 @@ class ApiUtil * arrived replied. Returns immediately if there is no replies already arrived or if there is no asynchronous * requests. */ - void get_asynch_replies(); + void get_asynch_replies(); + /** * Fire callback methods for asynchronous request(s) with timeout * @@ -112,7 +124,8 @@ class ApiUtil * * @param [in] timeout The timeout value */ - void get_asynch_replies(long timeout); + void get_asynch_replies(long timeout); + /** * Set asynchronous callback sub-model * @@ -124,7 +137,8 @@ class ApiUtil * * @param [in] csm The asynchronous callback sub-model */ - void set_asynch_cb_sub_model(cb_sub_model csm); + void set_asynch_cb_sub_model(cb_sub_model csm); + /** * Get asynchronous callback sub-model * @@ -132,134 +146,159 @@ class ApiUtil * * @return The asynchronous callback sub-model */ - cb_sub_model get_asynch_cb_sub_model() {return auto_cb;} + cb_sub_model get_asynch_cb_sub_model() { return auto_cb; } /// @privatesection - CORBA::ORB_ptr get_orb() {return CORBA::ORB::_duplicate(_orb);} - void set_orb(CORBA::ORB_ptr orb_in) {_orb = orb_in;} - void create_orb(); - int get_db_ind(); - int get_db_ind(string &host,int port); - vector &get_db_vect() {return db_vect;} - bool in_server() {return in_serv;} - void in_server(bool serv) {in_serv = serv;} + CORBA::ORB_ptr get_orb() { return CORBA::ORB::_duplicate(_orb); } + + void set_orb(CORBA::ORB_ptr orb_in) { _orb = orb_in; } + + void create_orb(); + + int get_db_ind(); + + int get_db_ind(string &host, int port); + + vector &get_db_vect() { return db_vect; } + + bool in_server() { return in_serv; } + + void in_server(bool serv) { in_serv = serv; } + + TangoSys_Pid get_client_pid() { return cl_pid; } - TangoSys_Pid get_client_pid() {return cl_pid;} - void clean_locking_threads(bool clean=true); + void clean_locking_threads(bool clean = true); - bool is_lock_exit_installed() {omni_mutex_lock guard(lock_th_map);return exit_lock_installed;} - void set_lock_exit_installed(bool in) {omni_mutex_lock guard(lock_th_map);exit_lock_installed = in;} + bool is_lock_exit_installed() { + omni_mutex_lock guard(lock_th_map); + return exit_lock_installed; + } - bool need_reset_already_flag() {return reset_already_executed_flag;} - void need_reset_already_flag(bool in) {reset_already_executed_flag = in;} + void set_lock_exit_installed(bool in) { + omni_mutex_lock guard(lock_th_map); + exit_lock_installed = in; + } - TANGO_IMP_EXP static inline bool _is_instance_null() - {return _instance == NULL;} + bool need_reset_already_flag() { return reset_already_executed_flag; } + + void need_reset_already_flag(bool in) { reset_already_executed_flag = in; } + + TANGO_IMP_EXP static inline bool _is_instance_null() { return _instance == NULL; } // // Utilities methods // - int get_user_connect_timeout() {return user_connect_timeout;} + int get_user_connect_timeout() { return user_connect_timeout; } + + DevLong get_user_sub_hwm() { return user_sub_hwm; } + + void set_event_buffer_hwm(DevLong val) { if (user_sub_hwm == -1)user_sub_hwm = val; } - DevLong get_user_sub_hwm() {return user_sub_hwm;} - void set_event_buffer_hwm(DevLong val) {if (user_sub_hwm == -1)user_sub_hwm=val;} + void get_ip_from_if(vector &); - void get_ip_from_if(vector &); - void print_error_message(const char *); + void print_error_message(const char *); - void set_sig_handler(); + void set_sig_handler(); // // EventConsumer related methods // - void create_notifd_event_consumer(); - void create_zmq_event_consumer(); + void create_notifd_event_consumer(); - bool is_notifd_event_consumer_created() {return notifd_event_consumer != NULL;} - NotifdEventConsumer *get_notifd_event_consumer(); + void create_zmq_event_consumer(); - bool is_zmq_event_consumer_created() {return zmq_event_consumer != NULL;} - ZmqEventConsumer *get_zmq_event_consumer(); + bool is_notifd_event_consumer_created() { return notifd_event_consumer != NULL; } + + NotifdEventConsumer *get_notifd_event_consumer(); + + bool is_zmq_event_consumer_created() { return zmq_event_consumer != NULL; } + + ZmqEventConsumer *get_zmq_event_consumer(); // // Asynchronous methods // - AsynReq *get_pasyn_table() {return asyn_p_table;} + AsynReq *get_pasyn_table() { return asyn_p_table; } // // Conv. between AttributeValuexxx and DeviceAttribute // - static void attr_to_device(const AttributeValue *,const AttributeValue_3 *,long,DeviceAttribute *); - static void attr_to_device(const AttributeValue_4 *,long,DeviceAttribute *); - static void attr_to_device(const AttributeValue_5 *,long,DeviceAttribute *); + static void attr_to_device(const AttributeValue *, const AttributeValue_3 *, long, DeviceAttribute *); + + static void attr_to_device(const AttributeValue_4 *, long, DeviceAttribute *); - static void device_to_attr(const DeviceAttribute &,AttributeValue_4 &); - static void device_to_attr(const DeviceAttribute &,AttributeValue &,string &); + static void attr_to_device(const AttributeValue_5 *, long, DeviceAttribute *); + + static void device_to_attr(const DeviceAttribute &, AttributeValue_4 &); + + static void device_to_attr(const DeviceAttribute &, AttributeValue &, string &); // // Conv. between AttributeConfig and AttributeInfoEx // - static void AttributeInfoEx_to_AttributeConfig(const AttributeInfoEx *,AttributeConfig_5 *); + static void AttributeInfoEx_to_AttributeConfig(const AttributeInfoEx *, AttributeConfig_5 *); -protected: + protected: /// @privatesection - ApiUtil(); - virtual ~ApiUtil(); + ApiUtil(); - vector db_vect; - omni_mutex the_mutex; - CORBA::ORB_ptr _orb; - bool in_serv; + virtual ~ApiUtil(); - cb_sub_model auto_cb; - CbThreadCmd cb_thread_cmd; - CallBackThread *cb_thread_ptr; + vector db_vect; + omni_mutex the_mutex; + CORBA::ORB_ptr _orb; + bool in_serv; - AsynReq *asyn_p_table; - -public: -/// @privatesection - omni_mutex lock_th_map; - map lock_threads; + cb_sub_model auto_cb; + CbThreadCmd cb_thread_cmd; + CallBackThread *cb_thread_ptr; -private: - class ApiUtilExt - { - public: - ApiUtilExt() {}; - }; + AsynReq *asyn_p_table; - TANGO_IMP static ApiUtil *_instance; - static omni_mutex inst_mutex; - bool exit_lock_installed; - bool reset_already_executed_flag; + public: +/// @privatesection + omni_mutex lock_th_map; + map lock_threads; + + private: + class ApiUtilExt { + public: + ApiUtilExt() {}; + }; + + TANGO_IMP static ApiUtil + * + _instance; + static omni_mutex inst_mutex; + bool exit_lock_installed; + bool reset_already_executed_flag; #ifdef HAS_UNIQUE_PTR - unique_ptr ext; + unique_ptr ext; #else - ApiUtilExt *ext; // Class extension + ApiUtilExt *ext; // Class extension #endif - NotifdEventConsumer *notifd_event_consumer; - TangoSys_Pid cl_pid; - int user_connect_timeout; - ZmqEventConsumer *zmq_event_consumer; - vector host_ip_adrs; - DevLong user_sub_hwm; - - template static void attr_to_device_base(const T *,DeviceAttribute *); -}; - -class _KillProc_: public omni_thread -{ -public: - void run(void *) {::exit(-1);} -}; - + NotifdEventConsumer *notifd_event_consumer; + TangoSys_Pid cl_pid; + int user_connect_timeout; + ZmqEventConsumer *zmq_event_consumer; + vector host_ip_adrs; + DevLong user_sub_hwm; + + template + static void attr_to_device_base(const T *, DeviceAttribute *); + }; + + class _KillProc_ : public omni_thread { + public: + void run(void *) { ::exit(-1); } + }; +}//Tango #endif /* _APIUTIL_H */ diff --git a/cppapi/client/AttributeProxy.h b/include/tango/client/AttributeProxy.h similarity index 84% rename from cppapi/client/AttributeProxy.h rename to include/tango/client/AttributeProxy.h index 9f35dc664..52aa4d9e9 100644 --- a/cppapi/client/AttributeProxy.h +++ b/include/tango/client/AttributeProxy.h @@ -53,42 +53,41 @@ * @headerfile tango.h * @ingroup Client */ +namespace Tango { + class AttributeProxy { + private : + string attr_name; + string device_name; + string alias_name; + Tango::DeviceProxy *dev_proxy; + Tango::DbAttribute *db_attr; + bool dbase_used; // Dev. with database + bool from_env_var; // DB from TANGO_HOST -class AttributeProxy -{ -private : - string attr_name; - string device_name; - string alias_name; - Tango::DeviceProxy *dev_proxy; - Tango::DbAttribute *db_attr; - bool dbase_used; // Dev. with database - bool from_env_var; // DB from TANGO_HOST - - string host; // DS host (if dbase_used=false) - string port; // DS port (if dbase_used=false) - int port_num; // DS port (as number) - - string db_host; // DB host - string db_port; // DB port - int db_port_num; // DB port (as number) - - void real_constructor(string &); - void ctor_from_dp(const DeviceProxy *,string &); - - class AttributeProxyExt - { - public: - AttributeProxyExt() {}; - }; + string host; // DS host (if dbase_used=false) + string port; // DS port (if dbase_used=false) + int port_num; // DS port (as number) + + string db_host; // DB host + string db_port; // DB port + int db_port_num; // DB port (as number) + + void real_constructor(string &); + + void ctor_from_dp(const DeviceProxy *, string &); + + class AttributeProxyExt { + public: + AttributeProxyExt() {}; + }; #ifdef HAS_UNIQUE_PTR - unique_ptr ext; + unique_ptr ext; #else - AttributeProxyExt *ext; // Class extension + AttributeProxyExt *ext; // Class extension #endif -public : + public : ///@name Constructors //@{ /** @@ -110,7 +109,8 @@ public : * * @param [in] name The attribute name */ - AttributeProxy(string &name); + AttributeProxy(string &name); + /** * Create a AttributeProxy object. * @@ -118,7 +118,7 @@ public : * * @param [in] name The attribute name */ - AttributeProxy(const char *name); + AttributeProxy(const char *name); //@} ///@name Miscellaneous methods @@ -130,7 +130,8 @@ public : * * @return The attribute name */ - virtual inline string name() { return attr_name; } + virtual inline string name() { return attr_name; } + /** * Get associated DeviceProxy instance * @@ -138,7 +139,8 @@ public : * * @return The underlying DeviceProxy object */ - virtual inline DeviceProxy* get_device_proxy() { return dev_proxy; } + virtual inline DeviceProxy *get_device_proxy() { return dev_proxy; } + /** * Get device status * @@ -151,7 +153,8 @@ public : * @return The underlying device status * @exception ConnectionFailed, CommunnicationFailed */ - virtual string status(); + virtual string status(); + /** * Get device state * @@ -164,7 +167,8 @@ public : * @return The underlying device state * @exception ConnectionFailed, CommunnicationFailed */ - virtual DevState state(); + virtual DevState state(); + /** * Ping the device * @@ -177,7 +181,7 @@ public : * @return Time needed by the ping call * @exception ConnectionFailed, CommunnicationFailed */ - virtual int ping(); + virtual int ping(); //@} ///@name Synchronous methods @@ -190,7 +194,8 @@ public : * @return The attribute configuration data * @exception ConnectionFailed, CommunnicationFailed, DevFailed from device */ - virtual AttributeInfoEx get_config(); + virtual AttributeInfoEx get_config(); + /** * Set attribute configuration * @@ -200,7 +205,8 @@ public : * @exception ConnectionFailed, CommunnicationFailed, DevFailed from device * @deprecated Use the set_config() method with AttributeInfoEx parameter data type */ - virtual void set_config(AttributeInfo &ai); + virtual void set_config(AttributeInfo &ai); + /** * Set extended attribute configuration * @@ -209,7 +215,8 @@ public : * @param [in] ai The new extended attribute configuration data * @exception ConnectionFailed, CommunnicationFailed, DevFailed from device */ - virtual void set_config(AttributeInfoEx &ai); + virtual void set_config(AttributeInfoEx &ai); + /** * Read attribute value * @@ -221,7 +228,8 @@ public : * @return The attribute value * @exception ConnectionFailed, CommunnicationFailed, DevFailed from device */ - virtual DeviceAttribute read(); + virtual DeviceAttribute read(); + /** * Write attribute value * @@ -233,7 +241,8 @@ public : * @param [in] da The new attribute value * @exception ConnectionFailed, CommunnicationFailed, DevUnlocked, DevFailed from device */ - virtual void write(DeviceAttribute &da); + virtual void write(DeviceAttribute &da); + /** * Write the Read attribute value * @@ -248,7 +257,8 @@ public : * @return The new attribute value * @exception ConnectionFailed, CommunnicationFailed, DevUnlocked, DevFailed from device */ - virtual DeviceAttribute write_read(DeviceAttribute &da); + virtual DeviceAttribute write_read(DeviceAttribute &da); + /** * Get attribute history from polling buffer * @@ -288,7 +298,7 @@ public : * @return The attribute value history * @exception ConnectionFailed, CommunnicationFailed, NonSupportedFeature, DevFailed from device */ - virtual vector *history(int depth); + virtual vector *history(int depth); //@} ///@name Asynchronous methods @@ -302,7 +312,8 @@ public : * @return The asynchronous call identifier * @exception ConnectionFailed */ - virtual long read_asynch() {return dev_proxy->read_attribute_asynch(attr_name);} + virtual long read_asynch() { return dev_proxy->read_attribute_asynch(attr_name); } + /** * Get asynchronous read attribute call reply * @@ -319,7 +330,8 @@ public : * @return The attribute value * @exception AsynCall, AsynReplyNotArrived, CommunicationFailed, DevFailed from device */ - virtual DeviceAttribute *read_reply(long id) {return dev_proxy->read_attribute_reply(id);} + virtual DeviceAttribute *read_reply(long id) { return dev_proxy->read_attribute_reply(id); } + /** * Get asynchronous read attribute call reply with timeout * @@ -339,7 +351,8 @@ public : * @return The attribute value * @exception AsynCall, AsynReplyNotArrived, CommunicationFailed, DevFailed from device */ - virtual DeviceAttribute *read_reply(long id,long to) {return dev_proxy->read_attribute_reply(id,to);} + virtual DeviceAttribute *read_reply(long id, long to) { return dev_proxy->read_attribute_reply(id, to); } + /** * Write attribute value asynchrnously in polling model * @@ -353,7 +366,8 @@ public : * @return The asynchrnous call identifier * @exception ConnectionFailed */ - virtual long write_asynch(DeviceAttribute &da) {return dev_proxy->write_attribute_asynch(da);} + virtual long write_asynch(DeviceAttribute &da) { return dev_proxy->write_attribute_asynch(da); } + /** * Get asynchronous write attribute call reply * @@ -364,7 +378,8 @@ public : * @param [in] id The asynchronous identifier * @exception AsynCall, AsynReplyNotArrived, CommunicationFailed, DevFailed from device */ - virtual void write_reply(long id) {dev_proxy->write_attribute_reply(id);} + virtual void write_reply(long id) { dev_proxy->write_attribute_reply(id); } + /** * Get asynchronous write attribute call reply with timeout * @@ -378,7 +393,8 @@ public : * @param [in] to The timeout value * @exception AsynCall, AsynReplyNotArrived, CommunicationFailed, DevFailed from device */ - virtual void write_reply(long id,long to) {dev_proxy->write_attribute_reply(id,to);} + virtual void write_reply(long id, long to) { dev_proxy->write_attribute_reply(id, to); } + /** * Read attribute asynchronously in callback model * @@ -389,7 +405,8 @@ public : * @param [in] cb The callback object * @exception ConnectionFailed */ - virtual void read_asynch(CallBack &cb) {dev_proxy->read_attribute_asynch(attr_name,cb);} + virtual void read_asynch(CallBack &cb) { dev_proxy->read_attribute_asynch(attr_name, cb); } + /** * Write attribute asynchronously in callback model * @@ -401,7 +418,7 @@ public : * @param [in] cb The callback object * @exception ConnectionFailed */ - virtual void write_asynch(DeviceAttribute &da,CallBack &cb) {dev_proxy->write_attribute_asynch(da,cb);} + virtual void write_asynch(DeviceAttribute &da, CallBack &cb) { dev_proxy->write_attribute_asynch(da, cb); } //@} ///@name Polling related methods @@ -413,7 +430,8 @@ public : * * @return Boolean true id the attribute is polled */ - virtual bool is_polled(); + virtual bool is_polled(); + /** * Get attribute polling period * @@ -421,7 +439,8 @@ public : * * @return The polling period */ - virtual int get_poll_period(); + virtual int get_poll_period(); + /** * Set attribute polling period * @@ -430,13 +449,14 @@ public : * * @param [in] period The polling period */ - virtual void poll(int period); + virtual void poll(int period); + /** * Stop attribute polling * * Remove attribute from the list of polled attributes. */ - virtual void stop_poll(); + virtual void stop_poll(); //@} ///@name Event related methods @@ -459,7 +479,8 @@ public : * @return The event identifier * @exception EventSystemFailed */ - virtual int subscribe_event (EventType event, CallBack *cb); + virtual int subscribe_event(EventType event, CallBack *cb); + /** * Stateless subscription to attribute event * @@ -476,7 +497,8 @@ public : * @return The event identifier * @exception EventSystemFailed */ - virtual int subscribe_event (EventType event, CallBack *cb,bool stateless); + virtual int subscribe_event(EventType event, CallBack *cb, bool stateless); + /** * Stateless subscription to attribute event with event queue * @@ -499,7 +521,8 @@ public : * @return The event identifier * @exception EventSystemFailed */ - virtual int subscribe_event (EventType event, int event_queue_size, bool stateless = false); + virtual int subscribe_event(EventType event, int event_queue_size, bool stateless = false); + /** * Unsubsribe to attribute event * @@ -509,7 +532,8 @@ public : * @param [in] ev_id The event identifier * @exception EventSystemFailed */ - virtual void unsubscribe_event (int ev_id) {dev_proxy->unsubscribe_event(ev_id);} + virtual void unsubscribe_event(int ev_id) { dev_proxy->unsubscribe_event(ev_id); } + /** * Get events from event queue (pull model) * @@ -521,8 +545,8 @@ public : * @param [in] cb The event callback * @exception EventSystemFailed */ - virtual void get_events (int event_id, CallBack *cb) - {dev_proxy->get_events (event_id, cb);} + virtual void get_events(int event_id, CallBack *cb) { dev_proxy->get_events(event_id, cb); } + /** * Get events from event queue (pull model) * @@ -535,8 +559,10 @@ public : * @param [out] event_list The event list * @exception EventSystemFailed */ - virtual void get_events (int event_id, EventDataList &event_list) - {dev_proxy->get_events (event_id, event_list);} + virtual void get_events(int event_id, EventDataList &event_list) { + dev_proxy->get_events(event_id, event_list); + } + /** * Get events from event queue (pull model) * @@ -550,8 +576,10 @@ public : * @param [out] event_list The event list * @exception EventSystemFailed */ - virtual void get_events (int event_id, AttrConfEventDataList &event_list) - {dev_proxy->get_events (event_id, event_list);} + virtual void get_events(int event_id, AttrConfEventDataList &event_list) { + dev_proxy->get_events(event_id, event_list); + } + /** * Get events number in queue * @@ -564,8 +592,8 @@ public : * @return The event number in the queue * @exception EventSystemFailed */ - virtual int event_queue_size(int event_id) - {return dev_proxy->event_queue_size(event_id);} + virtual int event_queue_size(int event_id) { return dev_proxy->event_queue_size(event_id); } + /** * Get last event date * @@ -578,8 +606,8 @@ public : * @return The last event date * @exception EventSystemFailed */ - virtual TimeVal get_last_event_date(int event_id) - {return dev_proxy->get_last_event_date(event_id);} + virtual TimeVal get_last_event_date(int event_id) { return dev_proxy->get_last_event_date(event_id); } + /** * Check if the event queue is empty * @@ -591,8 +619,7 @@ public : * @return The event queue empty flag * @exception EventSystemFailed */ - virtual bool is_event_queue_empty(int event_id) - {return dev_proxy->is_event_queue_empty(event_id);} + virtual bool is_event_queue_empty(int event_id) { return dev_proxy->is_event_queue_empty(event_id); } //@} ///@name Property related methods @@ -607,7 +634,8 @@ public : * @param [out] db Property value * @exception NonDbDevice, ConnectionFailed, CommunicationFailed, DevFailed from database */ - virtual void get_property(string &prop_name, DbData &db); + virtual void get_property(string &prop_name, DbData &db); + /** * Get multiple attribute property * @@ -618,7 +646,8 @@ public : * @param [out] db Properties value * @exception NonDbDevice, ConnectionFailed, CommunicationFailed, DevFailed from database */ - virtual void get_property(vector &prop_names, DbData &db); + virtual void get_property(vector &prop_names, DbData &db); + /** * Get attribute property(ies) * @@ -628,7 +657,8 @@ public : * @param [in,out] db Properties value * @exception NonDbDevice, ConnectionFailed, CommunicationFailed, DevFailed from database */ - virtual void get_property(DbData &db); + virtual void get_property(DbData &db); + /** * Put attribute property(ies) * @@ -638,7 +668,8 @@ public : * @param [in,out] db Properties value * @exception NonDbDevice, ConnectionFailed, CommunicationFailed, DevFailed from database */ - virtual void put_property(DbData &db); + virtual void put_property(DbData &db); + /** * Delete a single attribute property * @@ -648,7 +679,8 @@ public : * @param [in] prop_name The property name * @exception NonDbDevice, ConnectionFailed, CommunicationFailed, DevFailed from database */ - virtual void delete_property(string &prop_name); + virtual void delete_property(string &prop_name); + /** * Delete a list of attribute property * @@ -658,7 +690,8 @@ public : * @param [in] prop_names The properties name * @exception NonDbDevice, ConnectionFailed, CommunicationFailed, DevFailed from database */ - virtual void delete_property(vector &prop_names); + virtual void delete_property(vector &prop_names); + /** * Delete attribute property(ies) * @@ -668,7 +701,7 @@ public : * @param [in] db The properties name * @exception NonDbDevice, ConnectionFailed, CommunicationFailed, DevFailed from database */ - virtual void delete_property(DbData &db); + virtual void delete_property(DbData &db); //@} @@ -677,25 +710,33 @@ public : // // general methods // - virtual void parse_name(string &); - virtual void set_transparency_reconnection(bool); - virtual bool get_transparency_reconnection(); + virtual void parse_name(string &); + + virtual void set_transparency_reconnection(bool); + + virtual bool get_transparency_reconnection(); // // Old event methods // - virtual int subscribe_event (EventType event, CallBack *,const vector &filters); // For compatibility - virtual int subscribe_event (EventType event, CallBack *,const vector &filters, bool stateless); // For compatibility - virtual int subscribe_event (EventType event, int event_queue_size,const vector &filters, bool stateless = false); // For compatibility + virtual int subscribe_event(EventType event, CallBack *, const vector &filters); // For compatibility + virtual int subscribe_event(EventType event, CallBack *, const vector &filters, + bool stateless); // For compatibility + virtual int subscribe_event(EventType event, int event_queue_size, const vector &filters, + bool stateless = false); // For compatibility + + + AttributeProxy(const DeviceProxy *, string &); + + AttributeProxy(const DeviceProxy *, const char *); + AttributeProxy(const AttributeProxy &); - AttributeProxy(const DeviceProxy *,string &); - AttributeProxy(const DeviceProxy *,const char *); - AttributeProxy(const AttributeProxy &); - AttributeProxy & operator=(const AttributeProxy &); - virtual ~AttributeProxy(); -}; + AttributeProxy &operator=(const AttributeProxy &); + virtual ~AttributeProxy(); + }; +}//Tango #endif /* _ATTRIBUTEPROXY_H */ diff --git a/cppapi/client/Connection.h b/include/tango/client/Connection.h similarity index 73% rename from cppapi/client/Connection.h rename to include/tango/client/Connection.h index bceba553d..6c36f4ece 100644 --- a/cppapi/client/Connection.h +++ b/include/tango/client/Connection.h @@ -51,95 +51,105 @@ * @ingroup Client * @headerfile tango.h */ - -class Connection -{ -protected : +namespace Tango { + class Connection { + protected : ///@privatesection - bool dbase_used; // Dev. with database - bool from_env_var; // DB from TANGO_HOST + bool dbase_used; // Dev. with database + bool from_env_var; // DB from TANGO_HOST + + string host; // DS host (if dbase_used=false) + string port; // DS port (if dbase_used=false) + int port_num; // DS port (as number) + + string db_host; // DB host + string db_port; // DB port + int db_port_num; // DB port (as number) + + string ior; + long pasyn_ctr; + long pasyn_cb_ctr; + + Tango::Device_var device; + Tango::Device_2_var device_2; + + int timeout; + + int connection_state; + int version; + Tango::DevSource source; - string host; // DS host (if dbase_used=false) - string port; // DS port (if dbase_used=false) - int port_num; // DS port (as number) + bool check_acc; + AccessControlType access; - string db_host; // DB host - string db_port; // DB port - int db_port_num; // DB port (as number) + virtual string get_corba_name(bool)=0; - string ior; - long pasyn_ctr; - long pasyn_cb_ctr; + virtual string build_corba_name()=0; - Tango::Device_var device; - Tango::Device_2_var device_2; + virtual int get_lock_ctr()=0; - int timeout; + virtual void set_lock_ctr(int)=0; - int connection_state; - int version; - Tango::DevSource source; + DeviceData redo_synch_cmd(TgRequest &); - bool check_acc; - AccessControlType access; + int get_env_var(const char *, string &); - virtual string get_corba_name(bool)=0; - virtual string build_corba_name()=0; - virtual int get_lock_ctr()=0; - virtual void set_lock_ctr(int)=0; + int get_env_var_from_file(string &, const char *, string &); - DeviceData redo_synch_cmd(TgRequest &); + void set_connection_state(int); - int get_env_var(const char *,string &); - int get_env_var_from_file(string &,const char *,string &); + void check_and_reconnect(); - void set_connection_state(int); + void check_and_reconnect(Tango::DevSource &); - void check_and_reconnect(); - void check_and_reconnect(Tango::DevSource &); - void check_and_reconnect(Tango::AccessControlType &); - void check_and_reconnect(Tango::DevSource &,Tango::AccessControlType &); + void check_and_reconnect(Tango::AccessControlType &); - long add_asyn_request(CORBA::Request_ptr,TgRequest::ReqType); - void remove_asyn_request(long); + void check_and_reconnect(Tango::DevSource &, Tango::AccessControlType &); - void add_asyn_cb_request(CORBA::Request_ptr,CallBack *,Connection *,TgRequest::ReqType); - void remove_asyn_cb_request(Connection *,CORBA::Request_ptr); - long get_pasyn_cb_ctr(); + long add_asyn_request(CORBA::Request_ptr, TgRequest::ReqType); - class ConnectionExt - { - public: - ConnectionExt():has_alt_adr(false) {} - ~ConnectionExt() {} - ConnectionExt & operator=(const ConnectionExt &); + void remove_asyn_request(long); - bool has_alt_adr; - }; + void add_asyn_cb_request(CORBA::Request_ptr, CallBack *, Connection *, TgRequest::ReqType); + + void remove_asyn_cb_request(Connection *, CORBA::Request_ptr); + + long get_pasyn_cb_ctr(); + + class ConnectionExt { + public: + ConnectionExt() : has_alt_adr(false) {} + + ~ConnectionExt() {} + + ConnectionExt &operator=(const ConnectionExt &); + + bool has_alt_adr; + }; #ifdef HAS_UNIQUE_PTR - unique_ptr ext; + unique_ptr ext; #else - ConnectionExt *ext; // Class extension + ConnectionExt *ext; // Class extension #endif - bool tr_reco; - Tango::Device_3_var device_3; + bool tr_reco; + Tango::Device_3_var device_3; - bool prev_failed; - double prev_failed_t0; + bool prev_failed; + double prev_failed_t0; - Tango::Device_4_var device_4; - omni_mutex adm_dev_mutex; - omni_mutex asyn_mutex; - ReadersWritersLock con_to_mon; + Tango::Device_4_var device_4; + omni_mutex adm_dev_mutex; + omni_mutex asyn_mutex; + ReadersWritersLock con_to_mon; - int user_connect_timeout; - bool tango_host_localhost; + int user_connect_timeout; + bool tango_host_localhost; - Tango::Device_5_var device_5; + Tango::Device_5_var device_5; -public : + public : ///@publicsection /**@name Miscellaneous methods */ //@{ @@ -151,7 +161,8 @@ public : * * @param [in] timeout The timeout value in mS */ - virtual void set_timeout_millis(int timeout); + virtual void set_timeout_millis(int timeout); + /** * Get device timeout * @@ -159,7 +170,8 @@ public : * * @return The device timeout (in mS) */ - virtual int get_timeout_millis(); + virtual int get_timeout_millis(); + /** * Get device IDL version * @@ -167,7 +179,8 @@ public : * * @return The device IDL version */ - int get_idl_version() {return version;} + int get_idl_version() { return version; } + /** * Get device source * @@ -178,7 +191,8 @@ public : * * @return The device source flag */ - virtual Tango::DevSource get_source(); + virtual Tango::DevSource get_source(); + /** * Set device source * @@ -188,7 +202,8 @@ public : * * @param [in] sou The device source */ - virtual void set_source(Tango::DevSource sou); + virtual void set_source(Tango::DevSource sou); + /** * Set device transparency (reconnection) mode * @@ -198,7 +213,8 @@ public : * * @param [in] val The device transparency flag */ - virtual void set_transparency_reconnection(bool val) {tr_reco = val;} + virtual void set_transparency_reconnection(bool val) { tr_reco = val; } + /** * Get device transparency (reconnection) mode * @@ -207,7 +223,7 @@ public : * * @return The device transparency flag */ - virtual bool get_transparency_reconnection() {return tr_reco;} + virtual bool get_transparency_reconnection() { return tr_reco; } //@} /** @name Synchronous command oriented methods */ @@ -221,7 +237,8 @@ public : * @return The command result * @throws ConnectionFailed, CommunicationFailed, DeviceUnlocked, DevFailed from device */ - virtual DeviceData command_inout(string &cmd_name); + virtual DeviceData command_inout(string &cmd_name); + /** * Execute a command (without input data) * @@ -231,7 +248,11 @@ public : * @return The command result * @throws ConnectionFailed, CommunicationFailed, DeviceUnlocked, DevFailed from device */ - virtual DeviceData command_inout(const char *cmd_name) {string str(cmd_name);return command_inout(str);} + virtual DeviceData command_inout(const char *cmd_name) { + string str(cmd_name); + return command_inout(str); + } + /** * Execute a command (with input data) * @@ -243,7 +264,8 @@ public : * @return The command result * @throws ConnectionFailed, CommunicationFailed, DeviceUnlocked, DevFailed from device */ - virtual DeviceData command_inout(string &cmd_name, DeviceData &d_in); + virtual DeviceData command_inout(string &cmd_name, DeviceData &d_in); + /** * Execute a command (with input data) * @@ -255,7 +277,10 @@ public : * @return The command result * @throws ConnectionFailed, CommunicationFailed, DeviceUnlocked, DevFailed from device */ - virtual DeviceData command_inout(const char *cmd_name,DeviceData &d_in) {string str(cmd_name);return command_inout(str,d_in);} + virtual DeviceData command_inout(const char *cmd_name, DeviceData &d_in) { + string str(cmd_name); + return command_inout(str, d_in); + } //@} /** @name Aynchronous command oriented methods */ @@ -277,7 +302,8 @@ public : * @return The call identifier * @throws ConnectionFailed */ - virtual long command_inout_asynch(const char *cmd_name,DeviceData &argin,bool forget=false); + virtual long command_inout_asynch(const char *cmd_name, DeviceData &argin, bool forget = false); + /** * Execute a command asynchronously (with input argument) * @@ -295,7 +321,8 @@ public : * @return The call identifier * @throws ConnectionFailed */ - virtual long command_inout_asynch(string &cmd_name,DeviceData &argin,bool forget=false); + virtual long command_inout_asynch(string &cmd_name, DeviceData &argin, bool forget = false); + /** * Execute a command asynchronously * @@ -311,7 +338,8 @@ public : * @return The call identifier * @throws ConnectionFailed */ - virtual long command_inout_asynch(const char *cmd_name,bool forget=false); + virtual long command_inout_asynch(const char *cmd_name, bool forget = false); + /** * Execute a command asynchronously * @@ -327,7 +355,8 @@ public : * @return The call identifier * @throws ConnectionFailed */ - virtual long command_inout_asynch(string &cmd_name,bool forget=false); + virtual long command_inout_asynch(string &cmd_name, bool forget = false); + /** * Check an asynchronous command_inout answer is arrived * @@ -361,7 +390,8 @@ public : * @return The command result * @throws AsynCall, AsynReplyNotArrived, CommunicationFailed, DevFailed from device */ - virtual DeviceData command_inout_reply(long id); + virtual DeviceData command_inout_reply(long id); + /** * Check an asynchronous command_inout answer is arrived with timeout * @@ -376,7 +406,8 @@ public : * @return The command result * @throws AsynCall, AsynReplyNotArrived, CommunicationFailed, DevFailed from device */ - virtual DeviceData command_inout_reply(long id,long timeout); + virtual DeviceData command_inout_reply(long id, long timeout); + /** * Execute a command asynchronously with callback * @@ -388,7 +419,8 @@ public : * @param [in] cb The call-back object * @throws ConnectionFailed */ - virtual void command_inout_asynch(string &cmd_name,CallBack &cb); + virtual void command_inout_asynch(string &cmd_name, CallBack &cb); + /** * Execute a command asynchronously with callback * @@ -400,7 +432,8 @@ public : * @param [in] cb The call-back object * @throws ConnectionFailed */ - virtual void command_inout_asynch(const char *cmd_name,CallBack &cb); + virtual void command_inout_asynch(const char *cmd_name, CallBack &cb); + /** * Execute a command asynchronously with input value and callback * @@ -414,7 +447,8 @@ public : * @param [in] cb The call-back object * @throws ConnectionFailed */ - virtual void command_inout_asynch(string &cmd_name,DeviceData &argin,CallBack &cb); + virtual void command_inout_asynch(string &cmd_name, DeviceData &argin, CallBack &cb); + /** * Execute a command asynchronously with input value and callback * @@ -428,7 +462,7 @@ public : * @param [in] cb The call-back object * @throws ConnectionFailed */ - virtual void command_inout_asynch(const char *cmd_name,DeviceData &argin,CallBack &cb); + virtual void command_inout_asynch(const char *cmd_name, DeviceData &argin, CallBack &cb); //@} @@ -481,7 +515,8 @@ public : * @endcode * */ - virtual void get_asynch_replies(); + virtual void get_asynch_replies(); + /** * Fire callback methds with timeout * @@ -492,7 +527,8 @@ public : * * @param [in] timeout The timeout value */ - virtual void get_asynch_replies(long timeout); + virtual void get_asynch_replies(long timeout); + /** * Cancel a pending asynchronous request * @@ -503,7 +539,8 @@ public : * @param [in] id The call identifier * @throws AsynCall */ - virtual void cancel_asynch_request(long id); + virtual void cancel_asynch_request(long id); + /** * Cancel all pending asynchronous request * @@ -512,63 +549,87 @@ public : * remote devices. * */ - virtual void cancel_all_polling_asynch_request(); + virtual void cancel_all_polling_asynch_request(); //@} ///@privatesection - virtual string dev_name()=0; + virtual string dev_name()=0; + + Connection(CORBA::ORB *orb = NULL); + + Connection(bool dummy); + + virtual ~Connection(); + + Connection(const Connection &); + + Connection &operator=(const Connection &); + + string &get_db_host() { return db_host; } + + string &get_db_port() { return db_port; } - Connection(CORBA::ORB *orb = NULL); - Connection(bool dummy); - virtual ~Connection(); - Connection(const Connection &); - Connection & operator=(const Connection &); + int get_db_port_num() { return db_port_num; } - string &get_db_host() {return db_host;} - string &get_db_port() {return db_port;} - int get_db_port_num() {return db_port_num;} - bool get_from_env_var() {return from_env_var;} - static void get_fqdn(string &); + bool get_from_env_var() { return from_env_var; } - bool is_dbase_used() {return dbase_used;} - string &get_dev_host() {return host;} - string &get_dev_port() {return port;} + static void get_fqdn(string &); - void connect(string &name); - virtual void reconnect(bool); - bool is_connected(); + bool is_dbase_used() { return dbase_used; } - Tango::Device_var &get_device() {return device;} // For CORBA expert !! - Tango::Device_4_ptr get_device_4() {return Device_4::_duplicate(device_4);} - Tango::Device_5_ptr get_device_5() {return Device_5::_duplicate(device_5);} + string &get_dev_host() { return host; } - virtual CORBA::Any_var command_inout(string &, CORBA::Any&); - virtual CORBA::Any_var command_inout(const char *co, CORBA::Any &d) {string str(co);return command_inout(str,d);} + string &get_dev_port() { return port; } + + void connect(string &name); + + virtual void reconnect(bool); + + bool is_connected(); + + Tango::Device_var &get_device() { return device; } // For CORBA expert !! + Tango::Device_4_ptr get_device_4() { return Device_4::_duplicate(device_4); } + + Tango::Device_5_ptr get_device_5() { return Device_5::_duplicate(device_5); } + + virtual CORBA::Any_var command_inout(string &, CORBA::Any &); + + virtual CORBA::Any_var command_inout(const char *co, CORBA::Any &d) { + string str(co); + return command_inout(str, d); + } // // Asynchronous methods // - void Cb_Cmd_Request(CORBA::Request_ptr,Tango::CallBack *); - void Cb_ReadAttr_Request(CORBA::Request_ptr,Tango::CallBack *); - void Cb_WriteAttr_Request(CORBA::Request_ptr req,Tango::CallBack *cb_ptr); - void dec_asynch_counter(asyn_req_type ty); + void Cb_Cmd_Request(CORBA::Request_ptr, Tango::CallBack *); + + void Cb_ReadAttr_Request(CORBA::Request_ptr, Tango::CallBack *); + + void Cb_WriteAttr_Request(CORBA::Request_ptr req, Tango::CallBack *cb_ptr); + + void dec_asynch_counter(asyn_req_type ty); // // Control access related methods // - AccessControlType get_access_control() {return access;} - void set_access_control(AccessControlType acc) {access=acc;} - AccessControlType get_access_right() {return get_access_control();} + AccessControlType get_access_control() { return access; } + + void set_access_control(AccessControlType acc) { access = acc; } + + AccessControlType get_access_right() { return get_access_control(); } + + friend class FwdAttribute; - friend class FwdAttribute; + private: + void omni420_timeout(int, char *); -private: - void omni420_timeout(int,char *); - DeviceData omni420_except(int,char *,TgRequest &); - void toIOR(const char*,IOP::IOR&); -}; + DeviceData omni420_except(int, char *, TgRequest &); + void toIOR(const char *, IOP::IOR &); + }; +}//Tango #endif /* _CONNECTION_H */ diff --git a/cppapi/client/Database.h b/include/tango/client/Database.h similarity index 85% rename from cppapi/client/Database.h rename to include/tango/client/Database.h index 200199e56..c731cb1a6 100644 --- a/cppapi/client/Database.h +++ b/include/tango/client/Database.h @@ -48,57 +48,62 @@ * @headerfile tango.h * @ingroup DBase */ +namespace Tango { + class Database : public Tango::Connection { + private : + virtual string get_corba_name(bool); -class Database : public Tango::Connection -{ -private : - virtual string get_corba_name(bool); - virtual string build_corba_name() {return string("nada");} - virtual int get_lock_ctr() {return 0;} - virtual void set_lock_ctr(int) {} + virtual string build_corba_name() { return string("nada"); } - class DatabaseExt - { - public: - DatabaseExt() {}; + virtual int get_lock_ctr() { return 0; } - string orig_tango_host; - }; + virtual void set_lock_ctr(int) {} + + class DatabaseExt { + public: + DatabaseExt() {}; + + string orig_tango_host; + }; #ifdef HAS_UNIQUE_PTR - unique_ptr ext; + unique_ptr ext; #else - DatabaseExt *ext; + DatabaseExt *ext; #endif - bool db_multi_svc; - vector multi_db_port; - vector multi_db_host; - FileDatabase *filedb; - string file_name; - int serv_version; + bool db_multi_svc; + vector multi_db_port; + vector multi_db_host; + FileDatabase *filedb; + string file_name; + int serv_version; + + AccessProxy *access_proxy; + bool access_checked; + DevErrorList access_except_errors; + + map dev_class_cache; + string db_device_name; - AccessProxy *access_proxy; - bool access_checked; - DevErrorList access_except_errors; + bool access_service_defined; - map dev_class_cache; - string db_device_name; + Tango::Util *db_tg; + omni_mutex map_mutex; - bool access_service_defined; + DbDatum make_string_array(string, CORBA::Any_var &); - Tango::Util *db_tg; - omni_mutex map_mutex; + vector make_history_array(bool, CORBA::Any_var &); - DbDatum make_string_array(string, CORBA::Any_var &); - vector make_history_array(bool, CORBA::Any_var &); + void check_access(); - void check_access(); - inline string dev_name(); - void set_server_release(); - void check_access_and_get(); + inline string dev_name(); -public : + void set_server_release(); + + void check_access_and_get(); + + public : /**@name Constructors */ //@{ /** @@ -114,7 +119,7 @@ public : * @param [in] orb The CORBA ORB pointer. Default value is fine for 99 % of cases * */ - Database(CORBA::ORB *orb=NULL); + Database(CORBA::ORB *orb = NULL); // @} /**@name General methods */ @@ -144,7 +149,7 @@ public : * * @exception ConnectionFailed, CommunnicationFailed, DevFailed from device */ - string get_info(); + string get_info(); //@} /**@name Device oriented methods */ @@ -168,7 +173,8 @@ public : * * @exception ConnectionFailed, CommunnicationFailed, DevFailed */ - void add_device(DbDevInfo &dev_info); + void add_device(DbDevInfo &dev_info); + /** * Delete a device from the database. * @@ -181,7 +187,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device (DB_SQLError, DB_DeviceNotDefined) */ - void delete_device(string dev_name); + void delete_device(string dev_name); + /** * Import a device from the database. * @@ -204,7 +211,8 @@ public : * * @exception ConnectionFailed, CommunicationFailed, DevFailed */ - DbDevImportInfo import_device(string &dev_name); + DbDevImportInfo import_device(string &dev_name); + /** * Export a device into the database. * @@ -226,7 +234,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device (DB_SQLError, DB_DeviceNotDefined) */ - void export_device(DbDevExportInfo &info); + void export_device(DbDevExportInfo &info); + /** * Unexport a device in the database. * @@ -239,7 +248,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device (DB_SQLError) */ - void unexport_device(string dev_name); + void unexport_device(string dev_name); + /** * Get device information * @@ -250,7 +260,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDevFullInfo get_device_info(string &dev_name); + DbDevFullInfo get_device_info(string &dev_name); + /** * Get class name for a device * @@ -265,7 +276,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - string get_class_for_device(string &dev_name); + string get_class_for_device(string &dev_name); + /** * Get device inheritance scheme * @@ -284,7 +296,7 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_class_inheritance_for_device(string &dev_name); + DbDatum get_class_inheritance_for_device(string &dev_name); //@} /**@name Server oriented methods */ @@ -300,7 +312,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device (DB_SQLError) */ - void add_server(string &ds_name, DbDevInfos &devs); + void add_server(string &ds_name, DbDevInfos &devs); + /** * Delete a device server process from the database. * @@ -310,7 +323,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device (DB_SQLError) */ - void delete_server(string &ds_name); + void delete_server(string &ds_name); + /** * Delete a device server process from the database. * @@ -321,7 +335,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device (DB_SQLError) */ - void export_server(DbDevExportInfos &devs); + void export_server(DbDevExportInfos &devs); + /** * Unexport all devices from a device server in the database. * @@ -331,7 +346,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device (DB_SQLError) */ - void unexport_server(string &ds_name); + void unexport_server(string &ds_name); + /** * Rename a device server in the database. * @@ -342,7 +358,7 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device (DB_SQLError) */ - void rename_server(const string &old_ds_name,const string &new_ds_name); + void rename_server(const string &old_ds_name, const string &new_ds_name); //@} /**@name Services oriented methods */ @@ -367,7 +383,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_services(string &service_name,string &inst_name); + DbDatum get_services(string &service_name, string &inst_name); + /** * Get services list from database * @@ -387,7 +404,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_device_service_list(string &service_name); + DbDatum get_device_service_list(string &service_name); + /** * Register a service in the database * @@ -406,7 +424,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void register_service(string &service_name,string &inst_name,string &dev_name); + void register_service(string &service_name, string &inst_name, string &dev_name); + /** * Unregister a service from the database * @@ -423,7 +442,7 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void unregister_service(string &service_name,string &inst_name); + void unregister_service(string &service_name, string &inst_name); //@} /**@name Object property oriented methods */ @@ -452,7 +471,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void get_property(string obj_name, DbData &db) {get_property(obj_name,db,NULL);} + void get_property(string obj_name, DbData &db) { get_property(obj_name, db, NULL); } + /** * Put object property value in database * @@ -476,7 +496,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void put_property(string obj_name, DbData &db); + void put_property(string obj_name, DbData &db); + /** * Delete object property from database * @@ -495,7 +516,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void delete_property(string obj_name, DbData &db); + void delete_property(string obj_name, DbData &db); + /** * Get object property history from database * @@ -533,7 +555,7 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - vector get_property_history(string &obj_name,string &prop_name); + vector get_property_history(string &obj_name, string &prop_name); //@} /**@name Device property oriented methods */ @@ -562,7 +584,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void get_device_property(string dev_name, DbData &db) {get_device_property(dev_name,db,NULL);} + void get_device_property(string dev_name, DbData &db) { get_device_property(dev_name, db, NULL); } + /** * Put device property value in database * @@ -586,7 +609,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void put_device_property(string dev_name, DbData &db); + void put_device_property(string dev_name, DbData &db); + /** * Delete device property from database * @@ -605,7 +629,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void delete_device_property(string dev_name, DbData &db); + void delete_device_property(string dev_name, DbData &db); + /** * Get device property history from database * @@ -619,7 +644,7 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - vector get_device_property_history(string &dev_name,string &prop_name); + vector get_device_property_history(string &dev_name, string &prop_name); //@} /**@name Device attribute property oriented methods */ @@ -676,7 +701,10 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void get_device_attribute_property(string dev_name, DbData &db) {get_device_attribute_property(dev_name,db,NULL);} + void get_device_attribute_property(string dev_name, DbData &db) { + get_device_attribute_property(dev_name, db, NULL); + } + /** * Put device attribute property value in database * @@ -716,7 +744,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void put_device_attribute_property(string dev_name, DbData &db); + void put_device_attribute_property(string dev_name, DbData &db); + /** * Delete device attribute property from database * @@ -736,7 +765,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void delete_device_attribute_property(string dev_name, DbData &db); + void delete_device_attribute_property(string dev_name, DbData &db); + /** * Get device attribute property history from database * @@ -752,7 +782,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - vector get_device_attribute_property_history(string &dev_name,string &prop_name,string &att_name); + vector get_device_attribute_property_history(string &dev_name, string &prop_name, string &att_name); + /** * Get list of attribute with data in database for a specific device * @@ -765,7 +796,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void get_device_attribute_list(string &dev_name,vector &att_list); + void get_device_attribute_list(string &dev_name, vector &att_list); + /** * Get list of pipe with data in database for a specific device * @@ -778,7 +810,7 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void get_device_pipe_list(const string &dev_name,vector &pipe_list); + void get_device_pipe_list(const string &dev_name, vector &pipe_list); //@} /**@name Device pipe property oriented methods */ @@ -835,7 +867,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void get_device_pipe_property(string dev_name, DbData &db) {get_device_pipe_property(dev_name,db,NULL);} + void get_device_pipe_property(string dev_name, DbData &db) { get_device_pipe_property(dev_name, db, NULL); } + /** * Put device pipe property value in database * @@ -875,7 +908,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void put_device_pipe_property(string dev_name, DbData &db); + void put_device_pipe_property(string dev_name, DbData &db); + /** * Delete device pipe property from database * @@ -895,7 +929,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void delete_device_pipe_property(string dev_name, DbData &db); + void delete_device_pipe_property(string dev_name, DbData &db); + /** * Get device pipe property history from database * @@ -911,7 +946,7 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - vector get_device_pipe_property_history(string &dev_name,string &pipe_name,string &prop_name); + vector get_device_pipe_property_history(string &dev_name, string &pipe_name, string &prop_name); //@} /**@name Class property oriented methods */ @@ -940,7 +975,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void get_class_property(string class_name,DbData &db) {get_class_property(class_name,db,NULL);} + void get_class_property(string class_name, DbData &db) { get_class_property(class_name, db, NULL); } + /** * Put class property value in database * @@ -964,7 +1000,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void put_class_property(string class_name, DbData &db); + void put_class_property(string class_name, DbData &db); + /** * Delete class property from database * @@ -983,7 +1020,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void delete_class_property(string class_name, DbData &db); + void delete_class_property(string class_name, DbData &db); + /** * Get class property history from database * @@ -998,7 +1036,7 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - vector get_class_property_history(string &class_name,string &prop_name); + vector get_class_property_history(string &class_name, string &prop_name); //@} /**@name Class attribute property oriented methods */ @@ -1054,7 +1092,10 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void get_class_attribute_property(string class_name,DbData &db) {get_class_attribute_property(class_name,db,NULL);} + void get_class_attribute_property(string class_name, DbData &db) { + get_class_attribute_property(class_name, db, NULL); + } + /** * Put class attribute property value in database * @@ -1092,7 +1133,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void put_class_attribute_property(string class_name, DbData &db); + void put_class_attribute_property(string class_name, DbData &db); + /** * Delete class attribute property from database * @@ -1113,7 +1155,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void delete_class_attribute_property(string class_name, DbData &db); + void delete_class_attribute_property(string class_name, DbData &db); + /** * Get class attribute property history from database * @@ -1129,7 +1172,7 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - vector get_class_attribute_property_history(string &class_name,string &att_name,string &prop_name); + vector get_class_attribute_property_history(string &class_name, string &att_name, string &prop_name); //@} /**@name Class pipe property oriented methods */ @@ -1183,7 +1226,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void get_class_pipe_property(string class_name,DbData &db) {get_class_pipe_property(class_name,db,NULL);} + void get_class_pipe_property(string class_name, DbData &db) { get_class_pipe_property(class_name, db, NULL); } + /** * Put class pipe property value in database * @@ -1221,7 +1265,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void put_class_pipe_property(string class_name, DbData &db); + void put_class_pipe_property(string class_name, DbData &db); + /** * Delete class pipe property from database * @@ -1242,7 +1287,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void delete_class_pipe_property(string class_name, DbData &db); + void delete_class_pipe_property(string class_name, DbData &db); + /** * Get class pipe property history from database * @@ -1258,7 +1304,7 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - vector get_class_pipe_property_history(string &class_name,string &pipe_name,string &prop_name); + vector get_class_pipe_property_history(string &class_name, string &pipe_name, string &prop_name); //@} /**@name Alias oriented methods */ @@ -1274,7 +1320,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void get_device_from_alias(string alias,string &dev_name); + void get_device_from_alias(string alias, string &dev_name); + /** * Get device alias form its name * @@ -1286,7 +1333,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void get_alias_from_device(string dev_name,string &alias); + void get_alias_from_device(string dev_name, string &alias); + /** * Get device alias from its name * @@ -1300,7 +1348,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void get_alias(string dev_name,string &dev_alias); + void get_alias(string dev_name, string &dev_alias); + /** * Get device name from its alias * @@ -1314,7 +1363,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void get_device_alias(string dev_alias,string &dev_name); + void get_device_alias(string dev_alias, string &dev_name); + /** * Define device alias * @@ -1326,7 +1376,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void put_device_alias(string &dev_name,string &dev_alias); + void put_device_alias(string &dev_name, string &dev_alias); + /** * Delete device alias * @@ -1336,7 +1387,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void delete_device_alias(string &dev_alias); + void delete_device_alias(string &dev_alias); + /** * Get attribute name from its alias * @@ -1348,7 +1400,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void get_attribute_from_alias(string alias,string &att_name); + void get_attribute_from_alias(string alias, string &att_name); + /** * Get attribute alias form its name * @@ -1360,7 +1413,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void get_alias_from_attribute(string att_name,string &alias); + void get_alias_from_attribute(string att_name, string &alias); + /** * Get attribute name from its alias * @@ -1372,7 +1426,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void get_attribute_alias(string att_alias, string &att_name); + void get_attribute_alias(string att_alias, string &att_name); + /** * Define attribute alias * @@ -1384,7 +1439,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void put_attribute_alias(string &att_name,string &att_alias); + void put_attribute_alias(string &att_name, string &att_alias); + /** * Delete attribute alias * @@ -1394,7 +1450,7 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - void delete_attribute_alias(string &att_alias); + void delete_attribute_alias(string &att_alias); //@} /**@name Database browsing oriented methods */ @@ -1414,7 +1470,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_host_list(); + DbDatum get_host_list(); + /** * Get host list with name matching a wildcard * @@ -1433,7 +1490,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_host_list(string &wildcard); + DbDatum get_host_list(string &wildcard); + /** * Get list of Tango classes embedded in a device server proess * @@ -1454,7 +1512,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_server_class_list(string &ds_name); + DbDatum get_server_class_list(string &ds_name); + /** * Get list of all Tango device server process * @@ -1470,7 +1529,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_server_name_list(); + DbDatum get_server_name_list(); + /** * Get list of instances * @@ -1489,7 +1549,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_instance_name_list(string &ds_name); + DbDatum get_instance_name_list(string &ds_name); + /** * Get list of device server processes * @@ -1505,7 +1566,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_server_list(); + DbDatum get_server_list(); + /** * Get list of device server processes with a wildcard * @@ -1524,7 +1586,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_server_list(string &wildcard); + DbDatum get_server_list(string &wildcard); + /** * Get list of device server processes running on a host * @@ -1543,7 +1606,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_host_server_list(string &host_name); + DbDatum get_host_server_list(string &host_name); + /** * Get list of devices served by a device server process * @@ -1556,7 +1620,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_device_name(string &ds_name, string &class_name); + DbDatum get_device_name(string &ds_name, string &class_name); + /** * Get list of exported devices * @@ -1568,7 +1633,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_device_exported(string &filter); + DbDatum get_device_exported(string &filter); + /** * Get list of device domain names * @@ -1580,7 +1646,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_device_domain(string &wildcard); + DbDatum get_device_domain(string &wildcard); + /** * Get list of device family name * @@ -1592,7 +1659,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_device_family(string &wildcard); + DbDatum get_device_family(string &wildcard); + /** * Get list of device member name * @@ -1604,7 +1672,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_device_member(string &wildcard); + DbDatum get_device_member(string &wildcard); + /** * Get list of devices/classes for a specified device server * @@ -1624,7 +1693,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_device_class_list(string &ds_name); + DbDatum get_device_class_list(string &ds_name); + /** * Get list of exported device for a class * @@ -1643,7 +1713,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_device_exported_for_class(string &class_name); + DbDatum get_device_exported_for_class(string &class_name); + /** * Get object (free property) list * @@ -1663,7 +1734,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_object_list(string &wildcard); + DbDatum get_object_list(string &wildcard); + /** * Get object property list * @@ -1684,7 +1756,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_object_property_list(string &obj_name,string &wildcard); + DbDatum get_object_property_list(string &obj_name, string &wildcard); + /** * Get Tango class list * @@ -1703,7 +1776,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_class_list(string &wildcard); + DbDatum get_class_list(string &wildcard); + /** * Get class property list * @@ -1722,7 +1796,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_class_property_list(string &class_name); + DbDatum get_class_property_list(string &class_name); + /** * Get class attribute list * @@ -1743,7 +1818,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_class_attribute_list(string &class_name,string &wildcard); + DbDatum get_class_attribute_list(string &class_name, string &wildcard); + /** * Get class pipe list * @@ -1764,7 +1840,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_class_pipe_list(const string &class_name,const string &wildcard); + DbDatum get_class_pipe_list(const string &class_name, const string &wildcard); + /** * Get device alias list * @@ -1792,7 +1869,8 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_device_alias_list(string &filter); + DbDatum get_device_alias_list(string &filter); + /** * Get attribute alias list * @@ -1807,108 +1885,140 @@ public : * * @exception ConnectionFailed,CommunicationFailed,DevFailed from device */ - DbDatum get_attribute_alias_list(string &filter); + DbDatum get_attribute_alias_list(string &filter); //@} ///@privatesection - Database(string &host, int port, CORBA::ORB *orb=NULL); - Database(string &file); - - Database(const Database &); - Database & operator=(const Database &); - - void write_filedatabase(); - void reread_filedatabase(); - void write_event_channel_ior_filedatabase(string &); - void build_connection (); - void post_reconnection(); - ~Database(); - inline Device_var &get_dbase() { return device;} - void check_tango_host(const char *); - AccessControlType check_access_control(string &); - bool is_control_access_checked() {return access_checked;} - void set_access_checked(bool val) {access_checked = val;} - - void set_tango_utils(Tango::Util *ptr) {db_tg=ptr;} - int get_server_release() {return serv_version;} - - DevErrorList &get_access_except_errors() {return access_except_errors;} - void clear_access_except_errors() {access_except_errors.length(0);} - bool is_command_allowed(string &,string &); - - bool is_multi_tango_host() {return db_multi_svc;} - vector &get_multi_host() {return multi_db_host;} - vector &get_multi_port() {return multi_db_port;} - - const string &get_file_name(); - const string &get_orig_tango_host() {return ext->orig_tango_host;} - void set_orig_tango_host(const string &_s) {ext->orig_tango_host=_s;} + Database(string &host, int port, CORBA::ORB *orb = NULL); + + Database(string &file); + + Database(const Database &); + + Database &operator=(const Database &); + + void write_filedatabase(); + + void reread_filedatabase(); + + void write_event_channel_ior_filedatabase(string &); + + void build_connection(); + + void post_reconnection(); + + ~Database(); + + inline Device_var &get_dbase() { return device; } + + void check_tango_host(const char *); + + AccessControlType check_access_control(string &); + + bool is_control_access_checked() { return access_checked; } + + void set_access_checked(bool val) { access_checked = val; } + + void set_tango_utils(Tango::Util *ptr) { db_tg = ptr; } + + int get_server_release() { return serv_version; } + + DevErrorList &get_access_except_errors() { return access_except_errors; } + + void clear_access_except_errors() { access_except_errors.length(0); } + + bool is_command_allowed(string &, string &); + + bool is_multi_tango_host() { return db_multi_svc; } + + vector &get_multi_host() { return multi_db_host; } + + vector &get_multi_port() { return multi_db_port; } + + const string &get_file_name(); + + const string &get_orig_tango_host() { return ext->orig_tango_host; } + + void set_orig_tango_host(const string &_s) { ext->orig_tango_host = _s; } #ifdef _TG_WINDOWS_ - Database(CORBA::ORB *orb,string &,string &); - long get_tango_host_from_reg(char **,string &,string &); + Database(CORBA::ORB *orb,string &,string &); + long get_tango_host_from_reg(char **,string &,string &); #endif // // general methods // - CORBA::Any *fill_server_cache(string &,string &); + CORBA::Any *fill_server_cache(string &, string &); // // device methods // - DbDatum get_device_name(string &, string &,DbServerCache *dsc); + DbDatum get_device_name(string &, string &, DbServerCache *dsc); // // server methods // - DbServerInfo get_server_info(string &); - void put_server_info(DbServerInfo &); - void delete_server_info(string &); + DbServerInfo get_server_info(string &); + + void put_server_info(DbServerInfo &); + + void delete_server_info(string &); // // property methods // - void get_property(string, DbData &,DbServerCache *dsc); - void get_property_forced(string, DbData &,DbServerCache *dsc = NULL); - void get_device_property(string, DbData &, DbServerCache *dsc); - DbDatum get_device_property_list(string &,string &); - void get_device_property_list(string &,const string &,vector &,DbServerCache *dsc = NULL); - void get_device_attribute_property(string, DbData &, DbServerCache *dsc); - void get_device_pipe_property(string, DbData &, DbServerCache *dsc); - void delete_all_device_attribute_property(string, DbData &); - void delete_all_device_pipe_property(string, DbData &); - void get_class_property(string, DbData &, DbServerCache *dsc); - void get_class_attribute_property(string, DbData &, DbServerCache *dsc); - void get_class_pipe_property(string, DbData &, DbServerCache *dsc); + void get_property(string, DbData &, DbServerCache *dsc); + + void get_property_forced(string, DbData &, DbServerCache *dsc = NULL); + + void get_device_property(string, DbData &, DbServerCache *dsc); + + DbDatum get_device_property_list(string &, string &); + + void get_device_property_list(string &, const string &, vector &, DbServerCache *dsc = NULL); + + void get_device_attribute_property(string, DbData &, DbServerCache *dsc); + + void get_device_pipe_property(string, DbData &, DbServerCache *dsc); + + void delete_all_device_attribute_property(string, DbData &); + + void delete_all_device_pipe_property(string, DbData &); + + void get_class_property(string, DbData &, DbServerCache *dsc); + + void get_class_attribute_property(string, DbData &, DbServerCache *dsc); + + void get_class_pipe_property(string, DbData &, DbServerCache *dsc); // // event methods // - void export_event(DevVarStringArray *); - void unexport_event(string &); - CORBA::Any *import_event(string &); + void export_event(DevVarStringArray *); -}; + void unexport_event(string &); + + CORBA::Any *import_event(string &); + + }; // // Some Database class inline methods // -inline string Database::dev_name() -{ - if (db_device_name.empty() == true) - { - CORBA::String_var n = device->name(); - db_device_name = n; + inline string Database::dev_name() { + if (db_device_name.empty() == true) { + CORBA::String_var n = device->name(); + db_device_name = n; + } + return db_device_name; } - return db_device_name; -} - +}//Tango #endif /* _DATABASE_H */ diff --git a/cppapi/client/DbDevice.h b/include/tango/client/DbDevice.h similarity index 84% rename from cppapi/client/DbDevice.h rename to include/tango/client/DbDevice.h index 191b85da7..0b3f0eee1 100644 --- a/cppapi/client/DbDevice.h +++ b/include/tango/client/DbDevice.h @@ -47,28 +47,26 @@ * @headerfile tango.h * @ingroup DBase */ +namespace Tango { + class DbDevice { + private : + string name; + Database *dbase; + int db_ind; + bool ext_dbase; -class DbDevice -{ -private : - string name; - Database *dbase; - int db_ind; - bool ext_dbase; - - class DbDeviceExt - { - public: - DbDeviceExt() {}; - }; + class DbDeviceExt { + public: + DbDeviceExt() {}; + }; #ifdef HAS_UNIQUE_PTR - unique_ptr ext; + unique_ptr ext; #else - DbDeviceExt *ext; + DbDeviceExt *ext; #endif -public : + public : /**@name Constructors */ //@{ /** @@ -80,7 +78,8 @@ public : * @param [in] dev_name The device name * */ - DbDevice(string &dev_name); + DbDevice(string &dev_name); + /** * Create a DbDevice object using a specified database * @@ -91,7 +90,7 @@ public : * @param [in] db The database object * */ - DbDevice(string &dev_name, Database *db); + DbDevice(string &dev_name, Database *db); //@} @@ -106,7 +105,8 @@ public : * * @exception ConnectionFailed, CommunnicationFailed, DevFailed from device */ - DbDevImportInfo import_device(); + DbDevImportInfo import_device(); + /** * Export device info to the database * @@ -116,7 +116,7 @@ public : * * @exception ConnectionFailed, CommunnicationFailed, DevFailed from device */ - void export_device(DbDevExportInfo &dev_info); + void export_device(DbDevExportInfo &dev_info); //@} /**@name Property oriented methods */ @@ -131,7 +131,8 @@ public : * * @exception ConnectionFailed, CommunnicationFailed, DevFailed from device */ - void get_property(DbData &db); + void get_property(DbData &db); + /** * Update device property in database * @@ -142,7 +143,8 @@ public : * * @exception ConnectionFailed, CommunnicationFailed, DevFailed from device */ - void put_property(DbData &db); + void put_property(DbData &db); + /** * Remove device property from database * @@ -153,7 +155,8 @@ public : * * @exception ConnectionFailed, CommunnicationFailed, DevFailed from device */ - void delete_property(DbData &db); + void delete_property(DbData &db); + /** * Get device attribute property from database * @@ -164,7 +167,8 @@ public : * * @exception ConnectionFailed, CommunnicationFailed, DevFailed from device */ - void get_attribute_property(DbData &db); + void get_attribute_property(DbData &db); + /** * Update device attribute property in database * @@ -175,7 +179,8 @@ public : * * @exception ConnectionFailed, CommunnicationFailed, DevFailed from device */ - void put_attribute_property(DbData &db); + void put_attribute_property(DbData &db); + /** * Remove device attribute property from database * @@ -186,7 +191,8 @@ public : * * @exception ConnectionFailed, CommunnicationFailed, DevFailed from device */ - void delete_attribute_property(DbData &db); + void delete_attribute_property(DbData &db); + /** * Get device pipe property from database * @@ -197,7 +203,8 @@ public : * * @exception ConnectionFailed, CommunnicationFailed, DevFailed from device */ - void get_pipe_property(DbData &db); + void get_pipe_property(DbData &db); + /** * Update device pipe property in database * @@ -208,7 +215,8 @@ public : * * @exception ConnectionFailed, CommunnicationFailed, DevFailed from device */ - void put_pipe_property(DbData &db); + void put_pipe_property(DbData &db); + /** * Remove device pipe property from database * @@ -219,19 +227,26 @@ public : * * @exception ConnectionFailed, CommunnicationFailed, DevFailed from device */ - void delete_pipe_property(DbData &db); + void delete_pipe_property(DbData &db); //@} /// @privatesection - DbDevice(string &,string &,string &); - ~DbDevice(); - void set_name(string &new_name) {name = new_name;} - Database *get_dbase(); - void set_dbase(Database *db) {dbase = db;} + DbDevice(string &, string &, string &); + + ~DbDevice(); + + void set_name(string &new_name) { name = new_name; } + + Database *get_dbase(); + + void set_dbase(Database *db) { dbase = db; } + + AccessControlType check_access_control(); + + void clear_access_except_errors(); - AccessControlType check_access_control(); - void clear_access_except_errors(); - void get_property_list(const string &,vector &); -}; + void get_property_list(const string &, vector &); + }; +}//Tango #endif /* _DBDEVICE_H */ diff --git a/cppapi/client/DeviceAttribute.h b/include/tango/client/DeviceAttribute.h similarity index 67% rename from cppapi/client/DeviceAttribute.h rename to include/tango/client/DeviceAttribute.h index fc4bf9a30..e7b4bd4af 100644 --- a/cppapi/client/DeviceAttribute.h +++ b/include/tango/client/DeviceAttribute.h @@ -68,35 +68,35 @@ * @headerfile tango.h * @ingroup Client */ +namespace Tango { + class DeviceAttribute { -class DeviceAttribute -{ - -public : + public : ///@privatesection // // constructor methods // - enum except_flags - { - isempty_flag = 0, - wrongtype_flag, - failed_flag, - unknown_format_flag, - numFlags - }; + enum except_flags { + isempty_flag = 0, + wrongtype_flag, + failed_flag, + unknown_format_flag, + numFlags + }; + + DeviceAttribute(const DeviceAttribute &); + + DeviceAttribute &operator=(const DeviceAttribute &); - DeviceAttribute(const DeviceAttribute&); - DeviceAttribute & operator=(const DeviceAttribute &); #ifdef HAS_RVALUE - DeviceAttribute(DeviceAttribute &&); - DeviceAttribute & operator=(DeviceAttribute &&); + DeviceAttribute(DeviceAttribute &&); + DeviceAttribute & operator=(DeviceAttribute &&); #endif - void deep_copy(const DeviceAttribute &); + void deep_copy(const DeviceAttribute &); - DeviceAttribute(AttributeValue); + DeviceAttribute(AttributeValue); ///@publicsection /**@name Constructors */ @@ -107,7 +107,8 @@ public : * Default constructor. The instance is empty * */ - DeviceAttribute(); + DeviceAttribute(); + /** * Create a DeviceAttribute object from attribute name and value for scalar attribute * @@ -144,7 +145,8 @@ public : * @param [in] name The attribute name * @param [in] val The attribute value */ - DeviceAttribute(string &name, short val); + DeviceAttribute(string &name, short val); + /** * Create a DeviceAttribute object from attribute name and value for spectrum attribute * @@ -179,7 +181,8 @@ public : * @param [in] name The attribute name * @param [in] val The attribute value */ - DeviceAttribute(string &name, vector &val); + DeviceAttribute(string &name, vector &val); + /** * Create a DeviceAttribute object from attribute name and value for image attribute * @@ -218,153 +221,252 @@ public : * @param [in] dim_x The attribute X dimension * @param [in] dim_y The attribute Y dimension */ - DeviceAttribute(string &name, vector &val,int dim_x,int dim_y); + DeviceAttribute(string &name, vector &val, int dim_x, int dim_y); + //@} ///@privatesection - DeviceAttribute(string&, DevLong); - DeviceAttribute(string&, double); - DeviceAttribute(string&, string&); - DeviceAttribute(string&, const char *); - DeviceAttribute(string&, float); - DeviceAttribute(string&, bool); - DeviceAttribute(string&, unsigned short); - DeviceAttribute(string&, unsigned char); - DeviceAttribute(string&, DevLong64); - DeviceAttribute(string&, DevULong); - DeviceAttribute(string&, DevULong64); - DeviceAttribute(string&, DevState); - DeviceAttribute(string&, DevEncoded &); - - DeviceAttribute(string&, vector &); - DeviceAttribute(string&, vector &); - DeviceAttribute(string&, vector &); - DeviceAttribute(string&, vector &); - DeviceAttribute(string&, vector &); - DeviceAttribute(string&, vector &); - DeviceAttribute(string&, vector &); - DeviceAttribute(string&, vector &); - DeviceAttribute(string&, vector &); - DeviceAttribute(string&, vector &); - DeviceAttribute(string&, vector &); - - DeviceAttribute(string&, vector &,int,int); - DeviceAttribute(string&, vector &,int,int); - DeviceAttribute(string&, vector &,int,int); - DeviceAttribute(string&, vector &,int,int); - DeviceAttribute(string&, vector &,int,int); - DeviceAttribute(string&, vector &,int,int); - DeviceAttribute(string&, vector &,int,int); - DeviceAttribute(string&, vector &,int,int); - DeviceAttribute(string&, vector &,int,int); - DeviceAttribute(string&, vector &,int,int); - DeviceAttribute(string&, vector &,int,int); - - DeviceAttribute(const char *, short); - DeviceAttribute(const char *, DevLong); - DeviceAttribute(const char *, double); - DeviceAttribute(const char *, string&); - DeviceAttribute(const char *, const char *); - DeviceAttribute(const char *, float); - DeviceAttribute(const char *, bool); - DeviceAttribute(const char *, unsigned short); - DeviceAttribute(const char *, unsigned char); - DeviceAttribute(const char *, DevLong64); - DeviceAttribute(const char *, DevULong); - DeviceAttribute(const char *, DevULong64); - DeviceAttribute(const char *, DevState); - DeviceAttribute(const char *, DevEncoded &); - - DeviceAttribute(const char *, vector &); - DeviceAttribute(const char *, vector &); - DeviceAttribute(const char *, vector &); - DeviceAttribute(const char *, vector &); - DeviceAttribute(const char *, vector &); - DeviceAttribute(const char *, vector &); - DeviceAttribute(const char *, vector &); - DeviceAttribute(const char *, vector &); - DeviceAttribute(const char *, vector &); - DeviceAttribute(const char *, vector &); - DeviceAttribute(const char *, vector &); - DeviceAttribute(const char *, vector &); - - DeviceAttribute(const char *, vector &,int,int); - DeviceAttribute(const char *, vector &,int,int); - DeviceAttribute(const char *, vector &,int,int); - DeviceAttribute(const char *, vector &,int,int); - DeviceAttribute(const char *, vector &,int,int); - DeviceAttribute(const char *, vector &,int,int); - DeviceAttribute(const char *, vector &,int,int); - DeviceAttribute(const char *, vector &,int,int); - DeviceAttribute(const char *, vector &,int,int); - DeviceAttribute(const char *, vector &,int,int); - DeviceAttribute(const char *, vector &,int,int); - DeviceAttribute(const char *, vector &,int,int); - - template DeviceAttribute(string &,T); - template DeviceAttribute(const char *,T); - template DeviceAttribute(string &,vector &); - template DeviceAttribute(const char *,vector &); - template DeviceAttribute(string &,vector &,int,int); - template DeviceAttribute(const char *,vector &,int,int); - - template void base_val(T); - template void base_vect(vector &); - template void base_vect_size(vector &); - - template void operator << (T); - template void operator << (vector &); - template void insert(vector &,int,int); - - template bool operator >> (T &); - template bool operator >> (vector &); - template bool extract_read (vector &); - template bool extract_set(vector &); - - template bool template_type_check(T &); - - - - virtual ~DeviceAttribute(); - - AttrQuality quality; - AttrDataFormat data_format; - int data_type; - string name; - int dim_x; - int dim_y; - int w_dim_x; - int w_dim_y; - TimeVal time; - - void set_w_dim_x(int val) {w_dim_x = val;} - void set_w_dim_y(int val) {w_dim_y = val;} - void set_error_list(DevErrorList *ptr) {err_list = ptr;} - - DevVarEncodedArray_var &get_Encoded_data() {return EncodedSeq;} - DevErrorList_var &get_error_list() {return err_list;} - - DevVarLongArray_var LongSeq; - DevVarShortArray_var ShortSeq; - DevVarDoubleArray_var DoubleSeq; - DevVarStringArray_var StringSeq; - DevVarFloatArray_var FloatSeq; - DevVarBooleanArray_var BooleanSeq; - DevVarUShortArray_var UShortSeq; - DevVarCharArray_var UCharSeq; - DevVarLong64Array_var Long64Seq; - DevVarULongArray_var ULongSeq; - DevVarULong64Array_var ULong64Seq; - DevVarStateArray_var StateSeq; - DevVarEncodedArray_var EncodedSeq; - - DevErrorList_var err_list; + DeviceAttribute(string &, DevLong); + + DeviceAttribute(string &, double); + + DeviceAttribute(string &, string &); + + DeviceAttribute(string &, const char *); + + DeviceAttribute(string &, float); + + DeviceAttribute(string &, bool); + + DeviceAttribute(string &, unsigned short); + + DeviceAttribute(string &, unsigned char); + + DeviceAttribute(string &, DevLong64); + + DeviceAttribute(string &, DevULong); + + DeviceAttribute(string &, DevULong64); + + DeviceAttribute(string &, DevState); + + DeviceAttribute(string &, DevEncoded &); + + DeviceAttribute(string &, vector &); + + DeviceAttribute(string &, vector &); + + DeviceAttribute(string &, vector &); + + DeviceAttribute(string &, vector &); + + DeviceAttribute(string &, vector &); + + DeviceAttribute(string &, vector &); + + DeviceAttribute(string &, vector &); + + DeviceAttribute(string &, vector &); + + DeviceAttribute(string &, vector &); + + DeviceAttribute(string &, vector &); + + DeviceAttribute(string &, vector &); + + DeviceAttribute(string &, vector &, int, int); + + DeviceAttribute(string &, vector &, int, int); + + DeviceAttribute(string &, vector &, int, int); + + DeviceAttribute(string &, vector &, int, int); + + DeviceAttribute(string &, vector &, int, int); + + DeviceAttribute(string &, vector &, int, int); + + DeviceAttribute(string &, vector &, int, int); + + DeviceAttribute(string &, vector &, int, int); + + DeviceAttribute(string &, vector &, int, int); + + DeviceAttribute(string &, vector &, int, int); + + DeviceAttribute(string &, vector &, int, int); + + DeviceAttribute(const char *, short); + + DeviceAttribute(const char *, DevLong); + + DeviceAttribute(const char *, double); + + DeviceAttribute(const char *, string &); + + DeviceAttribute(const char *, const char *); + + DeviceAttribute(const char *, float); + + DeviceAttribute(const char *, bool); + + DeviceAttribute(const char *, unsigned short); + + DeviceAttribute(const char *, unsigned char); + + DeviceAttribute(const char *, DevLong64); + + DeviceAttribute(const char *, DevULong); + + DeviceAttribute(const char *, DevULong64); + + DeviceAttribute(const char *, DevState); + + DeviceAttribute(const char *, DevEncoded &); + + DeviceAttribute(const char *, vector &); + + DeviceAttribute(const char *, vector &); + + DeviceAttribute(const char *, vector &); + + DeviceAttribute(const char *, vector &); + + DeviceAttribute(const char *, vector &); + + DeviceAttribute(const char *, vector &); + + DeviceAttribute(const char *, vector &); + + DeviceAttribute(const char *, vector &); + + DeviceAttribute(const char *, vector &); + + DeviceAttribute(const char *, vector &); + + DeviceAttribute(const char *, vector &); + + DeviceAttribute(const char *, vector &); + + DeviceAttribute(const char *, vector &, int, int); + + DeviceAttribute(const char *, vector &, int, int); + + DeviceAttribute(const char *, vector &, int, int); + + DeviceAttribute(const char *, vector &, int, int); + + DeviceAttribute(const char *, vector &, int, int); + + DeviceAttribute(const char *, vector &, int, int); + + DeviceAttribute(const char *, vector &, int, int); + + DeviceAttribute(const char *, vector &, int, int); + + DeviceAttribute(const char *, vector &, int, int); + + DeviceAttribute(const char *, vector &, int, int); + + DeviceAttribute(const char *, vector &, int, int); + + DeviceAttribute(const char *, vector &, int, int); + + template + DeviceAttribute(string &, T); + + template + DeviceAttribute(const char *, T); + + template + DeviceAttribute(string &, vector &); + + template + DeviceAttribute(const char *, vector &); + + template + DeviceAttribute(string &, vector &, int, int); + + template + DeviceAttribute(const char *, vector &, int, int); + + template + void base_val(T); + + template + void base_vect(vector &); + + template + void base_vect_size(vector &); + + template + void operator<<(T); + + template + void operator<<(vector &); + + template + void insert(vector &, int, int); + + template + bool operator>>(T &); + + template + bool operator>>(vector &); + + template + bool extract_read(vector &); + + template + bool extract_set(vector &); + + template + bool template_type_check(T &); + + + virtual ~DeviceAttribute(); + + AttrQuality quality; + AttrDataFormat data_format; + int data_type; + string name; + int dim_x; + int dim_y; + int w_dim_x; + int w_dim_y; + TimeVal time; + + void set_w_dim_x(int val) { w_dim_x = val; } + + void set_w_dim_y(int val) { w_dim_y = val; } + + void set_error_list(DevErrorList *ptr) { err_list = ptr; } + + DevVarEncodedArray_var &get_Encoded_data() { return EncodedSeq; } + + DevErrorList_var &get_error_list() { return err_list; } + + DevVarLongArray_var LongSeq; + DevVarShortArray_var ShortSeq; + DevVarDoubleArray_var DoubleSeq; + DevVarStringArray_var StringSeq; + DevVarFloatArray_var FloatSeq; + DevVarBooleanArray_var BooleanSeq; + DevVarUShortArray_var UShortSeq; + DevVarCharArray_var UCharSeq; + DevVarLong64Array_var Long64Seq; + DevVarULongArray_var ULongSeq; + DevVarULong64Array_var ULong64Seq; + DevVarStateArray_var StateSeq; + DevVarEncodedArray_var EncodedSeq; + + DevErrorList_var err_list; // // For the state attribute // - DevState d_state; - bool d_state_filled; + DevState d_state; + bool d_state_filled; // // Insert operators for C++ types @@ -507,7 +609,8 @@ public : * @param [in] val The attribute value * @exception WrongData if requested */ - void operator << (short val); + void operator<<(short val); + /** * Insert attribute data for DevEncoded attribute * @@ -524,7 +627,8 @@ public : * @param [in] length The DevEncoded data length * @exception WrongData if requested */ - void insert(const char *str,unsigned char *data,unsigned int length); + void insert(const char *str, unsigned char *data, unsigned int length); + /** * Insert attribute data for image attribute (from C++ vector) * @@ -550,7 +654,8 @@ public : * @param [in] dim_y The attribute Y dimension * @exception WrongData if requested */ - void insert(vector &datum,int dim_x,int dim_y); + void insert(vector &datum, int dim_x, int dim_y); + /** * Insert attribute data for image attribute (from CORBA sequence by reference) * @@ -576,7 +681,8 @@ public : * @param [in] dim_y The attribute Y dimension * @exception WrongData if requested */ - void insert(const DevVarShortArray &datum,int dim_x,int dim_y); + void insert(const DevVarShortArray &datum, int dim_x, int dim_y); + /** * Insert attribute data for image attribute (from CORBA sequence by pointer) * @@ -603,7 +709,8 @@ public : * @param [in] dim_y The attribute Y dimension * @exception WrongData if requested */ - void insert(DevVarShortArray *datum,int dim_x,int dim_y); + void insert(DevVarShortArray *datum, int dim_x, int dim_y); + /** * Extract attribute data * @@ -663,7 +770,8 @@ public : * @param [out] data The attribute data * @exception WrongData if requested, DevFailed from device */ - bool operator >> (short &data); + bool operator>>(short &data); + /** * Extract attribute data for DevEncoded attribute * @@ -679,7 +787,8 @@ public : * @param [out] length The DevEncoded data length * @exception WrongData if requested, DevFailed from device */ - bool extract(const char *&str,unsigned char *&data,unsigned int &length); + bool extract(const char *&str, unsigned char *&data, unsigned int &length); + /** * Extract only read part of attribute data * @@ -706,7 +815,8 @@ public : * @param [out] data The attribute data * @exception WrongData if requested, DevFailed from device */ - bool extract_read (vector &data); + bool extract_read(vector &data); + /** * Extract only written part of attribute data * @@ -733,194 +843,331 @@ public : * @param [out] data The attribute data * @exception WrongData if requested, DevFailed from device */ - bool extract_set (vector &data); + bool extract_set(vector &data); + //@} ///@privatesection // void operator << (short); - void operator << (DevLong); - void operator << (double); - void operator << (string &); - void operator << (float); - void operator << (bool); - void operator << (unsigned short); - void operator << (unsigned char); - void operator << (DevLong64); - void operator << (DevULong); - void operator << (DevULong64); - void operator << (DevState); - void operator << (DevEncoded &); - void operator << (DevString); - void operator << (const char *); - - void operator << (vector &); - void operator << (vector &); - void operator << (vector &); - void operator << (vector &); - void operator << (vector &); - void operator << (vector &); - void operator << (vector &); - void operator << (vector &); - void operator << (vector &); - void operator << (vector &); - void operator << (vector &); - void operator << (vector &); - - void operator << (const DevVarShortArray &datum); - void operator << (const DevVarLongArray &datum); - void operator << (const DevVarDoubleArray &datum); - void operator << (const DevVarStringArray &datum); - void operator << (const DevVarFloatArray &datum); - void operator << (const DevVarBooleanArray &datum); - void operator << (const DevVarUShortArray &datum); - void operator << (const DevVarCharArray &datum); - void operator << (const DevVarLong64Array &datum); - void operator << (const DevVarULongArray &datum); - void operator << (const DevVarULong64Array &datum); - void operator << (const DevVarStateArray &datum); - - void operator << (DevVarShortArray *datum); - void operator << (DevVarLongArray *datum); - void operator << (DevVarDoubleArray *datum); - void operator << (DevVarStringArray *datum); - void operator << (DevVarFloatArray *datum); - void operator << (DevVarBooleanArray *datum); - void operator << (DevVarUShortArray *datum); - void operator << (DevVarCharArray *datum); - void operator << (DevVarLong64Array *datum); - void operator << (DevVarULongArray *datum); - void operator << (DevVarULong64Array *datum); - void operator << (DevVarStateArray *datum); - void operator << (TANGO_UNUSED(DevVarEncodedArray *datum)) {} // For template stuff + void operator<<(DevLong); + + void operator<<(double); + + void operator<<(string &); + + void operator<<(float); + + void operator<<(bool); + + void operator<<(unsigned short); + + void operator<<(unsigned char); + + void operator<<(DevLong64); + + void operator<<(DevULong); + + void operator<<(DevULong64); + + void operator<<(DevState); + + void operator<<(DevEncoded &); + + void operator<<(DevString); + + void operator<<(const char *); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(const DevVarShortArray &datum); + + void operator<<(const DevVarLongArray &datum); + + void operator<<(const DevVarDoubleArray &datum); + + void operator<<(const DevVarStringArray &datum); + + void operator<<(const DevVarFloatArray &datum); + + void operator<<(const DevVarBooleanArray &datum); + + void operator<<(const DevVarUShortArray &datum); + + void operator<<(const DevVarCharArray &datum); + + void operator<<(const DevVarLong64Array &datum); + + void operator<<(const DevVarULongArray &datum); + + void operator<<(const DevVarULong64Array &datum); + + void operator<<(const DevVarStateArray &datum); + + void operator<<(DevVarShortArray *datum); + + void operator<<(DevVarLongArray *datum); + + void operator<<(DevVarDoubleArray *datum); + + void operator<<(DevVarStringArray *datum); + + void operator<<(DevVarFloatArray *datum); + + void operator<<(DevVarBooleanArray *datum); + + void operator<<(DevVarUShortArray *datum); + + void operator<<(DevVarCharArray *datum); + + void operator<<(DevVarLong64Array *datum); + + void operator<<(DevVarULongArray *datum); + + void operator<<(DevVarULong64Array *datum); + + void operator<<(DevVarStateArray *datum); + + void operator<<(TANGO_UNUSED(DevVarEncodedArray + + *datum)) {} // For template stuff // // Insert methods // // void insert(vector &,int,int); - void insert(vector &,int,int); - void insert(vector &,int,int); - void insert(vector &,int,int); - void insert(vector &,int,int); - void insert(vector &,int,int); - void insert(vector &,int,int); - void insert(vector &,int,int); - void insert(vector &,int,int); - void insert(vector &,int,int); - void insert(vector &,int,int); - void insert(vector &,int,int); + void insert(vector &, int, int); + + void insert(vector &, int, int); + + void insert(vector &, int, int); + + void insert(vector &, int, int); + + void insert(vector &, int, int); + + void insert(vector &, int, int); + + void insert(vector &, int, int); + + void insert(vector &, int, int); + + void insert(vector &, int, int); + + void insert(vector &, int, int); + + void insert(vector &, int, int); // void insert(const DevVarShortArray &datum,int,int); - void insert(const DevVarLongArray &datum,int,int); - void insert(const DevVarDoubleArray &datum,int,int); - void insert(const DevVarStringArray &datum,int,int); - void insert(const DevVarFloatArray &datum,int,int); - void insert(const DevVarBooleanArray &datum,int,int); - void insert(const DevVarUShortArray &datum,int,int); - void insert(const DevVarCharArray &datum,int,int); - void insert(const DevVarLong64Array &datum,int,int); - void insert(const DevVarULongArray &datum,int,int); - void insert(const DevVarULong64Array &datum,int,int); - void insert(const DevVarStateArray &datum,int,int); + void insert(const DevVarLongArray &datum, int, int); + + void insert(const DevVarDoubleArray &datum, int, int); + + void insert(const DevVarStringArray &datum, int, int); + + void insert(const DevVarFloatArray &datum, int, int); + + void insert(const DevVarBooleanArray &datum, int, int); + + void insert(const DevVarUShortArray &datum, int, int); + + void insert(const DevVarCharArray &datum, int, int); + + void insert(const DevVarLong64Array &datum, int, int); + + void insert(const DevVarULongArray &datum, int, int); + + void insert(const DevVarULong64Array &datum, int, int); + + void insert(const DevVarStateArray &datum, int, int); // void insert(DevVarShortArray *datum,int,int); - void insert(DevVarLongArray *datum,int,int); - void insert(DevVarDoubleArray *datum,int,int); - void insert(DevVarStringArray *datum,int,int); - void insert(DevVarFloatArray *datum,int,int); - void insert(DevVarBooleanArray *datum,int,int); - void insert(DevVarUShortArray *datum,int,int); - void insert(DevVarCharArray *datum,int,int); - void insert(DevVarLong64Array *datum,int,int); - void insert(DevVarULongArray *datum,int,int); - void insert(DevVarULong64Array *datum,int,int); - void insert(DevVarStateArray *datum,int,int); - - void insert(char *&,unsigned char *&,unsigned int); // Deprecated. For compatibility purpose + void insert(DevVarLongArray *datum, int, int); + + void insert(DevVarDoubleArray *datum, int, int); + + void insert(DevVarStringArray *datum, int, int); + + void insert(DevVarFloatArray *datum, int, int); + + void insert(DevVarBooleanArray *datum, int, int); + + void insert(DevVarUShortArray *datum, int, int); + + void insert(DevVarCharArray *datum, int, int); + + void insert(DevVarLong64Array *datum, int, int); + + void insert(DevVarULongArray *datum, int, int); + + void insert(DevVarULong64Array *datum, int, int); + + void insert(DevVarStateArray *datum, int, int); + + void insert(char *&, unsigned char *&, unsigned int); // Deprecated. For compatibility purpose // void insert(const char *str,unsigned char *data,unsigned int length); - void insert(const string &,vector &); - void insert(string &,vector &); // Deprecated. For compatibility purpose - void insert(const char *,DevVarCharArray *); + void insert(const string &, vector &); + + void insert(string &, vector &); // Deprecated. For compatibility purpose + void insert(const char *, DevVarCharArray *); // // Extract operators for C++ types // // bool operator >> (short &); - bool operator >> (DevLong &); - bool operator >> (double &); - bool operator >> (string&); - bool operator >> (float &); - bool operator >> (bool &); - bool operator >> (unsigned short &); - bool operator >> (unsigned char &); - bool operator >> (DevLong64 &); - bool operator >> (DevULong &); - bool operator >> (DevULong64 &); - bool operator >> (DevState &); - bool operator >> (DevEncoded &); - - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - - bool operator >> (DevVarShortArray* &datum); - bool operator >> (DevVarLongArray* &datum); - bool operator >> (DevVarDoubleArray* &datum); - bool operator >> (DevVarStringArray* &datum); - bool operator >> (DevVarFloatArray* &datum); - bool operator >> (DevVarBooleanArray* &datum); - bool operator >> (DevVarUShortArray* &datum); - bool operator >> (DevVarCharArray* &datum); - bool operator >> (DevVarLong64Array * &datum); - bool operator >> (DevVarULongArray * &datum); - bool operator >> (DevVarULong64Array * &datum); - bool operator >> (DevVarStateArray * &datum); - bool operator >> (DevVarEncodedArray *&datum); + bool operator>>(DevLong &); + + bool operator>>(double &); + + bool operator>>(string &); + + bool operator>>(float &); + + bool operator>>(bool &); + + bool operator>>(unsigned short &); + + bool operator>>(unsigned char &); + + bool operator>>(DevLong64 &); + + bool operator>>(DevULong &); + + bool operator>>(DevULong64 &); + + bool operator>>(DevState &); + + bool operator>>(DevEncoded &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(DevVarShortArray *&datum); + + bool operator>>(DevVarLongArray *&datum); + + bool operator>>(DevVarDoubleArray *&datum); + + bool operator>>(DevVarStringArray *&datum); + + bool operator>>(DevVarFloatArray *&datum); + + bool operator>>(DevVarBooleanArray *&datum); + + bool operator>>(DevVarUShortArray *&datum); + + bool operator>>(DevVarCharArray *&datum); + + bool operator>>(DevVarLong64Array *&datum); + + bool operator>>(DevVarULongArray *&datum); + + bool operator>>(DevVarULong64Array *&datum); + + bool operator>>(DevVarStateArray *&datum); + + bool operator>>(DevVarEncodedArray *&datum); // // Extract_xxx methods // // bool extract_read (vector&); - bool extract_read (vector&); - bool extract_read (vector&); - bool extract_read (vector&); - bool extract_read (vector&); - bool extract_read (vector&); - bool extract_read (vector&); - bool extract_read (vector&); - bool extract_read (vector&); - bool extract_read (vector&); - bool extract_read (vector&); - bool extract_read (vector&); - bool extract_read (string &,vector &); + bool extract_read(vector &); + + bool extract_read(vector &); + + bool extract_read(vector &); + + bool extract_read(vector &); + + bool extract_read(vector &); + + bool extract_read(vector &); + + bool extract_read(vector &); + + bool extract_read(vector &); + + bool extract_read(vector &); + + bool extract_read(vector &); + + bool extract_read(vector &); + + bool extract_read(string &, vector &); // bool extract_set (vector&); - bool extract_set (vector&); - bool extract_set (vector&); - bool extract_set (vector&); - bool extract_set (vector&); - bool extract_set (vector&); - bool extract_set (vector&); - bool extract_set (vector&); - bool extract_set (vector&); - bool extract_set (vector&); - bool extract_set (vector&); - bool extract_set (vector&); - bool extract_set (string &,vector &); + bool extract_set(vector &); + + bool extract_set(vector &); + + bool extract_set(vector &); + + bool extract_set(vector &); + + bool extract_set(vector &); + + bool extract_set(vector &); + + bool extract_set(vector &); + + bool extract_set(vector &); + + bool extract_set(vector &); + + bool extract_set(vector &); + + bool extract_set(vector &); + + bool extract_set(string &, vector &); // bool extract(const char *&,unsigned char *&,unsigned int &); - bool extract(char *&,unsigned char *&,unsigned int &); // Deprecated. For compatibility purpose - bool extract(string &,vector &); + bool extract(char *&, unsigned char *&, unsigned int &); // Deprecated. For compatibility purpose + bool extract(string &, vector &); ///@publicsection @@ -947,7 +1194,8 @@ public : * * @param [in] fl The exception flag */ - void exceptions(bitset fl) {exceptions_flags = fl;} + void exceptions(bitset fl) { exceptions_flags = fl; } + /** * Get exception flag * @@ -967,7 +1215,8 @@ public : * * @return The exception flag */ - bitset exceptions() {return exceptions_flags;} + bitset exceptions() { return exceptions_flags; } + /** * Reset one exception flag * @@ -975,7 +1224,8 @@ public : * * @param [in] fl The exception flag */ - void reset_exceptions(except_flags fl) {exceptions_flags.reset((size_t)fl);} + void reset_exceptions(except_flags fl) { exceptions_flags.reset((size_t) fl); } + /** * Set one exception flag * @@ -997,7 +1247,8 @@ public : * There is another usage example in the DeviceAttribute::exceptions() method documentation. * @param [in] fl The exception flag */ - void set_exceptions(except_flags fl) {exceptions_flags.set((size_t)fl);} + void set_exceptions(except_flags fl) { exceptions_flags.set((size_t) fl); } + /** * Get instance extraction state * @@ -1021,7 +1272,8 @@ public : * * @return The error bit set. */ - bitset state() {return ext->ext_state;} + bitset state() { return ext->ext_state; } + /** * Check if the call failed * @@ -1029,8 +1281,12 @@ public : * * @return A boolean set to true if the call failed */ - bool has_failed() {DevErrorList *tmp;if ((tmp=err_list.operator->())==NULL)return false; - else{if (tmp->length() != 0)return true;else return false;}} + bool has_failed() { + DevErrorList *tmp; + if ((tmp = err_list.operator->()) == NULL)return false; + else { if (tmp->length() != 0)return true; else return false; } + } + /** * Get the error stack * @@ -1109,7 +1365,7 @@ public : * * @return The error stack */ - const DevErrorList &get_err_stack() {return err_list.in();} + const DevErrorList &get_err_stack() { return err_list.in(); } //@} /**@name Miscellaneous methods */ //@{ @@ -1139,7 +1395,8 @@ public : * @return Boolean set to true if the instance is empty * @exception WrongData if requested */ - bool is_empty(); + bool is_empty(); + /** * Returns the name of the attribute * @@ -1147,7 +1404,8 @@ public : * * @return The attribute name */ - string &get_name() {return name;} + string &get_name() { return name; } + /** * Set attribute name * @@ -1155,7 +1413,8 @@ public : * * @param na The attribute name */ - void set_name(string &na) {name = na;} + void set_name(string &na) { name = na; } + /** * Set attribute name * @@ -1163,7 +1422,11 @@ public : * * @param na The attribute name */ - void set_name(const char *na) {string str(na);name = str;} + void set_name(const char *na) { + string str(na); + name = str; + } + /** * Get attribute X dimension * @@ -1171,7 +1434,8 @@ public : * * @return The attribute X dimension */ - int get_dim_x() {return dim_x;} + int get_dim_x() { return dim_x; } + /** * Get attribute Y dimension * @@ -1179,7 +1443,8 @@ public : * * @return The attribute Y dimension */ - int get_dim_y() {return dim_y;} + int get_dim_y() { return dim_y; } + /** * Get the attribute write X dimension * @@ -1187,7 +1452,8 @@ public : * * @return The attribute write X dimension */ - int get_written_dim_x() {return w_dim_x;} + int get_written_dim_x() { return w_dim_x; } + /** * Get the attribute write Y dimension * @@ -1195,7 +1461,8 @@ public : * * @return The attribute write Y dimension */ - int get_written_dim_y() {return w_dim_y;} + int get_written_dim_y() { return w_dim_y; } + /** * Get the attribute read dimensions * @@ -1203,7 +1470,8 @@ public : * * @return The attribute read dimensions */ - AttributeDimension get_r_dimension(); + AttributeDimension get_r_dimension(); + /** * Get the attribute write dimensions * @@ -1211,7 +1479,8 @@ public : * * @return The attribute write dimensions */ - AttributeDimension get_w_dimension(); + AttributeDimension get_w_dimension(); + /** * Get the number of read value * @@ -1219,7 +1488,8 @@ public : * * @return The read value number */ - long get_nb_read(); + long get_nb_read(); + /** * Get the number of written value * @@ -1250,7 +1520,8 @@ public : * * @return The read value number */ - long get_nb_written(); + long get_nb_written(); + /** * Get attribute quality factor * @@ -1263,7 +1534,8 @@ public : * * @return The attribute quality */ - AttrQuality &get_quality() {return quality;} + AttrQuality &get_quality() { return quality; } + /** * Get attribute data type * @@ -1271,7 +1543,8 @@ public : * * @return The attribute data type */ - int get_type(); + int get_type(); + /** * Get attribute data format * @@ -1281,7 +1554,8 @@ public : * * @return The attribute data format */ - AttrDataFormat get_data_format(); + AttrDataFormat get_data_format(); + /** * Get attribute read date * @@ -1289,35 +1563,40 @@ public : * * @return The attribute read date */ - TimeVal &get_date() {return time;} + TimeVal &get_date() { return time; } + //@} ///@privatesection - friend ostream &operator<<(ostream &,DeviceAttribute &); + friend ostream &operator<<(ostream &, DeviceAttribute &); -protected : + protected : ///@privatesection - bitset exceptions_flags; - void del_mem(int); - bool check_for_data(); - bool check_wrong_type_exception(); - int check_set_value_size(int seq_length); + bitset exceptions_flags; + + void del_mem(int); + + bool check_for_data(); + + bool check_wrong_type_exception(); - class DeviceAttributeExt - { - public: - DeviceAttributeExt() {}; - DeviceAttributeExt & operator=(const DeviceAttributeExt &); + int check_set_value_size(int seq_length); - bitset ext_state; + class DeviceAttributeExt { + public: + DeviceAttributeExt() {}; - void deep_copy(const DeviceAttributeExt &); - }; + DeviceAttributeExt &operator=(const DeviceAttributeExt &); + + bitset ext_state; + + void deep_copy(const DeviceAttributeExt &); + }; #ifdef HAS_UNIQUE_PTR - unique_ptr ext; + unique_ptr ext; #else - DeviceAttributeExt *ext; // Class extension + DeviceAttributeExt *ext; // Class extension #endif -}; - + }; +}//Tango #endif /* _DEVICEATTRIBUTE_H */ diff --git a/cppapi/client/DeviceData.h b/include/tango/client/DeviceData.h similarity index 71% rename from cppapi/client/DeviceData.h rename to include/tango/client/DeviceData.h index b8002aa54..2b98b47fe 100644 --- a/cppapi/client/DeviceData.h +++ b/include/tango/client/DeviceData.h @@ -59,32 +59,33 @@ * @headerfile tango.h * @ingroup Client */ +namespace Tango { + class DeviceData { -class DeviceData -{ - -public : + public : ///@privatesection // // constructor methods // - enum except_flags - { - isempty_flag, - wrongtype_flag, - numFlags - }; + enum except_flags { + isempty_flag, + wrongtype_flag, + numFlags + }; // DeviceData(); - DeviceData(const DeviceData &); - DeviceData & operator=(const DeviceData &); + DeviceData(const DeviceData &); + + DeviceData &operator=(const DeviceData &); + #ifdef HAS_RVALUE - DeviceData(DeviceData &&); - DeviceData & operator=(DeviceData &&); + DeviceData(DeviceData &&); + DeviceData & operator=(DeviceData &&); #endif - virtual ~DeviceData(); - CORBA::Any_var any; + virtual ~DeviceData(); + + CORBA::Any_var any; ///@publicsection /**@name Constructors */ @@ -95,7 +96,7 @@ public : * Default constructor. The instance is empty * */ - DeviceData(); + DeviceData(); //@} /**@name Inserters and Extractors */ @@ -225,7 +226,8 @@ public : * @param [in] datum The data to be inserted * @exception WrongData if requested */ - void operator << (bool datum) {any <<= CORBA::Any::from_boolean(datum);} + void operator<<(bool datum) { any <<= CORBA::Any::from_boolean(datum); } + /** * Insert data into a DeviceData for the DevVarLongStringArray data type * @@ -235,7 +237,8 @@ public : * @param [in] vs The string vector to be inserted * @exception WrongData if requested */ - void insert(vector &vl, vector&vs); + void insert(vector &vl, vector &vs); + /** * Insert data into a DeviceData for the DevVarDoubleStringArray data type * @@ -245,7 +248,8 @@ public : * @param [in] vs The string vector to be inserted * @exception WrongData if requested */ - void insert(vector &vd, vector &vs); + void insert(vector &vd, vector &vs); + /** * Insert data into a DeviceData for the DevEncoded data type * @@ -261,7 +265,8 @@ public : * @param [in] buffer The data part of the DevEncoded instance * @exception WrongData if requested */ - void insert(const string &str,vector &buffer); + void insert(const string &str, vector &buffer); + /** * The extract operators * @@ -321,7 +326,8 @@ public : * @return Boolean set to false if the extraction failed * @exception WrongData if requested */ - bool operator >> (bool &datum); + bool operator>>(bool &datum); + /** * Extract data from a DeviceData for the DevVarLongStringArray data type * @@ -332,7 +338,8 @@ public : * @return Boolean set to false if the extraction failed * @exception WrongData if requested */ - bool extract(vector &vl, vector &vs); + bool extract(vector &vl, vector &vs); + /** * Extract data from a DeviceData for the DevVarDoubleStringArray data type * @@ -343,7 +350,8 @@ public : * @return Boolean set to false if the extraction failed * @exception WrongData if requested */ - bool extract(vector &vd, vector &vs); + bool extract(vector &vd, vector &vs); + /** * Extract data from a DeviceData for the DevEncoded data type * @@ -357,7 +365,7 @@ public : * @return Boolean set to false if the extraction failed * @exception WrongData if requested */ - bool extract(const char *&str,const unsigned char *&data,unsigned int &length); + bool extract(const char *&str, const unsigned char *&data, unsigned int &length); //@} ///@privatesection @@ -365,119 +373,195 @@ public : // insert methods for native C++ types // // void operator << (bool datum) {any <<= CORBA::Any::from_boolean(datum);} - void operator << (short datum) {any <<= datum;} - void operator << (unsigned short datum) {any <<= datum;} - void operator << (DevLong datum) {any <<= datum;} - void operator << (DevULong datum) {any <<= datum;} - void operator << (DevLong64 datum) {any <<= datum;} - void operator << (DevULong64 datum) {any <<= datum;} - void operator << (float datum) {any <<= datum;} - void operator << (double datum) {any <<= datum;} - void operator << (char *&datum) {any <<= datum;} - void operator << (const char *&datum) {any <<= datum;} - void operator << (string &datum) {any <<= datum.c_str();} - void operator << (vector&); - void operator << (vector&); - void operator << (vector&); - void operator << (vector&); - void operator << (vector &); - void operator << (vector &); - void operator << (vector &); - void operator << (vector &); - void operator << (vector&); - void operator << (vector&); - void operator << (DevState datum) {(any.inout()) <<= datum;} - void operator << (DevEncoded &datum) {(any.inout()) <<= datum;} + void operator<<(short datum) { any <<= datum; } + + void operator<<(unsigned short datum) { any <<= datum; } + + void operator<<(DevLong datum) { any <<= datum; } + + void operator<<(DevULong datum) { any <<= datum; } + + void operator<<(DevLong64 datum) { any <<= datum; } + + void operator<<(DevULong64 datum) { any <<= datum; } + + void operator<<(float datum) { any <<= datum; } + + void operator<<(double datum) { any <<= datum; } + + void operator<<(char *&datum) { any <<= datum; } + + void operator<<(const char *&datum) { any <<= datum; } + + void operator<<(string &datum) { any <<= datum.c_str(); } + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(vector &); + + void operator<<(DevState datum) { (any.inout()) <<= datum; } + + void operator<<(DevEncoded &datum) { (any.inout()) <<= datum; } // void insert(vector&, vector&); // void insert(vector&, vector&); // void insert(const string &,vector&); - void insert(const char *,DevVarCharArray *); - void insert(const char *,unsigned char *,unsigned int); + void insert(const char *, DevVarCharArray *); + + void insert(const char *, unsigned char *, unsigned int); // // insert methods for TANGO CORBA sequence types // - inline void operator << (DevVarCharArray* datum) { any.inout() <<= datum;} - inline void operator << (DevVarShortArray* datum) { any.inout() <<= datum;} - inline void operator << (DevVarUShortArray* datum) { any.inout() <<= datum;} - inline void operator << (DevVarLongArray* datum) { any.inout() <<= datum;} - inline void operator << (DevVarLong64Array *datum) { any.inout() <<= datum;} - inline void operator << (DevVarULongArray* datum) { any.inout() <<= datum;} - inline void operator << (DevVarULong64Array* datum) { any.inout() <<= datum;} - inline void operator << (DevVarFloatArray* datum) { any.inout() <<= datum;} - inline void operator << (DevVarDoubleArray* datum) { any.inout() <<= datum;} - inline void operator << (DevVarStringArray* datum) { any.inout() <<= datum;} - inline void operator << (DevVarLongStringArray* datum) { any.inout() <<= datum;} - inline void operator << (DevVarDoubleStringArray* datum) { any.inout() <<= datum;} - - inline void operator << (DevVarCharArray &datum) { any.inout() <<= datum;} - inline void operator << (DevVarShortArray &datum) { any.inout() <<= datum;} - inline void operator << (DevVarUShortArray datum) { any.inout() <<= datum;} - inline void operator << (DevVarLongArray &datum) { any.inout() <<= datum;} - inline void operator << (DevVarLong64Array &datum) { any.inout() <<= datum;} - inline void operator << (DevVarULongArray &datum) { any.inout() <<= datum;} - inline void operator << (DevVarULong64Array &datum) { any.inout() <<= datum;} - inline void operator << (DevVarFloatArray &datum) { any.inout() <<= datum;} - inline void operator << (DevVarDoubleArray &datum) { any.inout() <<= datum;} - inline void operator << (DevVarStringArray &datum) { any.inout() <<= datum;} - inline void operator << (DevVarLongStringArray &datum) { any.inout() <<= datum;} - inline void operator << (DevVarDoubleStringArray &datum) { any.inout() <<= datum;} + inline void operator<<(DevVarCharArray *datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarShortArray *datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarUShortArray *datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarLongArray *datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarLong64Array *datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarULongArray *datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarULong64Array *datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarFloatArray *datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarDoubleArray *datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarStringArray *datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarLongStringArray *datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarDoubleStringArray *datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarCharArray &datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarShortArray &datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarUShortArray datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarLongArray &datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarLong64Array &datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarULongArray &datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarULong64Array &datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarFloatArray &datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarDoubleArray &datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarStringArray &datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarLongStringArray &datum) { any.inout() <<= datum; } + + inline void operator<<(DevVarDoubleStringArray &datum) { any.inout() <<= datum; } // // extract methods for native C++ types // // bool operator >> (bool&); - bool operator >> (short&); - bool operator >> (unsigned short&); - bool operator >> (DevLong&); - bool operator >> (DevULong&); - bool operator >> (DevLong64&); - bool operator >> (DevULong64&); - bool operator >> (float&); - bool operator >> (double&); - bool operator >> (const char*&); - bool operator >> (string&); - - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (vector&); - bool operator >> (DevState&); + bool operator>>(short &); + + bool operator>>(unsigned short &); + + bool operator>>(DevLong &); + + bool operator>>(DevULong &); + + bool operator>>(DevLong64 &); + + bool operator>>(DevULong64 &); + + bool operator>>(float &); + + bool operator>>(double &); + + bool operator>>(const char *&); + + bool operator>>(string &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(vector &); + + bool operator>>(DevState &); // bool extract(vector&, vector&); // bool extract(vector&, vector&); // bool extract(const char *&,unsigned char *&,unsigned int &); - bool extract(string &,vector &); + bool extract(string &, vector &); // // extract methods for TANGO CORBA sequence types // - bool operator >> (const DevVarCharArray* &datum); - bool operator >> (const DevVarShortArray* &datum); - bool operator >> (const DevVarUShortArray* &datum); - bool operator >> (const DevVarLongArray* &datum); - bool operator >> (const DevVarLong64Array* &datum); - bool operator >> (const DevVarULongArray* &datum); - bool operator >> (const DevVarULong64Array* &datum); - bool operator >> (const DevVarFloatArray* &datum); - bool operator >> (const DevVarDoubleArray* &datum); - bool operator >> (const DevVarStringArray* &datum); - bool operator >> (const DevVarLongStringArray* &datum); - bool operator >> (const DevVarDoubleStringArray* &datum); - - bool operator >> (const DevEncoded* &datum); - bool operator >> (DevEncoded &datum); + bool operator>>(const DevVarCharArray *&datum); + + bool operator>>(const DevVarShortArray *&datum); + + bool operator>>(const DevVarUShortArray *&datum); + + bool operator>>(const DevVarLongArray *&datum); + + bool operator>>(const DevVarLong64Array *&datum); + + bool operator>>(const DevVarULongArray *&datum); + + bool operator>>(const DevVarULong64Array *&datum); + + bool operator>>(const DevVarFloatArray *&datum); + + bool operator>>(const DevVarDoubleArray *&datum); + + bool operator>>(const DevVarStringArray *&datum); + + bool operator>>(const DevVarLongStringArray *&datum); + + bool operator>>(const DevVarDoubleStringArray *&datum); + + bool operator>>(const DevEncoded *&datum); + + bool operator>>(DevEncoded &datum); ///@publicsection /**@name Exception and error related methods methods @@ -496,7 +580,8 @@ public : * * @param [in] fl The exception flag */ - void exceptions(bitset fl) {exceptions_flags = fl;} + void exceptions(bitset fl) { exceptions_flags = fl; } + /** * Get exception flag * @@ -516,7 +601,8 @@ public : * * @return The exception flag */ - bitset exceptions() {return exceptions_flags;} + bitset exceptions() { return exceptions_flags; } + /** * Reset one exception flag * @@ -524,7 +610,8 @@ public : * * @param [in] fl The exception flag */ - void reset_exceptions(except_flags fl) {exceptions_flags.reset((size_t)fl);} + void reset_exceptions(except_flags fl) { exceptions_flags.reset((size_t) fl); } + /** * Set one exception flag * @@ -532,7 +619,8 @@ public : * * @param [in] fl The exception flag */ - void set_exceptions(except_flags fl) {exceptions_flags.set((size_t)fl);} + void set_exceptions(except_flags fl) { exceptions_flags.set((size_t) fl); } + /** * Get instance extraction state * @@ -556,7 +644,7 @@ public : * * @return The error bit set. */ - bitset state() {return ext->ext_state;} + bitset state() { return ext->ext_state; } //@} /**@name miscellaneous methods */ @@ -585,7 +673,8 @@ public : * * @return Boolean set to true is the instance is empty */ - bool is_empty(); + bool is_empty(); + /** * Get Tango data type of the included data * @@ -593,7 +682,7 @@ public : * * @return The data type */ - int get_type(); + int get_type(); //@} /** @@ -613,30 +702,29 @@ public : * @param [in] str The printing stream * @param [in] dd The instance to be printed */ - friend ostream &operator<<(ostream &str,DeviceData &dd); + friend ostream &operator<<(ostream &str, DeviceData &dd); -protected : + protected : ///@privatesection - bool any_is_null(); + bool any_is_null(); - bitset exceptions_flags; + bitset exceptions_flags; -private: - class DeviceDataExt - { - public: - DeviceDataExt() {}; + private: + class DeviceDataExt { + public: + DeviceDataExt() {}; - bitset ext_state; - }; + bitset ext_state; + }; #ifdef HAS_UNIQUE_PTR - unique_ptr ext; + unique_ptr ext; #else - DeviceDataExt *ext; // Class extension + DeviceDataExt *ext; // Class extension #endif -}; - + }; +}//Tango #endif /* _DEVICEDATA_H */ diff --git a/include/tango/client/DevicePipe.h b/include/tango/client/DevicePipe.h new file mode 100644 index 000000000..389af9f95 --- /dev/null +++ b/include/tango/client/DevicePipe.h @@ -0,0 +1,1748 @@ +//=================================================================================================================== +// +// DevicePipe.h - include file for TANGO device api class DevicePipe +// +// +// Copyright (C) : 2014,2015 +// European Synchrotron Radiation Facility +// BP 220, Grenoble 38043 +// FRANCE +// +// This file is part of Tango. +// +// Tango is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Tango is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty +// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License along with Tango. +// If not, see . +// +// $Revision$ +// +//=================================================================================================================== + +#ifndef _DEVICEPIPE_H +#define _DEVICEPIPE_H + +/** + * Fundamental type for extracting data from a device pipe blob + * + * This is the fundamental type for extracting data from a device pipe blob + * + * $Author$ + * $Revision$ + * + * @headerfile tango.h + * @ingroup Client + */ +namespace Tango { + template + struct DataElement { +/** + * Create a DataElement object. + * + * Create a DataElement object for device pipe blob extraction + * + * @param [in] name The data element name + * @param [in] value The data element value + */ + DataElement(const string &name, T value); + +/** + * Create a DataElement object. + * + * Create a DataElement object for device pipe blob extraction + * + * @param [in] name The data element name + */ + DataElement(const string &name); + +/** + * Create a DataElement object. + * + * Create a DataElement object for device pipe blob extraction. Usefull for extraction into TANGO CORBA + * sequence. See DevicePipeBlob extraction method + * + * @param [in] value The data element value + */ + DataElement(T value); + + DataElement(); + + string name; ///< The data element name + T value; ///< The data element value + }; + + template + DataElement::DataElement(const string &_na, T _val):name(_na), value(_val) { + } + + template + DataElement::DataElement(const string &_na):name(_na) { + } + + template + DataElement::DataElement(T _val):value(_val) { + } + + template + DataElement::DataElement() { + } + +/** + * A device pipe blob + * + * A device pipe blob. A blob is used to pack data to be sent through device pipe + * + * $Author$ + * $Revision$ + * + * @headerfile tango.h + * @ingroup Client + */ + + class DevicePipeBlob { + public: +///@privatesection + + enum except_flags { + isempty_flag, + wrongtype_flag, + notenoughde_flag, + blobdenamenotset_flag, + mixing_flag, + numFlags + }; + +///@publicsection +/**@name Constructors */ +//@{ +/** + * Create a DevicePipeBlob object. + * + * Default constructor. + * + */ + DevicePipeBlob(); + +/** + * Create a DevicePipeBlob object with name + * + * Create one instance of the DevicePipeBlob class and set its name + * + * @param [in] blob_name The blob name + */ + DevicePipeBlob(const string &blob_name); +//@} + +/**@name Get/Set methods */ +//@{ +/** + * Set blob name + * + * Set the blob name + * + * @param [in] blob_name The blob name + */ + void set_name(const string &blob_name) { name = blob_name; } + +/** + * Get blob name + * + * Get the blob name + * + * @return The blob name + */ + const string &get_name() { return name; } +//@} + + +/**@name Inserting data into a DevicePipeBlob + */ +//@{ +/** + * Insert data into a data blob + * + * According to the data to be inserted into the blob data element, several kinds of insetor methods have been + * implemented. You can insert data from: + * @li Scalar data type + * @li vector + * @li TANGO CORBA sequence types (by reference) + * @li TANGO CORBA sequence types (by pointer) + * @li DataElement with T being scalar data type + * @li DataElement with T being vector + * @li DataElement with T being TANGO CORBA sequence type (by reference) + * @li DataElement with T being TANGO CORBA sequence type (by pointer) + * + * When inserting data using a DataElement instance, the data element name is also set. + * For insertion from TANGO CORBA sequence type pointer, the insertion method consumes the + * memory allocated to store the data and it will be freed by the Tango layer. + * + * Insert operators for the following scalar C++ types (and DataElement) + * @li bool + * @li short + * @li DevLong + * @li DevLong64 + * @li float + * @li double + * @li unsigned char + * @li unsigned short + * @li DevULong + * @li DevULong64 + * @li DevString + * @li string + * @li DevState + * @li DevEncoded + * + * Insert operators for the following C++ vector types (and DataElement) + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * + * Insert operators for the following CORBA sequence types (and DataElement): + * @li DevVarBooleanArray & + * @li DevVarShortArray & + * @li DevVarLongArray & + * @li DevVarLong64Array & + * @li DevVarFloatArray & + * @li DevVarDoubleArray & + * @li DevVarUCharArray & + * @li DevVarUShortArray & + * @li DevVarULongArray & + * @li DevVarULong64Array & + * @li DevVarStringArray & + * @li DevVarStateArray & + * + * Insert operators for the following CORBA sequence types with memory consumption (and DataElement): + * @li DevVarBooleanArray * + * @li DevVarShortArray * + * @li DevVarLongArray * + * @li DevVarLong64Array * + * @li DevVarFloatArray * + * @li DevVarDoubleArray * + * @li DevVarUCharArray * + * @li DevVarUShortArray * + * @li DevVarULongArray * + * @li DevVarULong64Array * + * @li DevVarStringArray * + * @li DevVarStateArray * + * + * Here is an example of inserting data into a DevicePipeBlob instance. We insert + * 3 data element into the pipe blob with a DevLong, a vector of doubles and finally an array of 100 unsigned short + * @code + * DevicePipeBlob dpb("MyBlob"); + * + * vector de_names = {"FirstDE","SecondDE","ThirdDE"}; + * dpb.set_data_elt_names(de_names); + * + * DevLong dl = 666; + * vector v_db = {1.11,2.22}; + * unsigned short *array = new unsigned short [100]; // The array is populated by a way or another + * + * DevVarUShortArray *dvush = create_DevVarUShortArray(array,100); + * + * try + * { + * dpb << dl << v_db << dvush; + * } + * catch (DevFailed &e) + * { + * cout << "DevicePipeBlob insertion failed" << endl; + * .... + * } + * + * @endcode + * The same example of inserting data into a DevicePipeBlob instance when we want to set the data element name. + * @code + * DevicePipeBlob dpb("MyBlob"); + * + * DataElement de_dl("FirstDE",666); + * + * vector v_db = {1.11,2.22}; + * DataElement > de_v_db("SecondDE",v_db); + * + * unsigned short *array = new unsigned short [100]; // The array is populated by a way or another + * DevVarUShortArray *dvush = create_DevVarUShortArray(array,100); + * DataElement de_dvush("ThirdDE",array); + * + * try + * { + * dpb << de_dl << de_v_db << de_dvush; + * } + * catch (DevFailed &e) + * { + * cout << "DevicePipeBlob insertion failed" << endl; + * .... + * } + * + * ... + * @endcode + * It is also possible to do the insertion in a third way + * @code + * DevicePipeBlob dpb("MyBlob"); + * + * vector de_names{"FirstDE","SecondDE","ThirdDE"}; + * dpb.set_data_elt_names(de_names); + * + * DevLong dl = 666; + * vector v_db = {1.11,2.22}; + * unsigned short *array = new unsigned short [100]; // The array is populated by a way or another + * + * DevVarUShortArray *dvush = create_DevVarUShortArray(array,100); + * + * dpb["FirstDE"] << dl; + * dpb["SecondDE"] << v_db; + * dpb["ThirdDE"] << dvush; + * + * @endcode + * + * @param [in] datum The data to be inserted into the DevicePipeBlob + * @exception WrongData if requested + */ + DevicePipeBlob &operator<<(short &datum); + +/** + * Set blob data element number + * + * Set the blob data element number + * + * @param [in] nb The blob data element number + */ + void set_data_elt_nb(size_t nb); + +/** + * Set blob data element number and names + * + * Set the blob data element number and names. The data element number is the number of names in the input + * parameter. + * + * @param [in] names The blob data element names + */ + void set_data_elt_names(vector &names); +//@} + +/**@name Extracting data from a DevicePipeBlob + */ +//@{ +/** + * Extract data from a data blob + * + * According to the data inside blob data element, several kinds of extractor methods have been implemented. You + * can extract data into: + * @li Scalar data type + * @li vector + * @li TANGO CORBA sequence types + * @li DataElement with T being scalar data type + * @li DataElement with T being vector + * @li DataElement with T being TANGO CORBA sequence type + * + * When extracting data using a DataElement instance, the data element name is also returned. + * For extraction into C++ vector, data are copied into the vector. It is not the case for extraction into TANGO + * CORBA sequence type. For extraction into TANGO CORBA sequence types, the extraction method consumes the + * memory allocated to store the data and it is the caller responsibility to delete this memory. + * + * Extract operators for the following scalar C++ types (and DataElement) + * @li bool + * @li short + * @li DevLong + * @li DevLong64 + * @li float + * @li double + * @li unsigned char + * @li unsigned short + * @li DevULong + * @li DevULong64 + * @li string + * @li DevState + * @li DevEncoded + * + * Extract operators for the following C++ vector types (and DataElement) + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * @li vector + * + * Extract operators for the following CORBA sequence types with memory consumption (and DataElement): + * @li DevVarBooleanArray * + * @li DevVarShortArray * + * @li DevVarLongArray * + * @li DevVarLong64Array * + * @li DevVarFloatArray * + * @li DevVarDoubleArray * + * @li DevVarUCharArray * + * @li DevVarUShortArray * + * @li DevVarULongArray * + * @li DevVarULong64Array * + * @li DevVarStringArray * + * @li DevVarStateArray * + * + * Here is an example of extracting data from a DevicePipeBlob instance. We know that the DevicePipeBlob contains + * 3 data element with a DevLong, an array of doubles and finally an array of unsigned short + * @code + * DevicePipeBlob dpb = ..... + * + * DevLong dl; + * vector v_db; + * DevVarUShortArray *dvush = new DevVarUShortArray(); + * + * try + * { + * dpb >> dl >> v_db >> dvush; + * } + * catch (DevFailed &e) + * { + * cout << "DevicePipeBlob extraction failed" << endl; + * .... + * } + * + * delete dvush; + * @endcode + * The same example of extracting data from a DevicePipeBlob instance when we want to retrieve the data element name. + * @code + * DevicePipeBlob dpb = ..... + * + * DataElement de_dl; + * DataElement > de_v_db; + * DataElement de_dvush(new DevVarUShortArray()); + * + * try + * { + * dpb >> de_dl >> de_v_db >> de_dvush; + * } + * catch (DevFailed &e) + * { + * cout << "DevicePipeBlob extraction failed" << endl; + * .... + * } + * + * cout << "Data element name = " << de_dl.name << " - Value = " << de_dl.value << endl; + * ... + * delete de_dvush.value; + * @endcode + * It is also possible to do the extraction in a generic way + * @code + * DevicePipeBlob dpb = ..... + * + * size_t nb_de = dpb.get_data_elt_nb(); + * for (size_t loop = 0;loop < nb;loop++) + * { + * int data_type = dpb.get_data_elt_type(loop); + * string de_name = dpb.get_data_elt_name(loop); + * switch(data_type) + * { + * case DEV_LONG: + * { + * DevLong lg; + * dpb >> lg; + * } + * break; + * + * case DEVVAR_DOUBLEARRAY: + * { + * vector v_db; + * dpb >> v_db; + * } + * break; + * .... + * } + * ... + * } + * @endcode + * Note that instead of using DevLong and vector data, the extraction can be done using DataElement + * instances. In this case, the call to the get_data_elt_name() method becomes useless. + * + * @param [out] datum The blob data + * @exception WrongData if requested + */ + DevicePipeBlob &operator>>(short &datum); + +/** + * Get blob data element number + * + * Get the blob data element number + * + * @return The blob data element number + */ + size_t get_data_elt_nb(); + +/** + * Get blob data elements name + * + * Get the blob data elements name + * + * @return The blob data elements name + */ + vector get_data_elt_names(); + +/** + * Get blob data element name + * + * Get the blob data element name for a single data element + * + * @param [in] ind The data element index within the blob + * @return The blob data element name + */ + string get_data_elt_name(size_t ind); + +/** + * Get blob data element value type + * + * Get the blob data element value type for a single data element + * + * @param [in] ind The data element index within the blob + * @return The blob data element value type + */ + int get_data_elt_type(size_t ind); +//@} + +/**@name Exception and error related methods methods + */ +//@{ +/** + * Set exception flag + * + * It's a method which allows the user to switch on/off exception throwing when trying to extract data from a + * DevicePipeBlob object. The following flags are supported : + * @li @b isempty_flag - throw a WrongData exception (reason = API_EmptyDataElement) if user + * tries to extract data from one empty blob data element. By default, this flag + * is set + * @li @b wrongtype_flag - throw a WrongData exception (reason = API_IncompatibleArgumentType) if user + * tries to extract data with a type different than the type used for insertion. By default, this flag + * is set + * @li @b notenoughde_flag - throw a WrongData exception (reason = API_PipeWrongArg) if user + * tries to extract data from a DevicePipeBlob for a data element which does not exist. By default, this flag + * is set + * @li @b blobdenamenotset_flag - Throw a WrongData exception (reason = API_PipeNoDataElement) if user tries to + * insert data into the blob while the name or number of data element has not been set with methods + * set_data_elt_nb() or set_data_elt_names() + * @li @b mixing_flag - Throw a WrongData exception (reason = API_NotSupportedFeature) if user tries to mix + * insertion/extraction method (<< or >>) with operator[] + * + * @param [in] fl The exception flag + */ + void exceptions(bitset fl) { exceptions_flags = fl; } + +/** + * Get exception flag + * + * Returns the whole exception flags. + * The following is an example of how to use these exceptions related methods + * @code + * DevicePipeBlob dpb; + * + * bitset bs = dpb.exceptions(); + * cout << "bs = " << bs << endl; + * + * dpb.set_exceptions(DevicePipeBlob::wrongtype_flag); + * bs = dpb.exceptions(); + * + * cout << "bs = " << bs << endl; + * @endcode + * + * @return The exception flag + */ + bitset exceptions() { return exceptions_flags; } + +/** + * Reset one exception flag + * + * Resets one exception flag + * + * @param [in] fl The exception flag + */ + void reset_exceptions(except_flags fl) { exceptions_flags.reset((size_t) fl); } + +/** + * Set one exception flag + * + * Sets one exception flag. See DevicePipeBlob::exceptions() for a usage example. + * + * @param [in] fl The exception flag + */ + void set_exceptions(except_flags fl) { exceptions_flags.set((size_t) fl); } + +/** + * Check insertion/extraction success + * + * Allow the user to check if insertion/extraction into/from DevicePipeBlob instance was successfull. This + * method has to be used when exceptions are disabled. + * + * @return True if insertion/extraction has failed + */ + bool has_failed(); + +/** + * Get instance insertion/extraction state + * + * Allow the user to find out what was the reason of insertion/extraction into/from DevicePipeBlob failure. This + * method has to be used when exceptions are disabled. + * Here is an example of how methods has_failed() and state() could be used + * @code + * DevicePipeBlob dpb = .... + * + * bitset bs; + * bs.reset(); + * dpb.exceptions(bs); + * + * DevLong dl; + * dpb >> dl; + * + * if (dpb.has_failed() == true) + * { + * bitset bs_err = dpb.state(); + * if (bs_err.test(DevicePipeBlob::isempty_flag) == true) + * ..... + * } + * @endcode + * + * @return The error bit set. + */ + bitset state() { return ext_state; } +//@} + +///@privatesection + ~DevicePipeBlob(); + + DevicePipeBlob(const DevicePipeBlob &); + + DevicePipeBlob &operator=(const DevicePipeBlob &); + +#ifdef HAS_RVALUE + DevicePipeBlob(DevicePipeBlob &&); + DevicePipeBlob & operator=(DevicePipeBlob &&); +#endif + + DevicePipeBlob &operator<<(DevBoolean &); + +// DevicePipeBlob & operator << (short &); + DevicePipeBlob &operator<<(DevLong &); + + DevicePipeBlob &operator<<(DevLong64 &); + + DevicePipeBlob &operator<<(float &); + + DevicePipeBlob &operator<<(double &); + + DevicePipeBlob &operator<<(DevUChar &); + + DevicePipeBlob &operator<<(DevUShort &); + + DevicePipeBlob &operator<<(DevULong &); + + DevicePipeBlob &operator<<(DevULong64 &); + + DevicePipeBlob &operator<<(DevString &); + + DevicePipeBlob &operator<<(DevState &); + + DevicePipeBlob &operator<<(DevEncoded &); + + DevicePipeBlob &operator<<(const string &); + + DevicePipeBlob &operator<<(DevicePipeBlob &); + + DevicePipeBlob &operator<<(vector &); + + DevicePipeBlob &operator<<(vector &); + + DevicePipeBlob &operator<<(vector &); + + DevicePipeBlob &operator<<(vector &); + + DevicePipeBlob &operator<<(vector &); + + DevicePipeBlob &operator<<(vector &); + + DevicePipeBlob &operator<<(vector &); + + DevicePipeBlob &operator<<(vector &); + + DevicePipeBlob &operator<<(vector &); + + DevicePipeBlob &operator<<(vector &); + + DevicePipeBlob &operator<<(vector &); + + DevicePipeBlob &operator<<(vector &); + + DevicePipeBlob &operator<<(vector &); + + DevicePipeBlob &operator<<(vector &); + + DevicePipeBlob &operator<<(DevVarBooleanArray &); + + DevicePipeBlob &operator<<(DevVarShortArray &); + + DevicePipeBlob &operator<<(DevVarLongArray &); + + DevicePipeBlob &operator<<(DevVarLong64Array &); + + DevicePipeBlob &operator<<(DevVarFloatArray &); + + DevicePipeBlob &operator<<(DevVarDoubleArray &); + + DevicePipeBlob &operator<<(DevVarUCharArray &); + + DevicePipeBlob &operator<<(DevVarUShortArray &); + + DevicePipeBlob &operator<<(DevVarULongArray &); + + DevicePipeBlob &operator<<(DevVarULong64Array &); + + DevicePipeBlob &operator<<(DevVarStringArray &); + + DevicePipeBlob &operator<<(DevVarStateArray &); + + DevicePipeBlob &operator<<(DevVarEncodedArray &); + + DevicePipeBlob &operator<<(DevVarBooleanArray *); + + DevicePipeBlob &operator<<(DevVarShortArray *); + + DevicePipeBlob &operator<<(DevVarLongArray *); + + DevicePipeBlob &operator<<(DevVarLong64Array *); + + DevicePipeBlob &operator<<(DevVarFloatArray *); + + DevicePipeBlob &operator<<(DevVarDoubleArray *); + + DevicePipeBlob &operator<<(DevVarUCharArray *); + + DevicePipeBlob &operator<<(DevVarUShortArray *); + + DevicePipeBlob &operator<<(DevVarULongArray *); + + DevicePipeBlob &operator<<(DevVarULong64Array *); + + DevicePipeBlob &operator<<(DevVarStringArray *); + + DevicePipeBlob &operator<<(DevVarStateArray *); + + DevicePipeBlob &operator<<(DevVarEncodedArray *); + +//------------------------------------------------------------------------------------------------- + + DevicePipeBlob &operator>>(DevBoolean &); + +// DevicePipeBlob & operator >> (short &); + DevicePipeBlob &operator>>(DevLong &); + + DevicePipeBlob &operator>>(DevLong64 &); + + DevicePipeBlob &operator>>(float &); + + DevicePipeBlob &operator>>(double &); + + DevicePipeBlob &operator>>(DevUChar &); + + DevicePipeBlob &operator>>(DevUShort &); + + DevicePipeBlob &operator>>(DevULong &); + + DevicePipeBlob &operator>>(DevULong64 &); + + DevicePipeBlob &operator>>(DevString &); + + DevicePipeBlob &operator>>(DevState &); + + DevicePipeBlob &operator>>(DevEncoded &); + + DevicePipeBlob &operator>>(string &); + + DevicePipeBlob &operator>>(DevicePipeBlob &); + + DevicePipeBlob &operator>>(vector &); + + DevicePipeBlob &operator>>(vector &); + + DevicePipeBlob &operator>>(vector &); + + DevicePipeBlob &operator>>(vector &); + + DevicePipeBlob &operator>>(vector &); + + DevicePipeBlob &operator>>(vector &); + + DevicePipeBlob &operator>>(vector &); + + DevicePipeBlob &operator>>(vector &); + + DevicePipeBlob &operator>>(vector &); + + DevicePipeBlob &operator>>(vector &); + + DevicePipeBlob &operator>>(vector &); + + DevicePipeBlob &operator>>(vector &); +// DevicePipeBlob & operator >> (vector &); + + DevicePipeBlob &operator>>(DevVarBooleanArray *); + + DevicePipeBlob &operator>>(DevVarShortArray *); + + DevicePipeBlob &operator>>(DevVarLongArray *); + + DevicePipeBlob &operator>>(DevVarLong64Array *); + + DevicePipeBlob &operator>>(DevVarFloatArray *); + + DevicePipeBlob &operator>>(DevVarDoubleArray *); + + DevicePipeBlob &operator>>(DevVarUCharArray *); + + DevicePipeBlob &operator>>(DevVarUShortArray *); + + DevicePipeBlob &operator>>(DevVarULongArray *); + + DevicePipeBlob &operator>>(DevVarULong64Array *); + + DevicePipeBlob &operator>>(DevVarStringArray *); + + DevicePipeBlob &operator>>(DevVarStateArray *); + + DevicePipeBlob &operator>>(DevVarEncodedArray *); + + DevicePipeBlob &operator[](const string &); + + const char *get_current_delt_name() { return (*extract_elt_array)[extract_ctr].name.in(); } + + void set_current_delt_name(const string &); + + size_t get_extract_ind_from_name(const string &); + + size_t get_insert_ind_from_name(const string &); + + void reset_insert_ctr() { insert_ctr = 0; } + + DevVarPipeDataEltArray *get_insert_data() { return insert_elt_array; } + + const DevVarPipeDataEltArray *get_extract_data() { return extract_elt_array; } + + void set_extract_data(const DevVarPipeDataEltArray *_ptr) { extract_elt_array = _ptr; } + + void reset_insert_data_ptr() { insert_elt_array = Tango_nullptr; } + + void reset_extract_ctr() { extract_ctr = 0; } + + void set_extract_delete(bool _b) { extract_delete = _b; } + + void print(ostream &, int, bool); + + protected: +///@privatesection + void throw_type_except(const string &, const string &); + + void throw_too_many(const string &, bool); + + void throw_is_empty(const string &); + + void throw_name_not_set(const string &); + + void throw_mixing(const string &); + + private: + string name; // The blob name + bitset exceptions_flags; // Exception flag + bitset ext_state; // Extraction state + bool failed; // Failed flag + + DevVarPipeDataEltArray *insert_elt_array; // Ptr for data to be inserted (client write/Server read) + int insert_ctr; // Ctr for inserting data elt + int insert_ind; + + const DevVarPipeDataEltArray *extract_elt_array; // Ptr for data to be extracted (client read/Server write) + int extract_ctr; // Ctr for extracting data elt + bool extract_delete; // Flag to force extract ptr delete + int extract_ind; + + class DevicePipeBlobExt { + public: + DevicePipeBlobExt() {}; + }; + +#ifdef HAS_UNIQUE_PTR + unique_ptr ext; +#else + DevicePipeBlobExt *ext; // Class extension +#endif + }; + + +/**************************************************************************************** + * * + * The DevicePipe class * + * -------------------- * + * * + ***************************************************************************************/ + + +/** + * Fundamental type for sending/receiving data from device pipes + * + * This is the fundamental type for sending/receiving data to/from device pipe. + * + * $Author$ + * $Revision$ + * + * @headerfile tango.h + * @ingroup Client + */ + + class DevicePipe { + + public : + +///@publicsection +/**@name Constructors */ +//@{ +/** + * Create a DevicePipe object. + * + * Default constructor. The instance is empty + * + */ + DevicePipe(); + +/** + * Create a DevicePipe object with name + * + * Create one instance of the DevicePipe class and set its name + * + * @param [in] pipe_name The pipe name + */ + DevicePipe(const string &pipe_name); + +/** + * Create a DevicePipe object with name and root blob name. + * + * Create one instance of the DevicePipe class and set its name and its root blob name + * + * @param [in] pipe_name The pipe name + * @param [in] root_blob_name The root blob name + */ + DevicePipe(const string &pipe_name, const string &root_blob_name); +//@} + +/**@name Get/Set methods */ +//@{ +/** + * Set pipe name + * + * Set the device pipe name + * + * @param [in] pipe_name The pipe name + */ + void set_name(const string &pipe_name) { name = pipe_name; } + +/** + * Get pipe name + * + * Set the device pipe name + * + * @return The pipe name + */ + const string &get_name() { return name; } + +/** + * Set root blob name + * + * Set the root blob name + * + * @param [in] root_blob_name The root blob name + */ + void set_root_blob_name(const string &root_blob_name) { the_root_blob.set_name(root_blob_name); } + +/** + * Get root blob name + * + * Get the root blob name + * + * @return The root blob name + */ + const string &get_root_blob_name() { return the_root_blob.get_name(); } +//@} + +/**@name Inserting data into a DevicePipe + */ +//@{ +#ifdef GEN_DOC + /** + * Insert data into a device pipe + * + * Inserting data into a DevicePipe instance is simlar to inserting data into a DevicePipeBlob class instance. + * See doc of DevicePipeBlob class insertion methods (DevicePipeBlob::operator<<) to get a complete documentation on + * how to insert data into a DevicePipe + * + * @param [in] datum The data to be inserted into the DevicePipe + * @exception WrongData if requested + */ + DevicePipe & operator << (short &datum); +#endif + +/** + * Set blob data element number + * + * Set the blob data element number + * + * @param [in] nb The blob data element number + */ + void set_data_elt_nb(size_t nb) { the_root_blob.set_data_elt_nb(nb); } + +/** + * Set blob data element number and names + * + * Set the blob data element number and names. The data element number is the number of names in the input + * parameter. + * + * @param [in] names The blob data element names + */ + void set_data_elt_names(vector &names) { the_root_blob.set_data_elt_names(names); } +//@} + +/**@name Extracting data from a DevicePipe + */ +//@{ +#ifdef GEN_DOC + /** + * Extract data from a device pipe + * + * Extracting data from a DevicePipe instance is simlar to extracting data from a DevicePipeBlob class instance. + * See doc of DevicePipeBlob class extraction methods (DevicePipeBlob::operator>>) to get a complete documentation on + * how to extract data from a DevicePipe + * + * @param [in] datum The pipe data + * @exception WrongData if requested + */ + DevicePipe & operator >> (short &datum); +#endif + +/** + * Get root blob data element number + * + * Get the root blob data element number + * + * @return The root blob data element number + */ + size_t get_data_elt_nb() { return the_root_blob.get_data_elt_nb(); } + +/** + * Get root blob data elements name + * + * Get the root blob data elements name + * + * @return The root blob data elements name + */ + vector get_data_elt_names() { return the_root_blob.get_data_elt_names(); } + +/** + * Get root blob data element name + * + * Get root blob data element name for a single data element + * + * @param [in] ind The data element index within the root blob + * @return The root blob data element name + */ + string get_data_elt_name(size_t ind) { return the_root_blob.get_data_elt_name(ind); } + +/** + * Get root blob data element value type + * + * Get root blob data element value type for a single data element + * + * @param [in] ind The data element index within the root blob + * @return The root blob data element value type + */ + int get_data_elt_type(size_t ind) { return the_root_blob.get_data_elt_type(ind); } +//@} + + +/**@name Exception and error related methods methods + */ +//@{ +/** + * Set exception flag + * + * It's a method which allows the user to switch on/off exception throwing when trying to insert/extract data from a + * DevicePipe object. The following flags are supported : + * @li @b isempty_flag - throw a WrongData exception (reason = API_EmptyDataElement) if user + * tries to extract data from one empty pipe data element. By default, this flag + * is set + * @li @b wrongtype_flag - throw a WrongData exception (reason = API_IncompatibleArgumentType) if user + * tries to extract data with a type different than the type used for insertion. By default, this flag + * is set + * @li @b notenoughde_flag - throw a WrongData exception (reason = API_PipeWrongArg) if user + * tries to extract data from a DevicePipe for a data element which does not exist. By default, this flag + * is set + * @li @b blobdenamenotset_flag - Throw a WrongData exception (reason = API_PipeNoDataElement) if user tries to + * insert data into the blob while the name or number of data element has not been set with methods + * set_data_elt_nb() or set_data_elt_names() + * @li @b mixing_flag - Throw a WrongData exception (reason = API_NotSupportedFeature) if user tries to mix + * insertion/extraction method (<< or >>) with operator[] + * + * @param [in] fl The exception flag + */ + void exceptions(bitset fl) { the_root_blob.exceptions(fl); } + +/** + * Get exception flag + * + * Returns the whole exception flags. + * The following is an example of how to use these exceptions related methods + * @code + * DevicePipe dp; + * + * bitset bs = dp.exceptions(); + * cout << "bs = " << bs << endl; + * + * dp.set_exceptions(DevicePipeBlob::wrongtype_flag); + * bs = dp.exceptions(); + * + * cout << "bs = " << bs << endl; + * @endcode + * + * @return The exception flag + */ + bitset exceptions() { return the_root_blob.exceptions(); } + +/** + * Reset one exception flag + * + * Resets one exception flag + * + * @param [in] fl The exception flag + */ + void reset_exceptions(DevicePipeBlob::except_flags fl) { the_root_blob.reset_exceptions(fl); } + +/** + * Set one exception flag + * + * Sets one exception flag. See DevicePipe::exceptions() for a usage example. + * + * @param [in] fl The exception flag + */ + void set_exceptions(DevicePipeBlob::except_flags fl) { the_root_blob.set_exceptions(fl); } + +/** + * Check insertion/extraction success + * + * Allow the user to check if insertion/extraction into/from DevicePipe instance was successfull. This + * method has to be used when exceptions are disabled. + * + * @return True if insertion/extraction has failed + */ + bool has_failed() { return the_root_blob.has_failed(); } + +/** + * Get instance insertion/extraction state + * + * Allow the user to find out what was the reason of insertion/extraction into/from DevicePipe failure. This + * method has to be used when exceptions are disabled. + * Here is an example of how methods has_failed() and state() could be used + * @code + * DevicePipe dpb = .... + * + * bitset bs; + * bs.reset(); + * dpb.exceptions(bs); + * + * DevLong dl; + * dpb >> dl; + * + * if (dpb.has_failed() == true) + * { + * bitset bs_err = dpb.state(); + * if (dpb.test(DevicePipeBlob::isempty_flag) == true) + * ..... + * } + * @endcode + * + * @return The error bit set. + */ + bitset state() { return the_root_blob.state(); } +//@} + +/** + * Print a DevicePipe instance + * + * Is an utility function to easily print the contents of a DevicePipe object. This function knows all types + * which could be inserted in a DevicePipe object and print them accordingly. A special string is printed if + * the DevicePipe object is empty + * @code + * DeviceProxy *dev = new DeviceProxy(“...â€); + * DevicePipe out; + * + * out = dev->read_pipe(“MyPipeâ€); + * cout << “Pipe content: †<< out << endl; + * @endcode + * + * @param [in] str The printing stream + * @param [in] dd The instance to be printed + */ + friend ostream &operator<<(ostream &str, DevicePipe &dd); + + public : +///@privatesection + DevicePipe(const DevicePipe &); + + DevicePipe &operator=(const DevicePipe &); + +#ifdef HAS_RVALUE + DevicePipe(DevicePipe &&); + DevicePipe & operator=(DevicePipe &&); +#endif + + ~DevicePipe(); + + void set_time(TimeVal &_ti) { time = _ti; } + + DevicePipeBlob &get_root_blob() { return the_root_blob; } + + DevicePipe &operator[](const string &); + + private: + DevicePipeBlob the_root_blob; // Root blob + string name; // Pipe name + TimeVal time; // When pipe has been read + + class DevicePipeExt { + public: + DevicePipeExt() {}; + }; + +#ifdef HAS_UNIQUE_PTR + unique_ptr ext; +#else + DevicePipeExt *ext; // Class extension +#endif + }; + +/**************************************************************************************** + * * + * Some DevicePipe, DevicePipeBlob and DataElement helper functions * + * ---------------------------------------------------------------- * + * * + ***************************************************************************************/ + + DevicePipe &operator>>(DevicePipe &_dp, char *&datum); + +// +// For DataElement printing +// + + template + ostream &operator<<(ostream &, DataElement &); + + template + ostream &operator<<(ostream &, DataElement + + > &); + + template + ostream &operator<<(ostream &, DataElement &); + +// +// For DevicePipe insertion +// + + template + DevicePipe &operator<<(DevicePipe &, T &); + + template + DevicePipe &operator<<(DevicePipe &, T *); + + template + DevicePipe &operator<<(DevicePipe &, DataElement &); + +// +// For DevicePipe extraction +// + + template + DevicePipe &operator>>(DevicePipe &, T &); + + template + DevicePipe &operator>>(DevicePipe &, T *); + + template + DevicePipe &operator>>(DevicePipe &, DataElement &); + +// +// For DevicePipeBlob insertion +// + + template + DevicePipeBlob &operator<<(DevicePipeBlob &, T &); + + template + DevicePipeBlob &operator<<(DevicePipeBlob &, T *); + + template + DevicePipeBlob &operator<<(DevicePipeBlob &, DataElement &); + +// +// For DevicePipeBlob extraction +// + + template + DevicePipeBlob &operator>>(DevicePipeBlob &, T &); + + template + DevicePipeBlob &operator>>(DevicePipeBlob &, T *); + + template + DevicePipeBlob &operator>>(DevicePipeBlob &, DataElement &); + + + +/**************************************************************************************** + * * + * Some macros (shame on me, but I am too lazy) * + * ------------------------------------------- * + * * + ***************************************************************************************/ + +// +// A is the required value for the IDL enum descriminator +// B is the IDL enum method to get data +// C is data type name +// + +#define EXTRACT_BASIC_TYPE(A, B, C) \ + failed = false; \ + ext_state.reset(); \ +\ + if (extract_elt_array == Tango_nullptr) \ + ext_state.set(isempty_flag); \ + else if (extract_ctr > (int)extract_elt_array->length() - 1) \ + ext_state.set(notenoughde_flag); \ + else if (extract_ctr == -1 && extract_ind == -1) \ + ext_state.set(mixing_flag); \ + else \ + { \ + int ind; \ + if (extract_ind != -1) \ + ind = extract_ind; \ + else \ + ind = extract_ctr; \ + const AttrValUnion *uni_ptr = &((*extract_elt_array)[ind].value); \ + AttributeDataType adt = uni_ptr->_d(); \ + if (adt != A) \ + { \ + if (adt == ATT_NO_DATA) \ + { \ + if ((*extract_elt_array)[ind].inner_blob.length() == 0) \ + ext_state.set(isempty_flag); \ + else \ + ext_state.set(wrongtype_flag); \ + } \ + else \ + ext_state.set(wrongtype_flag); \ + } \ + else \ + { \ + datum = (uni_ptr->B())[0]; \ + if (extract_ind != -1) \ + extract_ind = -1; \ + else \ + extract_ctr++; \ + } \ + } \ +\ + if (ext_state.any() == true) \ + failed = true; \ +\ + if (ext_state.test(isempty_flag) == true && exceptions_flags.test(isempty_flag) == true) \ + throw_is_empty("operator>>"); \ +\ + if (ext_state.test(notenoughde_flag) == true && exceptions_flags.test(notenoughde_flag) == true) \ + throw_too_many("operator>>",true); \ +\ + if (ext_state.test(mixing_flag) == true && exceptions_flags.test(mixing_flag) == true) \ + throw_mixing("operator>>"); \ +\ + if (ext_state.test(wrongtype_flag) == true && exceptions_flags.test(wrongtype_flag) == true) \ + throw_type_except(C,"operator>>"); + + +// +// A is the required value for the IDL enum descriminator +// B is the IDL enum method to get data +// C is the CORBA sequence type name +// D is data type name +// + +#define EXTRACT_VECTOR_TYPE(A, B, C, D) \ + failed = false; \ + ext_state.reset(); \ +\ + if (extract_elt_array == Tango_nullptr) \ + ext_state.set(isempty_flag); \ + else if (extract_ctr > (int)extract_elt_array->length() - 1) \ + ext_state.set(notenoughde_flag); \ + else if (extract_ctr == -1 && extract_ind == -1) \ + ext_state.set(mixing_flag); \ + else \ + { \ + int ind; \ + if (extract_ind != -1) \ + ind = extract_ind; \ + else \ + ind = extract_ctr; \ + const AttrValUnion *uni_ptr = &((*extract_elt_array)[ind].value); \ + AttributeDataType adt = uni_ptr->_d(); \ + if (adt != A) \ + { \ + if (adt == ATT_NO_DATA) \ + { \ + if ((*extract_elt_array)[ind].inner_blob.length() == 0) \ + ext_state.set(isempty_flag); \ + else \ + ext_state.set(wrongtype_flag); \ + } \ + else \ + ext_state.set(wrongtype_flag); \ + } \ + else \ + { \ + const C &dvsa = uni_ptr->B(); \ + datum << dvsa; \ + if (extract_ind != -1) \ + extract_ind = -1; \ + else \ + extract_ctr++; \ + } \ + } \ +\ + if (ext_state.any() == true) \ + failed = true; \ +\ + if (ext_state.test(isempty_flag) == true && exceptions_flags.test(isempty_flag) == true) \ + throw_is_empty("operator>>"); \ +\ + if (ext_state.test(notenoughde_flag) == true && exceptions_flags.test(notenoughde_flag) == true) \ + throw_too_many("operator>>",true); \ +\ + if (ext_state.test(mixing_flag) == true && exceptions_flags.test(mixing_flag) == true) \ + throw_mixing("operator>>"); \ +\ + if (ext_state.test(wrongtype_flag) == true && exceptions_flags.test(wrongtype_flag) == true) \ + throw_type_except(D,"operator>>"); + +// +// A is the required value for the IDL enum descriminator +// B is the IDL enum method to get data +// C is the CORBA sequence type name +// D is data type name +// + +#define EXTRACT_SEQ_PTR_TYPE(A, B, C, D) \ + failed = false; \ + ext_state.reset(); \ +\ + if (extract_elt_array == Tango_nullptr) \ + ext_state.set(isempty_flag); \ + else if (extract_ctr > (int)extract_elt_array->length() - 1) \ + ext_state.set(notenoughde_flag); \ + else if (extract_ctr == -1 && extract_ind == -1) \ + ext_state.set(mixing_flag); \ + else \ + { \ + int ind; \ + if (extract_ind != -1) \ + ind = extract_ind; \ + else \ + ind = extract_ctr; \ + const AttrValUnion *uni_ptr = &((*extract_elt_array)[ind].value); \ + AttributeDataType adt = uni_ptr->_d(); \ + if (adt != A) \ + { \ + if (adt == ATT_NO_DATA) \ + { \ + if ((*extract_elt_array)[ind].inner_blob.length() == 0) \ + ext_state.set(isempty_flag); \ + else \ + ext_state.set(wrongtype_flag); \ + } \ + else \ + ext_state.set(wrongtype_flag); \ + } \ + else \ + { \ + C &dvsa = const_cast(uni_ptr->B()); \ + DevLong max,len; \ + max = dvsa.maximum(); \ + len = dvsa.length(); \ + datum->replace(max,len,dvsa.get_buffer((DevBoolean)true),true); \ + if (extract_ind != -1) \ + extract_ind = -1; \ + else \ + extract_ctr++; \ + } \ + } \ +\ + if (ext_state.any() == true) \ + failed = true; \ +\ + if (ext_state.test(isempty_flag) == true && exceptions_flags.test(isempty_flag) == true) \ + throw_is_empty("operator>>"); \ +\ + if (ext_state.test(notenoughde_flag) == true && exceptions_flags.test(notenoughde_flag) == true) \ + throw_too_many("operator>>",true); \ +\ + if (ext_state.test(mixing_flag) == true && exceptions_flags.test(mixing_flag) == true) \ + throw_mixing("operator>>"); \ +\ + if (ext_state.test(wrongtype_flag) == true && exceptions_flags.test(wrongtype_flag) == true) \ + throw_type_except(D,"operator>>"); + + +// +// A is the sequence CORBA name +// B is the IDL enum method to set data +// + +#define INSERT_BASIC_TYPE(A, B) \ + failed = false; \ + ext_state.reset(); \ +\ + if (insert_elt_array == Tango_nullptr) \ + ext_state.set(blobdenamenotset_flag); \ + else if (insert_ctr == -1 && insert_ind == -1) \ + ext_state.set(mixing_flag); \ + else \ + { \ + size_t nb_insert = insert_elt_array->length(); \ + if (nb_insert == 0 || insert_ctr > (int)nb_insert - 1) \ + ext_state.set(notenoughde_flag); \ + else \ + { \ + A dvsa; \ + dvsa.length(1); \ + dvsa[0] = datum; \ +\ + if (insert_ind != -1) \ + { \ + (*insert_elt_array)[insert_ind].value.B(dvsa); \ + (*insert_elt_array)[insert_ind].inner_blob_name = Tango::string_dup(SCALAR_PIPE); \ + insert_ind = -1; \ + } \ + else \ + { \ + (*insert_elt_array)[insert_ctr].value.B(dvsa); \ + (*insert_elt_array)[insert_ctr].inner_blob_name = Tango::string_dup(SCALAR_PIPE); \ + insert_ctr++; \ + } \ + } \ + } \ +\ + if (ext_state.any() == true) \ + failed = true; \ +\ + if (ext_state.test(blobdenamenotset_flag) == true && exceptions_flags.test(blobdenamenotset_flag) == true) \ + throw_name_not_set("operator<<"); \ +\ + if (ext_state.test(mixing_flag) == true && exceptions_flags.test(mixing_flag) == true) \ + throw_mixing("operator>>"); \ +\ + if (ext_state.test(notenoughde_flag) == true && exceptions_flags.test(notenoughde_flag) == true) \ + throw_too_many("operator<<",false); + + +// +// A is the sequence CORBA name +// B is the IDL enum method to set data +// + +#define INSERT_VECTOR_TYPE(A, B) \ + failed = false; \ + ext_state.reset(); \ +\ + if (insert_elt_array == Tango_nullptr) \ + ext_state.set(blobdenamenotset_flag); \ + else if (insert_ctr == -1 && insert_ind == -1) \ + ext_state.set(mixing_flag); \ + else \ + { \ + size_t nb_insert = insert_elt_array->length(); \ + if (nb_insert == 0 || insert_ctr > (int)nb_insert - 1) \ + ext_state.set(notenoughde_flag); \ + else \ + { \ + A dvsa; \ + if (insert_ind != -1) \ + { \ + (*insert_elt_array)[insert_ind].value.B(dvsa); \ + A &dvsb = (*insert_elt_array)[insert_ind].value.B(); \ + dvsb.replace(datum.size(),datum.size(),&datum[0],false); \ + (*insert_elt_array)[insert_ind].inner_blob_name = Tango::string_dup(ARRAY_PIPE); \ + insert_ind = -1; \ + } \ + else \ + { \ + (*insert_elt_array)[insert_ctr].value.B(dvsa); \ + A &dvsb = (*insert_elt_array)[insert_ctr].value.B(); \ + dvsb.replace(datum.size(),datum.size(),&datum[0],false); \ + (*insert_elt_array)[insert_ctr].inner_blob_name = Tango::string_dup(ARRAY_PIPE); \ + insert_ctr++; \ + } \ + } \ + } \ +\ + if (ext_state.any() == true) \ + failed = true; \ +\ + if (ext_state.test(blobdenamenotset_flag) == true && exceptions_flags.test(blobdenamenotset_flag) == true) \ + throw_name_not_set("operator<<"); \ +\ + if (ext_state.test(mixing_flag) == true && exceptions_flags.test(mixing_flag) == true) \ + throw_mixing("operator>>"); \ +\ + if (ext_state.test(notenoughde_flag) == true && exceptions_flags.test(notenoughde_flag) == true) \ + throw_too_many("operator<<",false); + + + +// +// A is the sequence CORBA name +// B is the IDL enum method to set data +// + +#define INSERT_SEQ_TYPE(A, B) \ + failed = false; \ + ext_state.reset(); \ +\ + if (insert_elt_array == Tango_nullptr) \ + ext_state.set(blobdenamenotset_flag); \ + else if (insert_ctr == -1 && insert_ind == -1) \ + ext_state.set(mixing_flag); \ + else \ + { \ + size_t nb_insert = insert_elt_array->length(); \ + if (nb_insert == 0 || insert_ctr > (int)nb_insert - 1) \ + ext_state.set(notenoughde_flag); \ + else \ + { \ + DevLong max,len; \ + max = datum.maximum(); \ + len = datum.length(); \ + A dvsa; \ + if (insert_ind != -1) \ + { \ + (*insert_elt_array)[insert_ind].value.B(dvsa); \ + A &dvsb = (*insert_elt_array)[insert_ind].value.B(); \ + dvsb.replace(max,len,datum.get_buffer(),false); \ + (*insert_elt_array)[insert_ind].inner_blob_name = Tango::string_dup(ARRAY_PIPE); \ + insert_ind = -1; \ + } \ + else \ + { \ + (*insert_elt_array)[insert_ctr].value.B(dvsa); \ + A &dvsb = (*insert_elt_array)[insert_ctr].value.B(); \ + dvsb.replace(max,len,datum.get_buffer(),false); \ + (*insert_elt_array)[insert_ctr].inner_blob_name = Tango::string_dup(ARRAY_PIPE); \ + insert_ctr++; \ + } \ + } \ + } \ +\ + if (ext_state.any() == true) \ + failed = true; \ +\ + if (ext_state.test(blobdenamenotset_flag) == true && exceptions_flags.test(blobdenamenotset_flag) == true) \ + throw_name_not_set("operator<<"); \ +\ + if (ext_state.test(mixing_flag) == true && exceptions_flags.test(mixing_flag) == true) \ + throw_mixing("operator>>"); \ +\ + if (ext_state.test(notenoughde_flag) == true && exceptions_flags.test(notenoughde_flag) == true) \ + throw_too_many("operator<<",false); + + + +// +// A is the sequence CORBA name +// B is the IDL enum method to set data +// + +#define INSERT_SEQ_PTR_TYPE(A, B) \ + failed = false; \ + ext_state.reset(); \ +\ + if (insert_elt_array == Tango_nullptr) \ + ext_state.set(blobdenamenotset_flag); \ + else if (insert_ctr == -1 && insert_ind == -1) \ + ext_state.set(mixing_flag); \ + else \ + { \ + size_t nb_insert = insert_elt_array->length(); \ + if (nb_insert == 0 || insert_ctr > (int)nb_insert - 1) \ + ext_state.set(notenoughde_flag); \ + else \ + { \ + A dvsa; \ + DevLong max,len; \ + max = datum->maximum(); \ + len = datum->length(); \ + bool rel = datum->release(); \ + if (rel == false) \ + { \ + datum->replace(max,len,datum->get_buffer(),true); \ + } \ + if (insert_ind != -1) \ + { \ + (*insert_elt_array)[insert_ind].value.B(dvsa); \ + A &dvsb = (*insert_elt_array)[insert_ind].value.B(); \ + dvsb.replace(max,len,datum->get_buffer((DevBoolean)true),true); \ + (*insert_elt_array)[insert_ind].inner_blob_name = Tango::string_dup(ARRAY_PIPE); \ + insert_ind = -1; \ + } \ + else \ + {\ + (*insert_elt_array)[insert_ctr].value.B(dvsa); \ + A &dvsb = (*insert_elt_array)[insert_ctr].value.B(); \ + dvsb.replace(max,len,datum->get_buffer((DevBoolean)true),true); \ + (*insert_elt_array)[insert_ctr].inner_blob_name = Tango::string_dup(ARRAY_PIPE); \ + insert_ctr++; \ + } \ + \ + delete datum; \ + } \ + } \ +\ + if (ext_state.any() == true) \ + failed = true; \ +\ + if (ext_state.test(blobdenamenotset_flag) == true && exceptions_flags.test(blobdenamenotset_flag) == true) \ + throw_name_not_set("operator<<"); \ +\ + if (ext_state.test(mixing_flag) == true && exceptions_flags.test(mixing_flag) == true) \ + throw_mixing("operator>>"); \ +\ + if (ext_state.test(notenoughde_flag) == true && exceptions_flags.test(notenoughde_flag) == true) \ + throw_too_many("operator<<",false); + +}//Tango +#endif /* _DEVICEPIPE_H */ diff --git a/cppapi/client/DeviceProxy.h b/include/tango/client/DeviceProxy.h similarity index 80% rename from cppapi/client/DeviceProxy.h rename to include/tango/client/DeviceProxy.h index 45a561a7c..ef4e882b6 100644 --- a/cppapi/client/DeviceProxy.h +++ b/include/tango/client/DeviceProxy.h @@ -51,93 +51,111 @@ * @ingroup Client * @headerfile tango.h */ +namespace Tango { + class DeviceProxy : public Tango::Connection { + private : + void real_constructor(string &, bool ch_acc = true); -class DeviceProxy: public Tango::Connection -{ -private : - void real_constructor(string &,bool ch_acc=true); - - Tango::DbDevice *db_dev; - string device_name; - string alias_name; - DeviceInfo _info; - bool is_alias; - DeviceProxy *adm_device; - string adm_dev_name; - omni_mutex netcalls_mutex; - int lock_ctr; - int lock_valid; - - void connect_to_adm_device(); - - void retrieve_read_args(TgRequest &,vector &); - DeviceAttribute *redo_synch_read_call(TgRequest &); - vector *redo_synch_reads_call(TgRequest &); - void redo_synch_write_call(TgRequest &); - void write_attribute(const AttributeValueList &); - void write_attribute(const AttributeValueList_4 &); - void create_locking_thread(ApiUtil *,DevLong); - void local_import(string &); - - enum read_attr_type - { - SIMPLE, - MULTIPLE - }; + Tango::DbDevice *db_dev; + string device_name; + string alias_name; + DeviceInfo _info; + bool is_alias; + DeviceProxy *adm_device; + string adm_dev_name; + omni_mutex netcalls_mutex; + int lock_ctr; + int lock_valid; + + void connect_to_adm_device(); + + void retrieve_read_args(TgRequest &, vector &); + + DeviceAttribute *redo_synch_read_call(TgRequest &); + + vector *redo_synch_reads_call(TgRequest &); + + void redo_synch_write_call(TgRequest &); + + void write_attribute(const AttributeValueList &); + + void write_attribute(const AttributeValueList_4 &); + + void create_locking_thread(ApiUtil *, DevLong); + + void local_import(string &); + + enum read_attr_type { + SIMPLE, + MULTIPLE + }; - void read_attr_except(CORBA::Request_ptr,long,read_attr_type); - void write_attr_except(CORBA::Request_ptr,long,TgRequest::ReqType); - void check_connect_adm_device(); + void read_attr_except(CORBA::Request_ptr, long, read_attr_type); - void omni420_timeout_attr(int,char *,read_attr_type); - void omni420_except_attr(int,char *,read_attr_type); - void omni420_timeout_wattr(int,char *); - void omni420_except_wattr(int,char *); + void write_attr_except(CORBA::Request_ptr, long, TgRequest::ReqType); - friend class AttributeProxy; + void check_connect_adm_device(); -protected : + void omni420_timeout_attr(int, char *, read_attr_type); + + void omni420_except_attr(int, char *, read_attr_type); + + void omni420_timeout_wattr(int, char *); + + void omni420_except_wattr(int, char *); + + friend class AttributeProxy; + + protected : /// @privatesection - virtual string get_corba_name(bool); - virtual string build_corba_name(); - virtual int get_lock_ctr() {return lock_ctr;} - virtual void set_lock_ctr(int lo) {lock_ctr=lo;} - - enum polled_object - { - Cmd, - Attr - }; + virtual string get_corba_name(bool); + + virtual string build_corba_name(); + + virtual int get_lock_ctr() { return lock_ctr; } + + virtual void set_lock_ctr(int lo) { lock_ctr = lo; } + + enum polled_object { + Cmd, + Attr + }; - bool is_polled(polled_object,string &, string &); - virtual void reconnect(bool); - void get_remaining_param(AttributeInfoListEx *); - template void from_hist_2_AttHistory(T &,vector *); - void from_hist4_2_DataHistory(DevCmdHistory_4_var &,vector *); - void ask_locking_status(vector &,vector &); - void get_locker_host(string &,string &); + bool is_polled(polled_object, string &, string &); - void same_att_name(vector &,const char *); + virtual void reconnect(bool); -private: - class DeviceProxyExt - { - public: - DeviceProxyExt() {}; + void get_remaining_param(AttributeInfoListEx *); - bool nethost_alias; - string orig_tango_host; - }; + template + void from_hist_2_AttHistory(T &, vector *); + + void from_hist4_2_DataHistory(DevCmdHistory_4_var &, vector *); + + void ask_locking_status(vector &, vector &); + + void get_locker_host(string &, string &); + + void same_att_name(vector &, const char *); + + private: + class DeviceProxyExt { + public: + DeviceProxyExt() {}; + + bool nethost_alias; + string orig_tango_host; + }; #ifdef HAS_UNIQUE_PTR - unique_ptr ext_proxy; + unique_ptr ext_proxy; #else - DeviceProxyExt *ext_proxy; // Class extension + DeviceProxyExt *ext_proxy; // Class extension #endif - omni_mutex lock_mutex; + omni_mutex lock_mutex; -public : + public : /**@name Constructors */ //@{ /** @@ -164,7 +182,8 @@ public : * @throws WrongNameSyntax, ConnectionFailed * */ - DeviceProxy(string &name, CORBA::ORB *orb=NULL); + DeviceProxy(string &name, CORBA::ORB *orb = NULL); + /** * Create a DeviceProxy instance. * @@ -189,18 +208,22 @@ public : * @throws WrongNameSyntax, ConnectionFailed * */ - DeviceProxy(const char *name, CORBA::ORB *orb=NULL); + DeviceProxy(const char *name, CORBA::ORB *orb = NULL); + //@} /// @privatesection - DeviceProxy(string &name, bool ch_access, CORBA::ORB *orb=NULL); - DeviceProxy(const char *, bool ch_access, CORBA::ORB *orb=NULL); + DeviceProxy(string &name, bool ch_access, CORBA::ORB *orb = NULL); + + DeviceProxy(const char *, bool ch_access, CORBA::ORB *orb = NULL); + + DeviceProxy(const DeviceProxy &); + + DeviceProxy &operator=(const DeviceProxy &); - DeviceProxy(const DeviceProxy &); - DeviceProxy & operator=(const DeviceProxy &); - virtual ~DeviceProxy(); + virtual ~DeviceProxy(); - DeviceProxy():Connection((CORBA::ORB *)NULL),db_dev(NULL),adm_device(NULL),lock_ctr(0),ext_proxy(Tango_nullptr) - {dbase_used = false;} + DeviceProxy() : Connection((CORBA::ORB *) NULL), db_dev(NULL), adm_device(NULL), lock_ctr(0), + ext_proxy(Tango_nullptr) { dbase_used = false; } /// @publicsection // @@ -230,7 +253,8 @@ public : * * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual DeviceInfo const &info(); + virtual DeviceInfo const &info(); + /** * Get device state. * @@ -243,7 +267,8 @@ public : * * @throws ConnectionFailed, CommunicationFailed */ - virtual DevState state(); + virtual DevState state(); + /** * Get device status. * @@ -256,7 +281,8 @@ public : * * @throws ConnectionFailed, CommunicationFailed */ - virtual string status(); + virtual string status(); + /** * Ping a device. * @@ -267,7 +293,8 @@ public : * * @throws ConnectionFailed, CommunicationFailed */ - virtual int ping(); + virtual int ping(); + /** * Get device black box content * @@ -280,7 +307,8 @@ public : * @return Black box content * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual vector *black_box(int nb); + virtual vector *black_box(int nb); + /** * Return the device name (from the device itself) * @@ -289,7 +317,8 @@ public : * @return The device name * @throws ConnectionFailed, CommunicationFailed */ - virtual string name(); + virtual string name(); + /** * Return the administrator device name * @@ -299,7 +328,8 @@ public : * @return The administrator device name * @throws ConnectionFailed, CommunicationFailed */ - virtual string adm_name(); + virtual string adm_name(); + /** * Return the device name as it is stored locally * @@ -307,7 +337,8 @@ public : * * @return The device name */ - virtual inline string dev_name() { return device_name; } + virtual inline string dev_name() { return device_name; } + /** * Returns the device description as a string. * @@ -316,7 +347,8 @@ public : * @return The device description * @throws ConnectionFailed, CommunicationFailed */ - virtual string description(); + virtual string description(); + /** * Returns device alias * @@ -326,7 +358,8 @@ public : * @return The device alias * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual string alias(); + virtual string alias(); + /** * Query the device for import info from the database. * @@ -335,7 +368,8 @@ public : * @return The device import info * @throws ConnectionFailed, CommunicationFailed, NonDbDevice */ - virtual DbDevImportInfo import_info(); + virtual DbDevImportInfo import_info(); + /** * Get device Tango lib version * @@ -343,7 +377,7 @@ public : * * @return The device Tango lib version */ - virtual int get_tango_lib_version(); + virtual int get_tango_lib_version(); //@} /** @name Synchronous command related methods */ @@ -358,7 +392,8 @@ public : * @return The command information structure * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual CommandInfo command_query(string cmd_name); + virtual CommandInfo command_query(string cmd_name); + /** * Query the device for all commands information. * @@ -369,7 +404,8 @@ public : * @return The command information list: One CommandInfo structure per command * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual CommandInfoList *command_list_query(); + virtual CommandInfoList *command_list_query(); + /** * Query all commands name * @@ -379,7 +415,8 @@ public : * @return A vector of string with one string per command * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual vector *get_command_list(); + virtual vector *get_command_list(); + /** * Get command information for a single command * @@ -389,7 +426,8 @@ public : * @return The command information * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual CommandInfo get_command_config(const string &cmd_name) {return command_query(cmd_name);} + virtual CommandInfo get_command_config(const string &cmd_name) { return command_query(cmd_name); } + /** * Get information for a set of commands * @@ -400,7 +438,7 @@ public : * @return A vector of CommadnInfo srtuctures with one element per command * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual CommandInfoList *get_command_config(vector &cmd_names); + virtual CommandInfoList *get_command_config(vector &cmd_names); /** * Retrieve command history from polling buffer. @@ -441,7 +479,8 @@ public : * @return The command information list: One CommandInfo structure per command * @throws NonSupportedFeature, ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual vector *command_history(string &cmd_name,int depth); + virtual vector *command_history(string &cmd_name, int depth); + /** * Retrieve command history from polling buffer. * @@ -481,8 +520,10 @@ public : * @return The command information list: One CommandInfo structure per command * @throws NonSupportedFeature, ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual vector *command_history(const char *cmd_name,int depth) - {string str(cmd_name);return command_history(str,depth);} + virtual vector *command_history(const char *cmd_name, int depth) { + string str(cmd_name); + return command_history(str, depth); + } //@} /** @name Synchronous attribute related methods */ @@ -508,7 +549,8 @@ public : * @return The attribute information structure * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual AttributeInfoEx attribute_query(string att_name) {return get_attribute_config(att_name);} + virtual AttributeInfoEx attribute_query(string att_name) { return get_attribute_config(att_name); } + /** * Query the device for information on all attributes * @@ -520,7 +562,8 @@ public : * @return A vector of AttributeInfo structures with one element per attribute * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual AttributeInfoList *attribute_list_query(); + virtual AttributeInfoList *attribute_list_query(); + /** * Query the device for information on all attributes * @@ -532,7 +575,8 @@ public : * @return A vector of AttributeInfoEx structures with one element per attribute * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual AttributeInfoListEx *attribute_list_query_ex(); + virtual AttributeInfoListEx *attribute_list_query_ex(); + /** * Query all attributes name * @@ -542,7 +586,8 @@ public : * @return A vector of string with one string per attribute * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual vector *get_attribute_list(); + virtual vector *get_attribute_list(); + /** * Get attribute configuration for a list of attributes * @@ -555,7 +600,8 @@ public : * @return A vector of AttributeInfo structures with one element per attribute * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual AttributeInfoList *get_attribute_config(vector &att_names); + virtual AttributeInfoList *get_attribute_config(vector &att_names); + /** * Get attribute configuration (extended) for a list of attributes * @@ -568,7 +614,8 @@ public : * @return A vector of AttributeInfoEx structures with one element per attribute * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual AttributeInfoListEx *get_attribute_config_ex(vector &att_names); + virtual AttributeInfoListEx *get_attribute_config_ex(vector &att_names); + /** * Get attribute configuration (extended) for a single attribute * @@ -579,7 +626,8 @@ public : * @return The extended attribute information * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual AttributeInfoEx get_attribute_config(const string &att_name); + virtual AttributeInfoEx get_attribute_config(const string &att_name); + /** * Set attribute configuration * @@ -589,7 +637,8 @@ public : * @param [in] atts New attributes configuration * @throws ConnectionFailed, CommunicationFailed, DevUnlocked, DevFailed from device */ - virtual void set_attribute_config(AttributeInfoList &atts); + virtual void set_attribute_config(AttributeInfoList &atts); + /** * Set extended attribute configuration * @@ -599,7 +648,8 @@ public : * @param [in] atts New extended attributes configuration * @throws ConnectionFailed, CommunicationFailed, DevUnlocked, DevFailed from device */ - virtual void set_attribute_config(AttributeInfoListEx &atts); + virtual void set_attribute_config(AttributeInfoListEx &atts); + /** * Read the list of specified attributes * @@ -634,7 +684,8 @@ public : * @return A vector of DeviceAttribute instances with one element for each read attribute * @throws ConnectionFailed, CommunicationFailed */ - virtual vector *read_attributes(vector &att_names); + virtual vector *read_attributes(vector &att_names); + /** * Read a single attribute * @@ -648,7 +699,8 @@ public : * @return The attribute value in a DeviceAttribute instance * @throws ConnectionFailed, CommunicationFailed */ - virtual DeviceAttribute read_attribute(string &att_name); + virtual DeviceAttribute read_attribute(string &att_name); + /** * Read the list of specified attributes * @@ -662,7 +714,11 @@ public : * @return The attribute value in a DeviceAttribute instance * @throws ConnectionFailed, CommunicationFailed */ - virtual DeviceAttribute read_attribute(const char *att_name) {string str(att_name);return read_attribute(str);} + virtual DeviceAttribute read_attribute(const char *att_name) { + string str(att_name); + return read_attribute(str); + } + /** * Write the specified attributes * @@ -690,7 +746,8 @@ public : * @param [in] attr_in Attributes name and value * @throws ConnectionFailed, CommunicationFailed, DeviceUnlocked, DevFailed or NamedDevFailedList from device */ - virtual void write_attributes(vector &attr_in); + virtual void write_attributes(vector &attr_in); + /** * Write a single attribute * @@ -702,7 +759,8 @@ public : * @param [in] attr_in Attribute name and value * @throws ConnectionFailed, CommunicationFailed, DeviceUnlocked, DevFailed from device */ - virtual void write_attribute(DeviceAttribute &attr_in); + virtual void write_attribute(DeviceAttribute &attr_in); + /** * Write and read a single attribute * @@ -717,7 +775,8 @@ public : * @return The read attribute data * @throws ConnectionFailed, CommunicationFailed, DeviceUnlocked, DevFailed from device */ - virtual DeviceAttribute write_read_attribute(DeviceAttribute &attr_in); + virtual DeviceAttribute write_read_attribute(DeviceAttribute &attr_in); + /** * Write and read attribute(s) * @@ -735,7 +794,9 @@ public : * @return The read attribute(s) data * @throws ConnectionFailed, CommunicationFailed, DeviceUnlocked, DevFailed from device */ - virtual vector *write_read_attributes(vector &attr_in,vector &r_names); + virtual vector * + write_read_attributes(vector &attr_in, vector &r_names); + /** * Retrieve attribute history from polling buffer * @@ -778,7 +839,8 @@ public : * @return The read attribute history data * @throws NonSupportedFeature, ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual vector *attribute_history(string &att_name,int depth); + virtual vector *attribute_history(string &att_name, int depth); + /** * Retrieve attribute history from polling buffer * @@ -821,8 +883,10 @@ public : * @return The read attribute history data * @throws NonSupportedFeature, ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual vector *attribute_history(const char *att_name,int depth) - {string str(att_name);return attribute_history(str,depth);} + virtual vector *attribute_history(const char *att_name, int depth) { + string str(att_name); + return attribute_history(str, depth); + } //@} /** @name Pipe related methods */ @@ -838,7 +902,8 @@ public : * @return A vector of PipeInfo structures with one element per pipe * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual PipeInfoList *get_pipe_config(vector &pipe_names); + virtual PipeInfoList *get_pipe_config(vector &pipe_names); + /** * Get pipe configuration for a single pipe * @@ -848,7 +913,8 @@ public : * @return The pipe information * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual PipeInfo get_pipe_config(const string &pipe_name); + virtual PipeInfo get_pipe_config(const string &pipe_name); + /** * Set pipe configuration * @@ -857,7 +923,8 @@ public : * @param [in] pipes New pipes configuration * @throws ConnectionFailed, CommunicationFailed, DevUnlocked, DevFailed from device */ - virtual void set_pipe_config(PipeInfoList &pipes); + virtual void set_pipe_config(PipeInfoList &pipes); + /** * Query all pipes name * @@ -867,7 +934,8 @@ public : * @return A vector of string with one string per pipe * @throws ConnectionFailed, CommunicationFailed, DevFailed from device */ - virtual vector *get_pipe_list(); + virtual vector *get_pipe_list(); + /** * Read a pipe * @@ -877,7 +945,8 @@ public : * @return The pipe value in a DevicePipe instance * @throws ConnectionFailed, CommunicationFailed */ - virtual DevicePipe read_pipe(const string &pipe_name); + virtual DevicePipe read_pipe(const string &pipe_name); + /** * Write a pipe * @@ -886,7 +955,8 @@ public : * @param [in] pipe_data Data to be sent to the device through the pipe * @throws ConnectionFailed, CommunicationFailed */ - virtual void write_pipe(DevicePipe &pipe_data); + virtual void write_pipe(DevicePipe &pipe_data); + /** * Write then read a pipe * @@ -897,7 +967,7 @@ public : * @return The pipe value in a DevicePipe instance * @throws ConnectionFailed, CommunicationFailed */ - virtual DevicePipe write_read_pipe(DevicePipe &pipe_data); + virtual DevicePipe write_read_pipe(DevicePipe &pipe_data); //@} /** @name Asynchronous attribute related methods */ @@ -912,7 +982,8 @@ public : * @return The call identifier * @throws ConnectionFailed */ - virtual long read_attribute_asynch(string &att_name); + virtual long read_attribute_asynch(string &att_name); + /** * Read a single attribute asynchronously * @@ -923,7 +994,11 @@ public : * @return The call identifier * @throws ConnectionFailed */ - virtual long read_attribute_asynch(const char *att_name) {string tmp(att_name);return read_attribute_asynch(tmp);} + virtual long read_attribute_asynch(const char *att_name) { + string tmp(att_name); + return read_attribute_asynch(tmp); + } + /** * Read asynchronously alist of attributes * @@ -934,7 +1009,8 @@ public : * @return The call identifier * @throws ConnectionFailed */ - virtual long read_attributes_asynch(vector &att_names); + virtual long read_attributes_asynch(vector &att_names); + /** * Check if an asynchronous read_attributes call is arrived * @@ -951,7 +1027,8 @@ public : * @return The attribute(s) data * @throws AsynCall, AsynReplyNotArrived, CommunicationFailed, DevFailed from device */ - virtual vector *read_attributes_reply(long id); + virtual vector *read_attributes_reply(long id); + /** * Check if an asynchronous read_attributes call is arrived (with timeout) * @@ -971,7 +1048,8 @@ public : * @return The attribute(s) data * @throws AsynCall, AsynReplyNotArrived, CommunicationFailed, DevFailed from device */ - virtual vector *read_attributes_reply(long id,long timeout); + virtual vector *read_attributes_reply(long id, long timeout); + /** * Check if an asynchronous read_attribute (single attribute) call is arrived * @@ -988,7 +1066,8 @@ public : * @return The attribute data * @throws AsynCall, AsynReplyNotArrived, CommunicationFailed, DevFailed from device */ - virtual DeviceAttribute *read_attribute_reply(long id); + virtual DeviceAttribute *read_attribute_reply(long id); + /** * Check if an asynchronous read_attribute (single attribute) call is arrived (with timeout) * @@ -1008,7 +1087,8 @@ public : * @return The attribute data * @throws AsynCall, AsynReplyNotArrived, CommunicationFailed, DevFailed from device */ - virtual DeviceAttribute *read_attribute_reply(long id,long timeout); + virtual DeviceAttribute *read_attribute_reply(long id, long timeout); + /** * Write a single attribute asynchronously * @@ -1022,7 +1102,8 @@ public : * @return The call identifier * @throws ConnectionFailed */ - virtual long write_attribute_asynch(DeviceAttribute &argin); + virtual long write_attribute_asynch(DeviceAttribute &argin); + /** * Write asynchronously alist of attributes * @@ -1036,7 +1117,8 @@ public : * @return The call identifier * @throws ConnectionFailed */ - virtual long write_attributes_asynch(vector &argin); + virtual long write_attributes_asynch(vector &argin); + /** * Check if the answer of one asynchronous write_attribute (single attribute) call is arrived * @@ -1047,7 +1129,8 @@ public : * @param [in] id The call identifier * @throws AsynCall, AsynReplyNotArrived, CommunicationFailed, DevFailed from device */ - virtual void write_attribute_reply(long id) {write_attributes_reply(id);} + virtual void write_attribute_reply(long id) { write_attributes_reply(id); } + /** * Check if the answer of one asynchronous write_attribute call (single attribute) is arrived with timeout * @@ -1061,7 +1144,8 @@ public : * @param [in] timeout The timeout value * @throws AsynCall, AsynReplyNotArrived, CommunicationFailed, DevFailed from device */ - virtual void write_attribute_reply(long id,long timeout) {write_attributes_reply(id,timeout);} + virtual void write_attribute_reply(long id, long timeout) { write_attributes_reply(id, timeout); } + /** * Check if the answer of one asynchronous write_attributes call is arrived * @@ -1072,7 +1156,8 @@ public : * @param [in] id The call identifier * @throws AsynCall, AsynReplyNotArrived, CommunicationFailed, DevFailed from device */ - virtual void write_attributes_reply(long id); + virtual void write_attributes_reply(long id); + /** * Check if the answer of one asynchronous write_attributes call is arrived with timeout * @@ -1086,7 +1171,8 @@ public : * @param [in] timeout The timeout value * @throws AsynCall, AsynReplyNotArrived, CommunicationFailed, DevFailed from device */ - virtual void write_attributes_reply(long id,long timeout); + virtual void write_attributes_reply(long id, long timeout); + /** * Read a single attribute asynchronously in callback model * @@ -1098,7 +1184,11 @@ public : * @param [in] cb The call-back object * @throws ConnectionFailed */ - virtual void read_attribute_asynch(const char *att_name,CallBack &cb) {string tmp(att_name);read_attribute_asynch(tmp,cb);} + virtual void read_attribute_asynch(const char *att_name, CallBack &cb) { + string tmp(att_name); + read_attribute_asynch(tmp, cb); + } + /** * Read a single attribute asynchronously in callback model * @@ -1110,7 +1200,8 @@ public : * @param [in] cb The call-back object * @throws ConnectionFailed */ - virtual void read_attribute_asynch(string &att_name,CallBack &cb); + virtual void read_attribute_asynch(string &att_name, CallBack &cb); + /** * Read asynchronously in callback model a list of attributes * @@ -1122,7 +1213,8 @@ public : * @param [in] cb The call-back object * @throws ConnectionFailed */ - virtual void read_attributes_asynch(vector &att_names,CallBack &cb); + virtual void read_attributes_asynch(vector &att_names, CallBack &cb); + /** * Write asynchronously in callback model a single attribute * @@ -1134,7 +1226,8 @@ public : * @param [in] cb The call-back object * @throws ConnectionFailed */ - virtual void write_attribute_asynch(DeviceAttribute &argin,CallBack &cb); + virtual void write_attribute_asynch(DeviceAttribute &argin, CallBack &cb); + /** * Write asynchronously in callback model a list of attributes * @@ -1146,7 +1239,7 @@ public : * @param [in] cb The call-back object * @throws ConnectionFailed */ - virtual void write_attributes_asynch(vector &argin,CallBack &cb); + virtual void write_attributes_asynch(vector &argin, CallBack &cb); //@} /** @name Asynchronous related methods */ @@ -1163,10 +1256,11 @@ public : * @param [in] req The asynchronous request type * @return Pending asynchronous request number */ - virtual long pending_asynch_call(asyn_req_type req) - {if (req == POLLING)return pasyn_ctr; - else if (req==CALL_BACK) return pasyn_cb_ctr; - else return (pasyn_ctr + pasyn_cb_ctr);} + virtual long pending_asynch_call(asyn_req_type req) { + if (req == POLLING)return pasyn_ctr; + else if (req == CALL_BACK) return pasyn_cb_ctr; + else return (pasyn_ctr + pasyn_cb_ctr); + } //@} /** @name Polling related methods */ @@ -1179,7 +1273,8 @@ public : * @param [in] cmd_name The command name * @return Flag set to true if the command is polled */ - virtual bool is_command_polled(string &cmd_name); + virtual bool is_command_polled(string &cmd_name); + /** * Check if a command is polled * @@ -1188,7 +1283,11 @@ public : * @param [in] cmd_name The command name * @return Flag set to true if the command is polled */ - virtual bool is_command_polled(const char *cmd_name) {string tmp(cmd_name);return is_command_polled(tmp);} + virtual bool is_command_polled(const char *cmd_name) { + string tmp(cmd_name); + return is_command_polled(tmp); + } + /** * Check if one attribute is polled * @@ -1197,7 +1296,8 @@ public : * @param [in] att_name The attribute name * @return Flag set to true if the attribute is polled */ - virtual bool is_attribute_polled(string &att_name); + virtual bool is_attribute_polled(string &att_name); + /** * Check if one attribute is polled * @@ -1206,7 +1306,11 @@ public : * @param [in] att_name The attribute name * @return Flag set to true if the attribute is polled */ - virtual bool is_attribute_polled(const char *att_name) {string tmp(att_name);return is_attribute_polled(tmp);} + virtual bool is_attribute_polled(const char *att_name) { + string tmp(att_name); + return is_attribute_polled(tmp); + } + /** * Get command polling period * @@ -1215,7 +1319,8 @@ public : * @param [in] cmd_name The command name * @return The command polling period */ - virtual int get_command_poll_period(string &cmd_name); + virtual int get_command_poll_period(string &cmd_name); + /** * Get command polling period * @@ -1224,8 +1329,11 @@ public : * @param [in] cmd_name The command name * @return The command polling period */ - virtual int get_command_poll_period(const char *cmd_name) - {string tmp(cmd_name);return get_command_poll_period(tmp);} + virtual int get_command_poll_period(const char *cmd_name) { + string tmp(cmd_name); + return get_command_poll_period(tmp); + } + /** * Get attribute polling period * @@ -1234,7 +1342,8 @@ public : * @param [in] att_name The attribute name * @return The attribute polling period */ - virtual int get_attribute_poll_period(string &att_name); + virtual int get_attribute_poll_period(string &att_name); + /** * Get attribute polling period * @@ -1243,8 +1352,11 @@ public : * @param [in] att_name The attribute name * @return The attribute polling period */ - virtual int get_attribute_poll_period(const char *att_name) - {string tmp(att_name);return get_attribute_poll_period(tmp);} + virtual int get_attribute_poll_period(const char *att_name) { + string tmp(att_name); + return get_attribute_poll_period(tmp); + } + /** * Get polling status * @@ -1263,7 +1375,8 @@ public : * * @return The polling status */ - virtual vector *polling_status(); + virtual vector *polling_status(); + /** * Poll a command * @@ -1273,7 +1386,8 @@ public : * @param [in] cmd_name The command name * @param [in] polling_period The polling period */ - virtual void poll_command(string &cmd_name, int polling_period); + virtual void poll_command(string &cmd_name, int polling_period); + /** * Poll a command * @@ -1283,7 +1397,11 @@ public : * @param [in] cmd_name The command name * @param [in] polling_period The polling period */ - virtual void poll_command(const char *cmd_name, int polling_period) {string tmp(cmd_name);poll_command(tmp,polling_period);} + virtual void poll_command(const char *cmd_name, int polling_period) { + string tmp(cmd_name); + poll_command(tmp, polling_period); + } + /** * Poll an attribute * @@ -1293,7 +1411,8 @@ public : * @param [in] att_name The attribute name * @param [in] polling_period The polling period */ - virtual void poll_attribute(string &att_name, int polling_period); + virtual void poll_attribute(string &att_name, int polling_period); + /** * Poll an attribute * @@ -1303,7 +1422,11 @@ public : * @param [in] att_name The attribute name * @param [in] polling_period The polling period */ - virtual void poll_attribute(const char *att_name, int polling_period) {string tmp(att_name);poll_attribute(tmp,polling_period);} + virtual void poll_attribute(const char *att_name, int polling_period) { + string tmp(att_name); + poll_attribute(tmp, polling_period); + } + /** * Stop polling a command * @@ -1311,7 +1434,8 @@ public : * * @param [in] cmd_name The command name */ - virtual void stop_poll_command(string &cmd_name); + virtual void stop_poll_command(string &cmd_name); + /** * Stop polling a command * @@ -1319,7 +1443,11 @@ public : * * @param [in] cmd_name The command name */ - virtual void stop_poll_command(const char *cmd_name) {string tmp(cmd_name);stop_poll_command(tmp);} + virtual void stop_poll_command(const char *cmd_name) { + string tmp(cmd_name); + stop_poll_command(tmp); + } + /** * Stop polling an attribute * @@ -1327,7 +1455,8 @@ public : * * @param [in] att_name The attribute name */ - virtual void stop_poll_attribute(string &att_name); + virtual void stop_poll_attribute(string &att_name); + /** * Stop polling an attribute * @@ -1335,7 +1464,10 @@ public : * * @param [in] att_name The attribute name */ - virtual void stop_poll_attribute(const char *att_name) {string tmp(att_name);stop_poll_attribute(tmp);} + virtual void stop_poll_attribute(const char *att_name) { + string tmp(att_name); + stop_poll_attribute(tmp); + } //@} /** @name Event related methods */ @@ -1363,7 +1495,8 @@ public : * @return The event identifier * @throws EventSystemFailed */ - virtual int subscribe_event(const string &att_name, EventType event, CallBack *cb); + virtual int subscribe_event(const string &att_name, EventType event, CallBack *cb); + /** * Subscribe for event reception with stateless support * @@ -1393,7 +1526,8 @@ public : * @return The event identifier * @throws EventSystemFailed */ - virtual int subscribe_event(const string &att_name, EventType event, CallBack *cb,bool stateless); + virtual int subscribe_event(const string &att_name, EventType event, CallBack *cb, bool stateless); + /** * Subscribe for event reception with event queue * @@ -1417,7 +1551,9 @@ public : * @return The event identifier * @throws EventSystemFailed */ - virtual int subscribe_event(const string &att_name, EventType event, int event_queue_size,bool stateless = false); + virtual int + subscribe_event(const string &att_name, EventType event, int event_queue_size, bool stateless = false); + /** * Subscribe for device event reception with stateless support * @@ -1442,7 +1578,7 @@ public : * @return The event identifier * @throws EventSystemFailed */ - virtual int subscribe_event(EventType event,CallBack *cb,bool stateless = false); + virtual int subscribe_event(EventType event, CallBack *cb, bool stateless = false); /** * Subscribe for device event reception with stateless support and event queue @@ -1470,7 +1606,8 @@ public : * @return The event identifier * @throws EventSystemFailed */ - virtual int subscribe_event(EventType event,int event_queue_size,bool stateless = false); + virtual int subscribe_event(EventType event, int event_queue_size, bool stateless = false); + /** * Unsubscribe for event reception * @@ -1480,7 +1617,8 @@ public : * @param [in] event_id The event identifier * @throws EventSystemFailed */ - virtual void unsubscribe_event(int event_id); + virtual void unsubscribe_event(int event_id); + /** * Fire event callback in event pull model * @@ -1492,7 +1630,8 @@ public : * @param [in] cb The callback object * @throws EventSystemFailed */ - virtual void get_events (int event_id, CallBack *cb); + virtual void get_events(int event_id, CallBack *cb); + /** * Get arrived events from the event queue in event pull model * @@ -1505,7 +1644,8 @@ public : * @param [out] event_list The event(s) list * @throws EventSystemFailed */ - virtual void get_events (int event_id, EventDataList &event_list); + virtual void get_events(int event_id, EventDataList &event_list); + /** * Get arrived events from event queue in event pull model * @@ -1519,7 +1659,8 @@ public : * @param [out] event_list The event(s) list * @throws EventSystemFailed */ - virtual void get_events (int event_id, AttrConfEventDataList &event_list); + virtual void get_events(int event_id, AttrConfEventDataList &event_list); + /** * Get arrived events from event queue in event pull model * @@ -1533,7 +1674,8 @@ public : * @param [out] event_list The event(s) list * @throws EventSystemFailed */ - virtual void get_events (int event_id, DataReadyEventDataList &event_list); + virtual void get_events(int event_id, DataReadyEventDataList &event_list); + /** * Get arrived events from event queue in event pull model * @@ -1547,7 +1689,8 @@ public : * @param [out] event_list The event(s) list * @throws EventSystemFailed */ - virtual void get_events (int event_id, DevIntrChangeEventDataList &event_list); + virtual void get_events(int event_id, DevIntrChangeEventDataList &event_list); + /** * Get arrived events from event queue in event pull model * @@ -1561,7 +1704,8 @@ public : * @param [out] event_list The event(s) list * @throws EventSystemFailed */ - virtual void get_events (int event_id, PipeEventDataList &event_list); + virtual void get_events(int event_id, PipeEventDataList &event_list); + /** * Get event number in event queue * @@ -1574,7 +1718,8 @@ public : * @return The event number in queue * @throws EventSystemFailed */ - virtual int event_queue_size(int event_id); + virtual int event_queue_size(int event_id); + /** * Get date of the last event in queue * @@ -1587,7 +1732,8 @@ public : * @return The last event date * @throws EventSystemFailed */ - virtual TimeVal get_last_event_date(int event_id); + virtual TimeVal get_last_event_date(int event_id); + /** * Check if the event queue is empty * @@ -1599,7 +1745,7 @@ public : * @return true if the event queue is empty * @throws EventSystemFailed */ - virtual bool is_event_queue_empty(int event_id); + virtual bool is_event_queue_empty(int event_id); //@} /** @name Property related methods */ @@ -1614,7 +1760,8 @@ public : * @param [out] db The property value * @throws NonDbDevice, ConnectionFailed, CommunicationFailed, DevFailed from database device */ - virtual void get_property(string &prop_name, DbData &db); + virtual void get_property(string &prop_name, DbData &db); + /** * Get a list of device properties * @@ -1625,7 +1772,8 @@ public : * @param [out] db The properties values * @throws NonDbDevice, ConnectionFailed, CommunicationFailed, DevFailed from database device */ - virtual void get_property(vector &prop_names, DbData &db); + virtual void get_property(vector &prop_names, DbData &db); + /** * Get property(ies) for a device * @@ -1635,7 +1783,8 @@ public : * @param [in,out] db The property(ies) names and values * @throws NonDbDevice, ConnectionFailed, CommunicationFailed, DevFailed from database device */ - virtual void get_property(DbData &db); + virtual void get_property(DbData &db); + /** * Put property(ies) for a device * @@ -1645,7 +1794,8 @@ public : * @param [in] db The property(ies) names and values * @throws NonDbDevice, ConnectionFailed, CommunicationFailed, DevFailed from database device */ - virtual void put_property(DbData &db); + virtual void put_property(DbData &db); + /** * Delete a single device property * @@ -1654,7 +1804,8 @@ public : * @param [in] prop_name The property name * @throws NonDbDevice, ConnectionFailed, CommunicationFailed, DevFailed from database device */ - virtual void delete_property(string &prop_name); + virtual void delete_property(string &prop_name); + /** * Delete a list of device properties * @@ -1663,7 +1814,8 @@ public : * @param [in] prop_names The property names list * @throws NonDbDevice, ConnectionFailed, CommunicationFailed, DevFailed from database device */ - virtual void delete_property(vector &prop_names); + virtual void delete_property(vector &prop_names); + /** * Delete property(ies) for a device * @@ -1673,7 +1825,8 @@ public : * @param [in] db The property names * @throws NonDbDevice, ConnectionFailed, CommunicationFailed, DevFailed from database device */ - virtual void delete_property(DbData &db); + virtual void delete_property(DbData &db); + /** * Get list of property names for a device * @@ -1685,118 +1838,118 @@ public : * @param [out] prop_list The device property list * @throws NonDbDevice, ConnectionFailed, CommunicationFailed, DevFailed from database device */ - virtual void get_property_list(const string &filter,vector &prop_list); + virtual void get_property_list(const string &filter, vector &prop_list); //@} /** @name Logging related methods */ //@{ #ifdef TANGO_HAS_LOG4TANGO -/** - * Add a logging target to the device - * - * Adds a new logging target to the device. The target_type_name input parameter must follow the - * format: @b target_type::target_name. Supported target types are: - * @li console - * @li file - * @li device - * - * For a device target, - * the target_name part of the target_type_target_name parameter must contain the name of a log consumer - * device (as defined in A.8). For a file target, target_name is the full path to the file to log to. If omitted, the - * device’s name is used to build the file name (which is something like domain_family_member.log). Finally, - * the target_name part of the target_type_target_name input parameter is ignored in case of a console target - * and can be omitted. - * - * @param [in] target_type_name The target type and name - * @throws DevFailed from device - */ - virtual void add_logging_target(const string &target_type_name); -/** - * Add a logging target to the device - * - * Adds a new logging target to the device. The target_type_name input parameter must follow the - * format: @b target_type::target_name. Supported target types are: - * @li console - * @li file - * @li device - * - * For a device target, - * the target_name part of the target_type_target_name parameter must contain the name of a log consumer - * device (as defined in A.8). For a file target, target_name is the full path to the file to log to. If omitted, the - * device’s name is used to build the file name (which is something like domain_family_member.log). Finally, - * the target_name part of the target_type_target_name input parameter is ignored in case of a console target - * and can be omitted. - * - * @param [in] target_type_name The target type and name - * @throws DevFailed from device - */ - virtual void add_logging_target(const char *target_type_name) - {add_logging_target(string(target_type_name));} -/** - * Remove a logging target from the device - * - * Removes a logging target from the device’s target list. The target_type_name input parameter must - * follow the format: target_type::target_name. Supported target types are: - * @li console - * @li file - * @li device - * - * For a - * device target, the target_name part of the target_type_target_name parameter must contain the name of a - * log consumer device (as defined in ). For a file target, target_name is the full path to the file to remove. If - * omitted, the default log file is removed. Finally, the target_name part of the target_type_target_name input - * parameter is ignored in case of a console target and can be omitted. - * If target_name is set to "*", all targets of the specified target_type are removed. - * - * @param [in] target_type_name The target type and name - */ - virtual void remove_logging_target(const string &target_type_name); -/** - * Remove a logging target from the device - * - * Removes a logging target from the device’s target list. The target_type_name input parameter must - * follow the format: target_type::target_name. Supported target types are: - * @li console - * @li file - * @li device - * - * For a - * device target, the target_name part of the target_type_target_name parameter must contain the name of a - * log consumer device (as defined in ). For a file target, target_name is the full path to the file to remove. If - * omitted, the default log file is removed. Finally, the target_name part of the target_type_target_name input - * parameter is ignored in case of a console target and can be omitted. - * If target_name is set to "*", all targets of the specified target_type are removed. - * - * @param [in] target_type_name The target type and name - */ - virtual void remove_logging_target(const char *target_type_name) - {remove_logging_target(string(target_type_name));} -/** - * Get current device's logging targets - * - * Returns a vector of string containing the current device’s logging targets. Each vector element has the - * following format: target_type::target_name. An empty vector is returned is the device has no logging - * targets. - * - * @return List of loggin target - */ - virtual vector get_logging_target (void); -/** - * Get current device's logging level - * - * Returns the current device’s logging level (0=OFF, 1=FATAL, 2=ERROR, 3=WARNING, 4=INFO, 5=DEBUG). - * - * @return The device logging level - */ - virtual int get_logging_level (void); -/** - * Set the device logging level - * - * Changes the device’s logging level. (0=OFF, 1=FATAL, 2=ERROR, 3=WARNING, 4=INFO, 5=DEBUG). - * - * @param [in] level The new device logging level - */ - virtual void set_logging_level (int level); + /** + * Add a logging target to the device + * + * Adds a new logging target to the device. The target_type_name input parameter must follow the + * format: @b target_type::target_name. Supported target types are: + * @li console + * @li file + * @li device + * + * For a device target, + * the target_name part of the target_type_target_name parameter must contain the name of a log consumer + * device (as defined in A.8). For a file target, target_name is the full path to the file to log to. If omitted, the + * device’s name is used to build the file name (which is something like domain_family_member.log). Finally, + * the target_name part of the target_type_target_name input parameter is ignored in case of a console target + * and can be omitted. + * + * @param [in] target_type_name The target type and name + * @throws DevFailed from device + */ + virtual void add_logging_target(const string &target_type_name); + /** + * Add a logging target to the device + * + * Adds a new logging target to the device. The target_type_name input parameter must follow the + * format: @b target_type::target_name. Supported target types are: + * @li console + * @li file + * @li device + * + * For a device target, + * the target_name part of the target_type_target_name parameter must contain the name of a log consumer + * device (as defined in A.8). For a file target, target_name is the full path to the file to log to. If omitted, the + * device’s name is used to build the file name (which is something like domain_family_member.log). Finally, + * the target_name part of the target_type_target_name input parameter is ignored in case of a console target + * and can be omitted. + * + * @param [in] target_type_name The target type and name + * @throws DevFailed from device + */ + virtual void add_logging_target(const char *target_type_name) + {add_logging_target(string(target_type_name));} + /** + * Remove a logging target from the device + * + * Removes a logging target from the device’s target list. The target_type_name input parameter must + * follow the format: target_type::target_name. Supported target types are: + * @li console + * @li file + * @li device + * + * For a + * device target, the target_name part of the target_type_target_name parameter must contain the name of a + * log consumer device (as defined in ). For a file target, target_name is the full path to the file to remove. If + * omitted, the default log file is removed. Finally, the target_name part of the target_type_target_name input + * parameter is ignored in case of a console target and can be omitted. + * If target_name is set to "*", all targets of the specified target_type are removed. + * + * @param [in] target_type_name The target type and name + */ + virtual void remove_logging_target(const string &target_type_name); + /** + * Remove a logging target from the device + * + * Removes a logging target from the device’s target list. The target_type_name input parameter must + * follow the format: target_type::target_name. Supported target types are: + * @li console + * @li file + * @li device + * + * For a + * device target, the target_name part of the target_type_target_name parameter must contain the name of a + * log consumer device (as defined in ). For a file target, target_name is the full path to the file to remove. If + * omitted, the default log file is removed. Finally, the target_name part of the target_type_target_name input + * parameter is ignored in case of a console target and can be omitted. + * If target_name is set to "*", all targets of the specified target_type are removed. + * + * @param [in] target_type_name The target type and name + */ + virtual void remove_logging_target(const char *target_type_name) + {remove_logging_target(string(target_type_name));} + /** + * Get current device's logging targets + * + * Returns a vector of string containing the current device’s logging targets. Each vector element has the + * following format: target_type::target_name. An empty vector is returned is the device has no logging + * targets. + * + * @return List of loggin target + */ + virtual vector get_logging_target (void); + /** + * Get current device's logging level + * + * Returns the current device’s logging level (0=OFF, 1=FATAL, 2=ERROR, 3=WARNING, 4=INFO, 5=DEBUG). + * + * @return The device logging level + */ + virtual int get_logging_level (void); + /** + * Set the device logging level + * + * Changes the device’s logging level. (0=OFF, 1=FATAL, 2=ERROR, 3=WARNING, 4=INFO, 5=DEBUG). + * + * @param [in] level The new device logging level + */ + virtual void set_logging_level (int level); #endif // TANGO_HAS_LOG4TANGO //@} @@ -1831,7 +1984,8 @@ public : * * @param [in] lock_validity The lock validity (in seconds) */ - virtual void lock(int lock_validity=DEFAULT_LOCK_VALIDITY); + virtual void lock(int lock_validity = DEFAULT_LOCK_VALIDITY); + /** * Unlock a device * @@ -1842,7 +1996,8 @@ public : * * @param [in] force The force unlock flag */ - virtual void unlock(bool force=false); + virtual void unlock(bool force = false); + /** * Get device locking status * @@ -1855,7 +2010,8 @@ public : * * @return The device locking status */ - virtual string locking_status(); + virtual string locking_status(); + /** * Check if the device is locked * @@ -1863,7 +2019,8 @@ public : * * @return The device locked flag */ - virtual bool is_locked(); + virtual bool is_locked(); + /** * Check if the device is locked by the caller * @@ -1872,7 +2029,8 @@ public : * * @return The device locked flag */ - virtual bool is_locked_by_me(); + virtual bool is_locked_by_me(); + /** * Get device locking information * @@ -1904,35 +2062,40 @@ public : * @param [out] li Device locking information * @return The device locked flag */ - virtual bool get_locker(LockerInfo &li); + virtual bool get_locker(LockerInfo &li); //@} /// @privatesection - virtual void parse_name(string &); - virtual Database *get_device_db(); + virtual void parse_name(string &); + + virtual Database *get_device_db(); - DeviceProxy *get_adm_device() {return adm_device;} + DeviceProxy *get_adm_device() { return adm_device; } // // attribute methods // - void read_attribute(const string &,AttributeValue_4 *&); - void read_attribute(const string &,AttributeValue_5 *&); - void read_attribute(const char *,DeviceAttribute &); - void read_attribute(string &at,DeviceAttribute &da) {read_attribute(at.c_str(),da);} + void read_attribute(const string &, AttributeValue_4 *&); + + void read_attribute(const string &, AttributeValue_5 *&); + + void read_attribute(const char *, DeviceAttribute &); + + void read_attribute(string &at, DeviceAttribute &da) { read_attribute(at.c_str(), da); } // // Old event methods // - virtual int subscribe_event(const string &attr_name, EventType event, CallBack *, - const vector &filters); // For compatibility with Tango < 8 - virtual int subscribe_event(const string &attr_name, EventType event, CallBack *, - const vector &filters, bool stateless); // For compatibility with Tango < 8 - virtual int subscribe_event(const string &attr_name, EventType event, int event_queue_size, - const vector &filters, bool stateless = false); // For compatibility with Tango < 8 - -}; + virtual int subscribe_event(const string &attr_name, EventType event, CallBack *, + const vector &filters); // For compatibility with Tango < 8 + virtual int subscribe_event(const string &attr_name, EventType event, CallBack *, + const vector &filters, bool stateless); // For compatibility with Tango < 8 + virtual int subscribe_event(const string &attr_name, EventType event, int event_queue_size, + const vector &filters, + bool stateless = false); // For compatibility with Tango < 8 + }; +}//Tango #endif /* _DEVICEPROXY_H */ diff --git a/cppapi/client/accessproxy.h b/include/tango/client/accessproxy.h similarity index 100% rename from cppapi/client/accessproxy.h rename to include/tango/client/accessproxy.h diff --git a/cppapi/client/api_util.tpp b/include/tango/client/api_util.tpp similarity index 86% rename from cppapi/client/api_util.tpp rename to include/tango/client/api_util.tpp index 75a5e9fc2..eb9092495 100644 --- a/cppapi/client/api_util.tpp +++ b/include/tango/client/api_util.tpp @@ -45,21 +45,21 @@ template inline void ApiUtil::attr_to_device_base(const T *attr_value,DeviceAttribute *dev_attr) { - CORBA::Long *tmp_lo; - CORBA::Short *tmp_sh; - CORBA::Double *tmp_db; + DevLong *tmp_lo; + DevShort *tmp_sh; + DevDouble *tmp_db; char **tmp_str; - CORBA::Float *tmp_fl; - CORBA::Boolean *tmp_boo; - CORBA::UShort *tmp_ush; - CORBA::Octet *tmp_uch; - CORBA::LongLong *tmp_lolo; - CORBA::ULong *tmp_ulo; - CORBA::ULongLong *tmp_ulolo; + DevFloat *tmp_fl; + DevBoolean *tmp_boo; + DevUShort *tmp_ush; + DevUChar *tmp_uch; + DevLong64 *tmp_lolo; + DevULong *tmp_ulo; + DevULong64 *tmp_ulolo; Tango::DevState *tmp_state; Tango::DevEncoded *tmp_enc; - CORBA::ULong max,len; + DevULong max,len; dev_attr->name = attr_value->name; dev_attr->quality = attr_value->quality; @@ -82,12 +82,12 @@ inline void ApiUtil::attr_to_device_base(const T *attr_value,DeviceAttribute *de len = tmp_seq.length(); if (tmp_seq.release() == true) { - tmp_boo = (const_cast(tmp_seq)).get_buffer((CORBA::Boolean)true); + tmp_boo = (const_cast(tmp_seq)).get_buffer((DevBoolean)true); dev_attr->BooleanSeq = new DevVarBooleanArray(max,len,tmp_boo,true); } else { - tmp_boo = const_cast(tmp_seq.get_buffer()); + tmp_boo = const_cast(tmp_seq.get_buffer()); dev_attr->BooleanSeq = new DevVarBooleanArray(max,len,tmp_boo,false); } } @@ -100,12 +100,12 @@ inline void ApiUtil::attr_to_device_base(const T *attr_value,DeviceAttribute *de len = tmp_seq.length(); if (tmp_seq.release() == true) { - tmp_sh = (const_cast(tmp_seq)).get_buffer((CORBA::Boolean)true); + tmp_sh = (const_cast(tmp_seq)).get_buffer((DevBoolean)true); dev_attr->ShortSeq = new DevVarShortArray(max,len,tmp_sh,true); } else { - tmp_sh = const_cast(tmp_seq.get_buffer()); + tmp_sh = const_cast(tmp_seq.get_buffer()); dev_attr->ShortSeq = new DevVarShortArray(max,len,tmp_sh,false); } } @@ -118,12 +118,12 @@ inline void ApiUtil::attr_to_device_base(const T *attr_value,DeviceAttribute *de len = tmp_seq.length(); if (tmp_seq.release() == true) { - tmp_lo = (const_cast(tmp_seq)).get_buffer((CORBA::Boolean)true); + tmp_lo = (const_cast(tmp_seq)).get_buffer((DevBoolean)true); dev_attr->LongSeq = new DevVarLongArray(max,len,tmp_lo,true); } else { - tmp_lo = const_cast(tmp_seq.get_buffer()); + tmp_lo = const_cast(tmp_seq.get_buffer()); dev_attr->LongSeq = new DevVarLongArray(max,len,tmp_lo,false); } } @@ -136,12 +136,12 @@ inline void ApiUtil::attr_to_device_base(const T *attr_value,DeviceAttribute *de len = tmp_seq.length(); if (tmp_seq.release() == true) { - tmp_lolo = (const_cast(tmp_seq)).get_buffer((CORBA::Boolean)true); + tmp_lolo = (const_cast(tmp_seq)).get_buffer((DevBoolean)true); dev_attr->Long64Seq = new DevVarLong64Array(max,len,tmp_lolo,true); } else { - tmp_lolo = const_cast(tmp_seq.get_buffer()); + tmp_lolo = const_cast(tmp_seq.get_buffer()); dev_attr->Long64Seq = new DevVarLong64Array(max,len,tmp_lolo,false); } } @@ -154,12 +154,12 @@ inline void ApiUtil::attr_to_device_base(const T *attr_value,DeviceAttribute *de len = tmp_seq.length(); if (tmp_seq.release() == true) { - tmp_fl = (const_cast(tmp_seq)).get_buffer((CORBA::Boolean)true); + tmp_fl = (const_cast(tmp_seq)).get_buffer((DevBoolean)true); dev_attr->FloatSeq = new DevVarFloatArray(max,len,tmp_fl,true); } else { - tmp_fl = const_cast(tmp_seq.get_buffer()); + tmp_fl = const_cast(tmp_seq.get_buffer()); dev_attr->FloatSeq = new DevVarFloatArray(max,len,tmp_fl,false); } } @@ -172,12 +172,12 @@ inline void ApiUtil::attr_to_device_base(const T *attr_value,DeviceAttribute *de len = tmp_seq.length(); if (tmp_seq.release() == true) { - tmp_db = (const_cast(tmp_seq)).get_buffer((CORBA::Boolean)true); + tmp_db = (const_cast(tmp_seq)).get_buffer((DevBoolean)true); dev_attr->DoubleSeq = new DevVarDoubleArray(max,len,tmp_db,true); } else { - tmp_db = const_cast(tmp_seq.get_buffer()); + tmp_db = const_cast(tmp_seq.get_buffer()); dev_attr->DoubleSeq = new DevVarDoubleArray(max,len,tmp_db,false); } } @@ -190,12 +190,12 @@ inline void ApiUtil::attr_to_device_base(const T *attr_value,DeviceAttribute *de len = tmp_seq.length(); if (tmp_seq.release() == true) { - tmp_uch = (const_cast(tmp_seq)).get_buffer((CORBA::Boolean)true); + tmp_uch = (const_cast(tmp_seq)).get_buffer((DevBoolean)true); dev_attr->UCharSeq = new DevVarCharArray(max,len,tmp_uch,true); } else { - tmp_uch = const_cast(tmp_seq.get_buffer()); + tmp_uch = const_cast(tmp_seq.get_buffer()); dev_attr->UCharSeq = new DevVarCharArray(max,len,tmp_uch,false); } } @@ -208,12 +208,12 @@ inline void ApiUtil::attr_to_device_base(const T *attr_value,DeviceAttribute *de len = tmp_seq.length(); if (tmp_seq.release() == true) { - tmp_ush = (const_cast(tmp_seq)).get_buffer((CORBA::Boolean)true); + tmp_ush = (const_cast(tmp_seq)).get_buffer((DevBoolean)true); dev_attr->UShortSeq = new DevVarUShortArray(max,len,tmp_ush,true); } else { - tmp_ush = const_cast(tmp_seq.get_buffer()); + tmp_ush = const_cast(tmp_seq.get_buffer()); dev_attr->UShortSeq = new DevVarUShortArray(max,len,tmp_ush,false); } } @@ -226,12 +226,12 @@ inline void ApiUtil::attr_to_device_base(const T *attr_value,DeviceAttribute *de len = tmp_seq.length(); if (tmp_seq.release() == true) { - tmp_ulo = (const_cast(tmp_seq)).get_buffer((CORBA::Boolean)true); + tmp_ulo = (const_cast(tmp_seq)).get_buffer((DevBoolean)true); dev_attr->ULongSeq = new DevVarULongArray(max,len,tmp_ulo,true); } else { - tmp_ulo = const_cast(tmp_seq.get_buffer()); + tmp_ulo = const_cast(tmp_seq.get_buffer()); dev_attr->ULongSeq = new DevVarULongArray(max,len,tmp_ulo,false); } } @@ -244,12 +244,12 @@ inline void ApiUtil::attr_to_device_base(const T *attr_value,DeviceAttribute *de len = tmp_seq.length(); if (tmp_seq.release() == true) { - tmp_ulolo = (const_cast(tmp_seq)).get_buffer((CORBA::Boolean)true); + tmp_ulolo = (const_cast(tmp_seq)).get_buffer((DevBoolean)true); dev_attr->ULong64Seq = new DevVarULong64Array(max,len,tmp_ulolo,true); } else { - tmp_ulolo = const_cast(tmp_seq.get_buffer()); + tmp_ulolo = const_cast(tmp_seq.get_buffer()); dev_attr->ULong64Seq = new DevVarULong64Array(max,len,tmp_ulolo,false); } } @@ -262,7 +262,7 @@ inline void ApiUtil::attr_to_device_base(const T *attr_value,DeviceAttribute *de len = tmp_seq.length(); if (tmp_seq.release() == true) { - tmp_str = (const_cast(tmp_seq)).get_buffer((CORBA::Boolean)true); + tmp_str = (const_cast(tmp_seq)).get_buffer((DevBoolean)true); dev_attr->StringSeq = new DevVarStringArray(max,len,tmp_str,true); } else @@ -280,7 +280,7 @@ inline void ApiUtil::attr_to_device_base(const T *attr_value,DeviceAttribute *de len = tmp_seq.length(); if (tmp_seq.release() == true) { - tmp_state = (const_cast(tmp_seq)).get_buffer((CORBA::Boolean)true); + tmp_state = (const_cast(tmp_seq)).get_buffer((DevBoolean)true); dev_attr->StateSeq = new DevVarStateArray(max,len,tmp_state,true); } else @@ -305,7 +305,7 @@ inline void ApiUtil::attr_to_device_base(const T *attr_value,DeviceAttribute *de len = tmp_seq.length(); if (tmp_seq.release() == true) { - tmp_enc = (const_cast(tmp_seq)).get_buffer((CORBA::Boolean)true); + tmp_enc = (const_cast(tmp_seq)).get_buffer((DevBoolean)true); dev_attr->EncodedSeq = new DevVarEncodedArray(max,len,tmp_enc,true); } else diff --git a/cppapi/client/apiexcept.h b/include/tango/client/apiexcept.h similarity index 78% rename from cppapi/client/apiexcept.h rename to include/tango/client/apiexcept.h index 51ed48c35..56227dfe9 100644 --- a/cppapi/client/apiexcept.h +++ b/include/tango/client/apiexcept.h @@ -26,7 +26,7 @@ #ifndef _APIEXCEPT_H #define _APIEXCEPT_H -#include +#include #include using namespace std; @@ -125,10 +125,10 @@ public: \ {\ Tango::DevErrorList errors(1);\ errors.length(1);\ - errors[0].desc = CORBA::string_dup(desc.c_str()); \ + errors[0].desc = Tango::string_dup(desc.c_str()); \ errors[0].severity = sever; \ - errors[0].reason = CORBA::string_dup(reason);\ - errors[0].origin = CORBA::string_dup(origin);\ + errors[0].reason = Tango::string_dup(reason);\ + errors[0].origin = Tango::string_dup(origin);\ throw Tango::E(errors);\ }\ \ @@ -137,10 +137,10 @@ public: \ {\ Tango::DevErrorList errors(1);\ errors.length(1);\ - errors[0].desc = CORBA::string_dup(desc);\ + errors[0].desc = Tango::string_dup(desc);\ errors[0].severity = sever;\ - errors[0].reason = CORBA::string_dup(reason);\ - errors[0].origin = CORBA::string_dup(origin);\ + errors[0].reason = Tango::string_dup(reason);\ + errors[0].origin = Tango::string_dup(origin);\ delete[] desc;\ throw Tango::E(errors);\ }\ @@ -150,10 +150,10 @@ public: \ {\ Tango::DevErrorList errors(1);\ errors.length(1);\ - errors[0].desc = CORBA::string_dup(desc);\ + errors[0].desc = Tango::string_dup(desc);\ errors[0].severity = sever;\ - errors[0].reason = CORBA::string_dup(reason);\ - errors[0].origin = CORBA::string_dup(origin);\ + errors[0].reason = Tango::string_dup(reason);\ + errors[0].origin = Tango::string_dup(origin);\ throw Tango::E(errors);\ }\ \ @@ -166,15 +166,15 @@ public: \ errors.length(2);\ Tango::Except::the_mutex.lock(); \ char *tmp = Tango::Except::print_CORBA_SystemException(&cex);\ - errors[0].desc = CORBA::string_dup(tmp);\ + errors[0].desc = Tango::string_dup(tmp);\ Tango::Except::the_mutex.unlock(); \ errors[0].severity = sever;\ - errors[0].reason = CORBA::string_dup("API_CorbaException");\ - errors[0].origin = CORBA::string_dup(origin);\ - errors[1].desc = CORBA::string_dup(desc.c_str());\ + errors[0].reason = Tango::string_dup("API_CorbaException");\ + errors[0].origin = Tango::string_dup(origin);\ + errors[1].desc = Tango::string_dup(desc.c_str());\ errors[1].severity = sever;\ - errors[1].reason = CORBA::string_dup(reason.c_str());\ - errors[1].origin = CORBA::string_dup(origin);\ + errors[1].reason = Tango::string_dup(reason.c_str());\ + errors[1].origin = Tango::string_dup(origin);\ throw Tango::E(errors);\ }\ \ @@ -187,15 +187,15 @@ public: \ errors.length(2);\ Tango::Except::the_mutex.lock(); \ char *tmp = Tango::Except::print_CORBA_SystemException(&cex);\ - errors[0].desc = CORBA::string_dup(tmp);\ + errors[0].desc = Tango::string_dup(tmp);\ Tango::Except::the_mutex.unlock(); \ errors[0].severity = sever;\ - errors[0].reason = CORBA::string_dup("API_CorbaException");\ - errors[0].origin = CORBA::string_dup(origin);\ - errors[1].desc = CORBA::string_dup(desc);\ + errors[0].reason = Tango::string_dup("API_CorbaException");\ + errors[0].origin = Tango::string_dup(origin);\ + errors[1].desc = Tango::string_dup(desc);\ errors[1].severity = sever;\ - errors[1].reason = CORBA::string_dup(reason);\ - errors[1].origin = CORBA::string_dup(origin);\ + errors[1].reason = Tango::string_dup(reason);\ + errors[1].origin = Tango::string_dup(origin);\ delete[] desc;\ delete[] reason;\ throw Tango::E(errors);\ @@ -209,15 +209,15 @@ public: \ errors.length(2);\ Tango::Except::the_mutex.lock(); \ char *tmp = Tango::Except::print_CORBA_SystemException(&cex);\ - errors[0].desc = CORBA::string_dup(tmp);\ + errors[0].desc = Tango::string_dup(tmp);\ Tango::Except::the_mutex.unlock(); \ errors[0].severity = sever;\ - errors[0].reason = CORBA::string_dup("API_CorbaException");\ - errors[0].origin = CORBA::string_dup(origin);\ - errors[1].desc = CORBA::string_dup(desc.c_str());\ + errors[0].reason = Tango::string_dup("API_CorbaException");\ + errors[0].origin = Tango::string_dup(origin);\ + errors[1].desc = Tango::string_dup(desc.c_str());\ errors[1].severity = sever;\ - errors[1].reason = CORBA::string_dup(reason);\ - errors[1].origin = CORBA::string_dup(origin);\ + errors[1].reason = Tango::string_dup(reason);\ + errors[1].origin = Tango::string_dup(origin);\ throw Tango::E(errors);\ }\ static inline void re_throw_exception(CORBA::SystemException &cex,\ @@ -229,15 +229,15 @@ public: \ errors.length(2);\ Tango::Except::the_mutex.lock(); \ char *tmp = Tango::Except::print_CORBA_SystemException(&cex);\ - errors[0].desc = CORBA::string_dup(tmp);\ + errors[0].desc = Tango::string_dup(tmp);\ Tango::Except::the_mutex.unlock(); \ errors[0].severity = sever;\ - errors[0].reason = CORBA::string_dup("API_CorbaException");\ - errors[0].origin = CORBA::string_dup(origin.c_str());\ - errors[1].desc = CORBA::string_dup(desc.c_str());\ + errors[0].reason = Tango::string_dup("API_CorbaException");\ + errors[0].origin = Tango::string_dup(origin.c_str());\ + errors[1].desc = Tango::string_dup(desc.c_str());\ errors[1].severity = sever;\ - errors[1].reason = CORBA::string_dup(reason);\ - errors[1].origin = CORBA::string_dup(origin.c_str());\ + errors[1].reason = Tango::string_dup(reason);\ + errors[1].origin = Tango::string_dup(origin.c_str());\ throw Tango::E(errors);\ }\ \ @@ -250,15 +250,15 @@ public: \ errors.length(2);\ Tango::Except::the_mutex.lock(); \ char *tmp = Tango::Except::print_CORBA_SystemException(&cex);\ - errors[0].desc = CORBA::string_dup(tmp);\ + errors[0].desc = Tango::string_dup(tmp);\ Tango::Except::the_mutex.unlock(); \ errors[0].severity = sever;\ - errors[0].reason = CORBA::string_dup("API_CorbaException");\ - errors[0].origin = CORBA::string_dup(origin);\ - errors[1].desc = CORBA::string_dup(desc);\ + errors[0].reason = Tango::string_dup("API_CorbaException");\ + errors[0].origin = Tango::string_dup(origin);\ + errors[1].desc = Tango::string_dup(desc);\ errors[1].severity = sever;\ - errors[1].reason = CORBA::string_dup(reason);\ - errors[1].origin = CORBA::string_dup(origin);\ + errors[1].reason = Tango::string_dup(reason);\ + errors[1].origin = Tango::string_dup(origin);\ delete[] desc;\ throw Tango::E(errors);\ }\ @@ -271,10 +271,10 @@ public: \ long nb_err = ex.errors.length();\ ex.errors.length(nb_err + 1);\ ex.errors[nb_err].severity = sever;\ - ex.errors[nb_err].desc = CORBA::string_dup(desc);\ + ex.errors[nb_err].desc = Tango::string_dup(desc);\ delete[] desc;\ - ex.errors[nb_err].origin = CORBA::string_dup(origin);\ - ex.errors[nb_err].reason = CORBA::string_dup(reason);\ + ex.errors[nb_err].origin = Tango::string_dup(origin);\ + ex.errors[nb_err].reason = Tango::string_dup(reason);\ throw ex;\ }\ \ @@ -286,9 +286,9 @@ public: \ long nb_err = ex.errors.length();\ ex.errors.length(nb_err + 1);\ ex.errors[nb_err].severity = sever;\ - ex.errors[nb_err].desc = CORBA::string_dup(desc.c_str());\ - ex.errors[nb_err].origin = CORBA::string_dup(origin);\ - ex.errors[nb_err].reason = CORBA::string_dup(reason);\ + ex.errors[nb_err].desc = Tango::string_dup(desc.c_str());\ + ex.errors[nb_err].origin = Tango::string_dup(origin);\ + ex.errors[nb_err].reason = Tango::string_dup(reason);\ throw ex;\ }\ static inline void re_throw_exception(Tango::DevFailed &ex,\ @@ -299,10 +299,10 @@ public: \ long nb_err = ex.errors.length();\ ex.errors.length(nb_err + 1);\ ex.errors[nb_err].severity = sever;\ - ex.errors[nb_err].desc = CORBA::string_dup(desc);\ + ex.errors[nb_err].desc = Tango::string_dup(desc);\ delete[] desc;\ - ex.errors[nb_err].origin = CORBA::string_dup(origin);\ - ex.errors[nb_err].reason = CORBA::string_dup(reason);\ + ex.errors[nb_err].origin = Tango::string_dup(origin);\ + ex.errors[nb_err].reason = Tango::string_dup(reason);\ throw ex;\ }\ \ @@ -314,9 +314,9 @@ public: \ long nb_err = ex.errors.length();\ ex.errors.length(nb_err + 1);\ ex.errors[nb_err].severity = sever;\ - ex.errors[nb_err].desc = CORBA::string_dup(desc.c_str());\ - ex.errors[nb_err].origin = CORBA::string_dup(origin);\ - ex.errors[nb_err].reason = CORBA::string_dup(reason);\ + ex.errors[nb_err].desc = Tango::string_dup(desc.c_str());\ + ex.errors[nb_err].origin = Tango::string_dup(origin);\ + ex.errors[nb_err].reason = Tango::string_dup(reason);\ throw ex;\ }\ static inline void re_throw_exception(Tango::DevFailed &ex,\ @@ -327,9 +327,9 @@ public: \ long nb_err = ex.errors.length();\ ex.errors.length(nb_err + 1);\ ex.errors[nb_err].severity = sever;\ - ex.errors[nb_err].desc = CORBA::string_dup(desc);\ - ex.errors[nb_err].origin = CORBA::string_dup(origin);\ - ex.errors[nb_err].reason = CORBA::string_dup(reason);\ + ex.errors[nb_err].desc = Tango::string_dup(desc);\ + ex.errors[nb_err].origin = Tango::string_dup(origin);\ + ex.errors[nb_err].reason = Tango::string_dup(reason);\ throw ex;\ }\ \ @@ -340,14 +340,14 @@ public: \ {\ Tango::DevErrorList errors(2);\ errors.length(2);\ - errors[0].desc = CORBA::string_dup(CORBA_error_desc);\ + errors[0].desc = Tango::string_dup(CORBA_error_desc);\ errors[0].severity = sever;\ - errors[0].reason = CORBA::string_dup("API_CorbaException");\ - errors[0].origin = CORBA::string_dup(origin);\ - errors[1].desc = CORBA::string_dup(desc);\ + errors[0].reason = Tango::string_dup("API_CorbaException");\ + errors[0].origin = Tango::string_dup(origin);\ + errors[1].desc = Tango::string_dup(desc);\ errors[1].severity = sever;\ - errors[1].reason = CORBA::string_dup(reason);\ - errors[1].origin = CORBA::string_dup(origin);\ + errors[1].reason = Tango::string_dup(reason);\ + errors[1].origin = Tango::string_dup(origin);\ delete[] desc;\ throw Tango::E(errors);\ }\ @@ -359,14 +359,14 @@ public: \ {\ Tango::DevErrorList errors(2);\ errors.length(2);\ - errors[0].desc = CORBA::string_dup(CORBA_error_desc);\ + errors[0].desc = Tango::string_dup(CORBA_error_desc);\ errors[0].severity = sever;\ - errors[0].reason = CORBA::string_dup("API_CorbaException");\ - errors[0].origin = CORBA::string_dup(origin);\ - errors[1].desc = CORBA::string_dup(desc.c_str());\ + errors[0].reason = Tango::string_dup("API_CorbaException");\ + errors[0].origin = Tango::string_dup(origin);\ + errors[1].desc = Tango::string_dup(desc.c_str());\ errors[1].severity = sever;\ - errors[1].reason = CORBA::string_dup(reason);\ - errors[1].origin = CORBA::string_dup(origin);\ + errors[1].reason = Tango::string_dup(reason);\ + errors[1].origin = Tango::string_dup(origin);\ throw Tango::E(errors);\ }\ }; diff --git a/cppapi/client/cbthread.h b/include/tango/client/cbthread.h similarity index 100% rename from cppapi/client/cbthread.h rename to include/tango/client/cbthread.h diff --git a/cppapi/client/dbapi.h b/include/tango/client/dbapi.h similarity index 98% rename from cppapi/client/dbapi.h rename to include/tango/client/dbapi.h index fa6b57d53..779f63c23 100644 --- a/cppapi/client/dbapi.h +++ b/include/tango/client/dbapi.h @@ -29,7 +29,7 @@ #include #include -#include +#include /** @defgroup DBase Database Client classes * @ingroup Client @@ -43,31 +43,40 @@ namespace Tango { /// forward declarations /// -class DbDatum; -class DbDevInfo; -class DbDevImportInfo; -class DbDevExportInfo; -class DbServerInfo; -class DbDevFullInfo; -class DbHistory; + class DbDatum; -class FileDatabase; -class DbServerCache; -class Util; -class AccessProxy; + class DbDevInfo; + + class DbDevImportInfo; + + class DbDevExportInfo; + + class DbServerInfo; + + class DbDevFullInfo; + + class DbHistory; + + class FileDatabase; + + class DbServerCache; + + class Util; + + class AccessProxy; /// /// Some typedef and define /// -typedef vector DbDevInfos; -typedef vector DbDevExportInfos; -typedef vector DbDevImportInfos; -typedef vector DbData; - -#define POGO_DESC "Description" -#define POGO_TITLE "ProjectTitle" + typedef vector DbDevInfos; + typedef vector DbDevExportInfos; + typedef vector DbDevImportInfos; + typedef vector DbData; +#define POGO_DESC "Description" +#define POGO_TITLE "ProjectTitle" +} /// /// Classes declaration /// @@ -90,7 +99,7 @@ typedef vector DbData; #include "DbDevice.h" - +namespace Tango { /********************************************************************** * * * DbProperty - A database object for accessing general properties * diff --git a/cppapi/client/devapi.h b/include/tango/client/devapi.h similarity index 65% rename from cppapi/client/devapi.h rename to include/tango/client/devapi.h index a32d75bce..de0d4a9e7 100644 --- a/cppapi/client/devapi.h +++ b/include/tango/client/devapi.h @@ -29,18 +29,17 @@ #define _DEVAPI_H #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include using namespace std; -namespace Tango -{ +namespace Tango { /** @defgroup Client Client classes */ @@ -48,46 +47,55 @@ namespace Tango // forward declarations // -class DeviceData; -class DeviceAttribute; -class DbDevice; -class DbAttribute; -class DbDatum; -class DbDevImportInfo; -class Database; -class AsynReq; -class NotifdEventConsumer; -class ZmqEventConsumer; -class CallBack; -class AttributeProxy; -class TangoMonitor; + class DeviceData; + + class DeviceAttribute; + + class DbDevice; + + class DbAttribute; + + class DbDatum; + + class DbDevImportInfo; + + class Database; + + class AsynReq; + + class NotifdEventConsumer; + + class ZmqEventConsumer; + + class CallBack; + + class AttributeProxy; + + class TangoMonitor; // // Some typedef // -typedef vector DbData; + typedef vector DbData; -typedef union -{ - TangoSys_Pid LockerPid; - unsigned long UUID[4]; -}LockerId; + typedef union { + TangoSys_Pid LockerPid; + unsigned long UUID[4]; + } LockerId; -struct LockerInfo -{ - LockerLanguage ll; - LockerId li; - string locker_host; - string locker_class; -}; + struct LockerInfo { + LockerLanguage ll; + LockerId li; + string locker_host; + string locker_class; + }; -struct LockingThread -{ - TangoMonitor *mon; - LockThCmd *shared; - LockThread *l_thread; -}; + struct LockingThread { + TangoMonitor *mon; + LockThCmd *shared; + LockThread *l_thread; + }; /** * Base structure for command information @@ -95,28 +103,27 @@ struct LockingThread * @headerfile tango.h */ #ifdef GEN_DOC -typedef struct DevCommandInfo + typedef struct DevCommandInfo #else -typedef struct _DevCommandInfo + typedef struct _DevCommandInfo #endif -{ - string cmd_name; ///< The command name - long cmd_tag; ///< The command tag - long in_type; ///< Input parameter data type - long out_type; ///< Output parameter data type - string in_type_desc; ///< Input parameter description - string out_type_desc; ///< Ouptput parameter description + { + string cmd_name; ///< The command name + long cmd_tag; ///< The command tag + long in_type; ///< Input parameter data type + long out_type; ///< Output parameter data type + string in_type_desc; ///< Input parameter description + string out_type_desc; ///< Ouptput parameter description ///@privatesection - bool operator==(const _DevCommandInfo &); -}DevCommandInfo; + bool operator==(const _DevCommandInfo &); + } DevCommandInfo; -struct AttributeDimension -{ - long dim_x; - long dim_y; -}; + struct AttributeDimension { + long dim_x; + long dim_y; + }; /** * Command information data extension @@ -125,17 +132,18 @@ struct AttributeDimension * @ingroup Client */ #ifdef GEN_DOC -typedef struct CommandInfo : public DevCommandInfo + typedef struct CommandInfo : public DevCommandInfo #else -typedef struct _CommandInfo : public DevCommandInfo + typedef struct _CommandInfo : public DevCommandInfo #endif -{ - Tango::DispLevel disp_level; ///< The command display level + { + Tango::DispLevel disp_level; ///< The command display level /// @privatesection - friend ostream &operator<<(ostream &,_CommandInfo &); - bool operator==(const _CommandInfo &); -}CommandInfo; + friend ostream &operator<<(ostream &, _CommandInfo &); + + bool operator==(const _CommandInfo &); + } CommandInfo; /** * A vector of CommandInfo structure @@ -143,19 +151,18 @@ typedef struct _CommandInfo : public DevCommandInfo * @headerfile tango.h * @ingroup Client */ -typedef vector CommandInfoList; + typedef vector CommandInfoList; -struct _DeviceInfo -{ - string dev_class; - string server_id; - string server_host; - long server_version; - string doc_url; - string dev_type; -}; + struct _DeviceInfo { + string dev_class; + string server_id; + string server_host; + long server_version; + string doc_url; + string dev_type; + }; -typedef _DeviceInfo DeviceInfo; + typedef _DeviceInfo DeviceInfo; /** * Base structure for Attribute configuration @@ -163,33 +170,33 @@ typedef _DeviceInfo DeviceInfo; * @headerfile tango.h */ #ifdef GEN_DOC -typedef struct DeviceAttributeConfig + typedef struct DeviceAttributeConfig #else -typedef struct _DeviceAttributeConfig + typedef struct _DeviceAttributeConfig #endif -{ - string name; ///< Name - AttrWriteType writable; ///< Writable type (Read, Write,...) - AttrDataFormat data_format; ///< Data format (Scalar, Spectrum,...) - int data_type; ///< Data type - int max_dim_x; ///< Max dim X - int max_dim_y; ///< Max dim Y - string description; ///< Description - string label; ///< Label - string unit; ///< Unit - string standard_unit; ///< Standard unit - string display_unit; ///< Display unit - string format; ///< Format - string min_value; ///< Min value - string max_value; ///< Max value - string min_alarm; ///< Min alarm - string max_alarm; ///< Max alarm - string writable_attr_name; ///< Writable att. name - vector extensions; ///< For future extensions + { + string name; ///< Name + AttrWriteType writable; ///< Writable type (Read, Write,...) + AttrDataFormat data_format; ///< Data format (Scalar, Spectrum,...) + int data_type; ///< Data type + int max_dim_x; ///< Max dim X + int max_dim_y; ///< Max dim Y + string description; ///< Description + string label; ///< Label + string unit; ///< Unit + string standard_unit; ///< Standard unit + string display_unit; ///< Display unit + string format; ///< Format + string min_value; ///< Min value + string max_value; ///< Max value + string min_alarm; ///< Min alarm + string max_alarm; ///< Max alarm + string writable_attr_name; ///< Writable att. name + vector extensions; ///< For future extensions /// @privatesection - bool operator==(const _DeviceAttributeConfig &); -}DeviceAttributeConfig; + bool operator==(const _DeviceAttributeConfig &); + } DeviceAttributeConfig; /** * Attribute configuration data extension @@ -198,17 +205,18 @@ typedef struct _DeviceAttributeConfig * @ingroup Client */ #ifdef GEN_DOC -typedef struct AttributeInfo : public DeviceAttributeConfig + typedef struct AttributeInfo : public DeviceAttributeConfig #else -typedef struct _AttributeInfo : public DeviceAttributeConfig + typedef struct _AttributeInfo : public DeviceAttributeConfig #endif -{ - Tango::DispLevel disp_level; ///< Display level + { + Tango::DispLevel disp_level; ///< Display level /// @privatesection - friend ostream &operator<<(ostream &,_AttributeInfo &); - bool operator==(const _AttributeInfo &); -}AttributeInfo; + friend ostream &operator<<(ostream &, _AttributeInfo &); + + bool operator==(const _AttributeInfo &); + } AttributeInfo; /** * Attribute alarms configuration @@ -217,22 +225,22 @@ typedef struct _AttributeInfo : public DeviceAttributeConfig * @ingroup Client */ #ifdef GEN_DOC -typedef struct AttributeAlarmInfo + typedef struct AttributeAlarmInfo #else -typedef struct _AttributeAlarmInfo + typedef struct _AttributeAlarmInfo #endif -{ - string min_alarm; ///< Min alarm level - string max_alarm; ///< max alarm level - string min_warning; ///< Min warning level - string max_warning; ///< Max warning level - string delta_t; ///< Delta t RDS - string delta_val; ///< Delta val RDS - vector extensions; ///< Future extensions + { + string min_alarm; ///< Min alarm level + string max_alarm; ///< max alarm level + string min_warning; ///< Min warning level + string max_warning; ///< Max warning level + string delta_t; ///< Delta t RDS + string delta_val; ///< Delta val RDS + vector extensions; ///< Future extensions /// @privatesection - bool operator==(const _AttributeAlarmInfo &); -}AttributeAlarmInfo; + bool operator==(const _AttributeAlarmInfo &); + } AttributeAlarmInfo; /** * Attribute change event configuration @@ -241,15 +249,15 @@ typedef struct _AttributeAlarmInfo * @ingroup Client */ #ifdef GEN_DOC -typedef struct ChangeEventInfo + typedef struct ChangeEventInfo #else -typedef struct _ChangeEventInfo + typedef struct _ChangeEventInfo #endif -{ - string rel_change; ///< Relative change threshold - string abs_change; ///< Absolute change threshold - vector extensions; ///< Future extensions -}ChangeEventInfo; + { + string rel_change; ///< Relative change threshold + string abs_change; ///< Absolute change threshold + vector extensions; ///< Future extensions + } ChangeEventInfo; /** * Attribute periodic event configuration @@ -258,14 +266,14 @@ typedef struct _ChangeEventInfo * @ingroup Client */ #ifdef GEN_DOC -typedef struct PeriodicEventInfo + typedef struct PeriodicEventInfo #else -typedef struct _PeriodicEventInfo + typedef struct _PeriodicEventInfo #endif -{ - string period; ///< Event period - vector extensions; ///< Future extensions -}PeriodicEventInfo; + { + string period; ///< Event period + vector extensions; ///< Future extensions + } PeriodicEventInfo; /** * Attribute archive event configuration @@ -274,16 +282,16 @@ typedef struct _PeriodicEventInfo * @ingroup Client */ #ifdef GEN_DOC -typedef struct ArchiveEventInfo + typedef struct ArchiveEventInfo #else -typedef struct _ArchiveEventInfo + typedef struct _ArchiveEventInfo #endif -{ - string archive_rel_change; ///< Archive relative change threshold - string archive_abs_change; ///< Archive abosolute change threshold - string archive_period; ///< Archive event period - vector extensions; ///< Future exetnsions -}ArchiveEventInfo; + { + string archive_rel_change; ///< Archive relative change threshold + string archive_abs_change; ///< Archive abosolute change threshold + string archive_period; ///< Archive event period + vector extensions; ///< Future exetnsions + } ArchiveEventInfo; /** * Attribute event configuration @@ -292,18 +300,18 @@ typedef struct _ArchiveEventInfo * @ingroup Client */ #ifdef GEN_DOC -typedef struct AttributeEventInfo + typedef struct AttributeEventInfo #else -typedef struct _AttributeEventInfo + typedef struct _AttributeEventInfo #endif -{ - ChangeEventInfo ch_event; ///< Attribute change event info - PeriodicEventInfo per_event; ///< Attribute periodic event info - ArchiveEventInfo arch_event; ///< Attribute archive event info + { + ChangeEventInfo ch_event; ///< Attribute change event info + PeriodicEventInfo per_event; ///< Attribute periodic event info + ArchiveEventInfo arch_event; ///< Attribute archive event info /// @privatesection - bool operator==(const _AttributeEventInfo &); -}AttributeEventInfo; + bool operator==(const _AttributeEventInfo &); + } AttributeEventInfo; /** * Possible memorized attribute type @@ -311,13 +319,12 @@ typedef struct _AttributeEventInfo * @ingroup Client * @headerfile tango.h */ -typedef enum _AttrMemorizedType -{ - NOT_KNOWN, ///< Device too old to get this info - NONE, ///< The attribute is not memorized - MEMORIZED, ///< Memorized attribute - MEMORIZED_WRITE_INIT ///< Memorized attribute with memorized value writen at initialization -}AttrMemorizedType; + typedef enum _AttrMemorizedType { + NOT_KNOWN, ///< Device too old to get this info + NONE, ///< The attribute is not memorized + MEMORIZED, ///< Memorized attribute + MEMORIZED_WRITE_INIT ///< Memorized attribute with memorized value writen at initialization + } AttrMemorizedType; /** @@ -327,28 +334,31 @@ typedef enum _AttrMemorizedType * @ingroup Client */ #ifdef GEN_DOC -typedef struct AttributeInfoEx: public AttributeInfo + typedef struct AttributeInfoEx: public AttributeInfo #else -typedef struct _AttributeInfoEx : public AttributeInfo + typedef struct _AttributeInfoEx : public AttributeInfo #endif -{ - string root_attr_name; ///< Root attribute name (in case of forwarded attribute) - AttrMemorizedType memorized; ///< The attribute memorization type - vector enum_labels; ///< Enumerated attribute labels - AttributeAlarmInfo alarms; ///< The attribute alarms - AttributeEventInfo events; ///< The attribute events configuration - vector sys_extensions; ///< Future extensions + { + string root_attr_name; ///< Root attribute name (in case of forwarded attribute) + AttrMemorizedType memorized; ///< The attribute memorization type + vector enum_labels; ///< Enumerated attribute labels + AttributeAlarmInfo alarms; ///< The attribute alarms + AttributeEventInfo events; ///< The attribute events configuration + vector sys_extensions; ///< Future extensions /// @privatesection - _AttributeInfoEx & operator=(const AttributeConfig_2 *); - _AttributeInfoEx & operator=(const AttributeConfig_3 *); - _AttributeInfoEx & operator=(const AttributeConfig_5 *); + _AttributeInfoEx &operator=(const AttributeConfig_2 *); + + _AttributeInfoEx &operator=(const AttributeConfig_3 *); + + _AttributeInfoEx &operator=(const AttributeConfig_5 *); - friend ostream &operator<<(ostream &,_AttributeInfoEx &); - bool operator==(const _AttributeInfoEx &); -}AttributeInfoEx; + friend ostream &operator<<(ostream &, _AttributeInfoEx &); -typedef vector AttributeInfoList; + bool operator==(const _AttributeInfoEx &); + } AttributeInfoEx; + + typedef vector AttributeInfoList; /** * vector of AttributeInfoEx structure @@ -356,7 +366,7 @@ typedef vector AttributeInfoList; * @headerfile tango.h * @ingroup Client */ -typedef vector AttributeInfoListEx; + typedef vector AttributeInfoListEx; /** * Base structure for pipe information @@ -364,26 +374,26 @@ typedef vector AttributeInfoListEx; * @headerfile tango.h */ #ifdef GEN_DOC -typedef struct PipeInfo + typedef struct PipeInfo #else -typedef struct _PipeInfo + typedef struct _PipeInfo #endif -{ - string name; ///< Pipe name - string description; ///< Pipe description - string label; ///< Pipe label - Tango::DispLevel disp_level; ///< Display level - Tango::PipeWriteType writable; ///< Writable type (Read, Read-Write) - vector extensions; ///< For future extensions + { + string name; ///< Pipe name + string description; ///< Pipe description + string label; ///< Pipe label + Tango::DispLevel disp_level; ///< Display level + Tango::PipeWriteType writable; ///< Writable type (Read, Read-Write) + vector extensions; ///< For future extensions ///@privatesection - friend ostream &operator<<(ostream &,_PipeInfo &); + friend ostream &operator<<(ostream &, _PipeInfo &); // bool operator==(const _PipeInfo &); -}PipeInfo; + } PipeInfo; // TODO: Pipe -> Change the type for writable to replace PIPE_READ, PIPE_READ_WRITE by READ, READ_WRITE (IDL limitation) -typedef vector PipeInfoList; + typedef vector PipeInfoList; // // Can't use CALLBACK (without _) in the following enum because it's a @@ -396,12 +406,11 @@ typedef vector PipeInfoList; * @ingroup Client * @headerfile tango.h */ -enum asyn_req_type -{ - POLLING, ///< Polling mode request - CALL_BACK, ///< Callback mode request - ALL_ASYNCH ///< All request -}; + enum asyn_req_type { + POLLING, ///< Polling mode request + CALL_BACK, ///< Callback mode request + ALL_ASYNCH ///< All request + }; /** * Possible callback mode @@ -409,37 +418,36 @@ enum asyn_req_type * @ingroup Client * @headerfile tango.h */ -enum cb_sub_model -{ - PUSH_CALLBACK, ///< Callback push model - PULL_CALLBACK ///< Callback pull model -}; + enum cb_sub_model { + PUSH_CALLBACK, ///< Callback push model + PULL_CALLBACK ///< Callback pull model + }; // // Some define // -#define CONNECTION_OK 1 -#define CONNECTION_NOTOK 0 - -#define PROT_SEP "://" -#define TACO_PROTOCOL "taco" -#define TANGO_PROTOCOL "tango" +#define CONNECTION_OK 1 +#define CONNECTION_NOTOK 0 -#define MODIFIER '#' -#define DBASE_YES "dbase=yes" -#define DBASE_NO "dbase=no" -#define MODIFIER_DBASE_NO "#dbase=no" +#define PROT_SEP "://" +#define TACO_PROTOCOL "taco" +#define TANGO_PROTOCOL "tango" -#define HOST_SEP ':' -#define PORT_SEP '/' -#define DEV_NAME_FIELD_SEP '/' -#define RES_SEP "->" -#define DEVICE_SEP '/' +#define MODIFIER '#' +#define DBASE_YES "dbase=yes" +#define DBASE_NO "dbase=no" +#define MODIFIER_DBASE_NO "#dbase=no" -#define FROM_IOR "IOR" -#define NOT_USED "Unused" +#define HOST_SEP ':' +#define PORT_SEP '/' +#define DEV_NAME_FIELD_SEP '/' +#define RES_SEP "->" +#define DEVICE_SEP '/' +#define FROM_IOR "IOR" +#define NOT_USED "Unused" +}//Tango /**************************************************************************************** * * @@ -481,7 +489,7 @@ enum cb_sub_model #include "DeviceAttribute.h" - +namespace Tango { /**************************************************************************************** * * * The xxxDataHistory classes * @@ -507,25 +515,31 @@ enum cb_sub_model * @headerfile tango.h * @ingroup Client */ -class DeviceDataHistory: public DeviceData -{ + class DeviceDataHistory : public DeviceData { -public : + public : ///@privatesection // // constructor methods // - DeviceDataHistory(); - DeviceDataHistory(int, int *,DevCmdHistoryList *); - DeviceDataHistory(const DeviceDataHistory &); - DeviceDataHistory & operator=(const DeviceDataHistory &); + DeviceDataHistory(); + + DeviceDataHistory(int, int *, DevCmdHistoryList *); + + DeviceDataHistory(const DeviceDataHistory &); + + DeviceDataHistory &operator=(const DeviceDataHistory &); + #ifdef HAS_RVALUE - DeviceDataHistory(DeviceDataHistory &&); - DeviceDataHistory &operator=(DeviceDataHistory &&); + + DeviceDataHistory(DeviceDataHistory &&); + + DeviceDataHistory &operator=(DeviceDataHistory &&); + #endif - ~DeviceDataHistory(); + ~DeviceDataHistory(); ///@publicsection /** @@ -535,7 +549,8 @@ public : * * @return A boolean set to true if the record was a failure */ - bool has_failed() {return fail;} + bool has_failed() { return fail; } + /** * Get record polling date * @@ -543,7 +558,8 @@ public : * * @return The record polling date */ - TimeVal &get_date() {return time;} + TimeVal &get_date() { return time; } + /** * Get record error stack * @@ -552,7 +568,8 @@ public : * * @return The record error stack */ - const DevErrorList &get_err_stack() {return err.in();} + const DevErrorList &get_err_stack() { return err.in(); } + /** * Print a DeviceDataHistory instance * @@ -576,42 +593,46 @@ public : * @param [in] str The printing stream * @param [in] ddh The instance to be printed */ - friend ostream &operator<<(ostream &str,DeviceDataHistory &ddh); + friend ostream &operator<<(ostream &str, DeviceDataHistory &ddh); ///@privatesection // Three following methods for compatibility with older release - bool failed() {return fail;} - void failed(bool val) {fail = val;} - void set_date(TimeVal &tv) {time = tv;} - TimeVal &date() {return time;} - const DevErrorList &errors() {return err.in();} - void errors(DevErrorList_var &del) {err = del;} + bool failed() { return fail; } + + void failed(bool val) { fail = val; } + + void set_date(TimeVal &tv) { time = tv; } -protected: + TimeVal &date() { return time; } + + const DevErrorList &errors() { return err.in(); } + + void errors(DevErrorList_var &del) { err = del; } + + protected: ///@privatesection - bool fail; - TimeVal time; - DevErrorList_var err; - - DevCmdHistoryList *seq_ptr; - int *ref_ctr_ptr; - -private: - class DeviceDataHistoryExt - { - public: - DeviceDataHistoryExt() {}; - }; + bool fail; + TimeVal time; + DevErrorList_var err; + + DevCmdHistoryList *seq_ptr; + int *ref_ctr_ptr; + + private: + class DeviceDataHistoryExt { + public: + DeviceDataHistoryExt() {}; + }; #ifdef HAS_UNIQUE_PTR - unique_ptr ext_hist; + unique_ptr ext_hist; #else - DeviceDataHistoryExt *ext_hist; // Class extension + DeviceDataHistoryExt *ext_hist; // Class extension #endif -}; + }; -typedef vector DeviceDataHistoryList; + typedef vector DeviceDataHistoryList; /** * Fundamental type for receiving data from device attribute polling buffers @@ -630,26 +651,33 @@ typedef vector DeviceDataHistoryList; * @headerfile tango.h * @ingroup Client */ -class DeviceAttributeHistory: public DeviceAttribute -{ + class DeviceAttributeHistory : public DeviceAttribute { -public : + public : ///@privatesection // // constructor methods // - DeviceAttributeHistory(); - DeviceAttributeHistory(int, DevAttrHistoryList_var &); - DeviceAttributeHistory(int, DevAttrHistoryList_3_var &); - DeviceAttributeHistory(const DeviceAttributeHistory &); - DeviceAttributeHistory & operator=(const DeviceAttributeHistory &); + DeviceAttributeHistory(); + + DeviceAttributeHistory(int, DevAttrHistoryList_var &); + + DeviceAttributeHistory(int, DevAttrHistoryList_3_var &); + + DeviceAttributeHistory(const DeviceAttributeHistory &); + + DeviceAttributeHistory &operator=(const DeviceAttributeHistory &); + #ifdef HAS_RVALUE - DeviceAttributeHistory(DeviceAttributeHistory &&); - DeviceAttributeHistory &operator=(DeviceAttributeHistory &&); + + DeviceAttributeHistory(DeviceAttributeHistory &&); + + DeviceAttributeHistory &operator=(DeviceAttributeHistory &&); + #endif - ~DeviceAttributeHistory(); + ~DeviceAttributeHistory(); ///@publicsection /** * Check if the record was a failure @@ -658,7 +686,8 @@ public : * * @return A boolean set to true if the record was a failure */ - bool has_failed() {return fail;} + bool has_failed() { return fail; } + /** * Print a DeviceAttributeHistory instance * @@ -682,35 +711,36 @@ public : * @param [in] str The printing stream * @param [in] dah The instance to be printed */ - friend ostream &operator<<(ostream &str,DeviceAttributeHistory &dah); + friend ostream &operator<<(ostream &str, DeviceAttributeHistory &dah); ///@privatesection // Three following methods for compatibility with older release - bool failed() {return fail;} - void failed(bool val) {fail = val;} - TimeVal &date() {return time;} + bool failed() { return fail; } + + void failed(bool val) { fail = val; } + + TimeVal &date() { return time; } // const DevErrorList &errors() {return err;} -protected: + protected: ///@privatesection - bool fail; - char compatibility_padding[16]; - -private: - class DeviceAttributeHistoryExt - { - public: - DeviceAttributeHistoryExt() {}; - }; + bool fail; + char compatibility_padding[16]; + + private: + class DeviceAttributeHistoryExt { + public: + DeviceAttributeHistoryExt() {}; + }; #ifdef HAS_UNIQUE_PTR - unique_ptr ext_hist; + unique_ptr ext_hist; #else - DeviceAttributeHistoryExt *ext_hist; // Class extension + DeviceAttributeHistoryExt *ext_hist; // Class extension #endif -}; - + }; +}//Tango /**************************************************************************************** * * @@ -739,6 +769,7 @@ public : #include "AttributeProxy.h" +namespace Tango{ /**************************************************************************************** * * * The DummyDeviceProxy class * @@ -999,7 +1030,7 @@ inline int DeviceProxy::subscribe_event (const string &attr_name, EventType even class AutoConnectTimeout { public: - AutoConnectTimeout(unsigned int to) {omniORB::setClientConnectTimeout((CORBA::ULong)to);} + AutoConnectTimeout(unsigned int to) {omniORB::setClientConnectTimeout((DevULong)to);} ~AutoConnectTimeout() {omniORB::setClientConnectTimeout(NARROW_CLNT_TIMEOUT);} }; diff --git a/cppapi/client/devapi_attr.tpp b/include/tango/client/devapi_attr.tpp similarity index 100% rename from cppapi/client/devapi_attr.tpp rename to include/tango/client/devapi_attr.tpp diff --git a/cppapi/client/devapi_pipe.tpp b/include/tango/client/devapi_pipe.tpp similarity index 100% rename from cppapi/client/devapi_pipe.tpp rename to include/tango/client/devapi_pipe.tpp diff --git a/cppapi/client/devapi_utils.tpp b/include/tango/client/devapi_utils.tpp similarity index 100% rename from cppapi/client/devapi_utils.tpp rename to include/tango/client/devapi_utils.tpp diff --git a/cppapi/client/devasyn.h b/include/tango/client/devasyn.h similarity index 100% rename from cppapi/client/devasyn.h rename to include/tango/client/devasyn.h diff --git a/cppapi/client/event.h b/include/tango/client/event.h similarity index 99% rename from cppapi/client/event.h rename to include/tango/client/event.h index f4092d6c0..6ab6a3740 100644 --- a/cppapi/client/event.h +++ b/include/tango/client/event.h @@ -34,9 +34,9 @@ #ifndef _EVENTAPI_H #define _EVENTAPI_H -#include -#include -#include +#include +#include +#include #include diff --git a/cppapi/client/event.tpp b/include/tango/client/event.tpp similarity index 100% rename from cppapi/client/event.tpp rename to include/tango/client/event.tpp diff --git a/cppapi/client/eventconsumer.h b/include/tango/client/eventconsumer.h similarity index 99% rename from cppapi/client/eventconsumer.h rename to include/tango/client/eventconsumer.h index ecc9a6646..046fafd3f 100644 --- a/cppapi/client/eventconsumer.h +++ b/include/tango/client/eventconsumer.h @@ -32,16 +32,16 @@ #ifndef _EVENTCONSUMER_H #define _EVENTCONSUMER_H -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include +#include #include diff --git a/cppapi/client/filedatabase.h b/include/tango/client/filedatabase.h similarity index 100% rename from cppapi/client/filedatabase.h rename to include/tango/client/filedatabase.h diff --git a/cppapi/client/group.h b/include/tango/client/group.h similarity index 99% rename from cppapi/client/group.h rename to include/tango/client/group.h index d1b466cb4..dfbc90895 100644 --- a/cppapi/client/group.h +++ b/include/tango/client/group.h @@ -1723,9 +1723,9 @@ bool GroupCmdReply::operator>> (T& dest) Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("no available data"); - errors[0].reason = CORBA::string_dup("no data - group member is disabled"); - errors[0].origin = CORBA::string_dup("GroupCmdReply::operator>>"); + errors[0].desc = Tango::string_dup("no available data"); + errors[0].reason = Tango::string_dup("no data - group member is disabled"); + errors[0].origin = Tango::string_dup("GroupCmdReply::operator>>"); DevFailed df(errors); throw df; } @@ -1758,9 +1758,9 @@ bool GroupCmdReply::operator>> (T& dest) Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("unknown exception caught"); - errors[0].reason = CORBA::string_dup("an error occured while trying to extract data"); - errors[0].origin = CORBA::string_dup("GroupCmdReply::operator>>"); + errors[0].desc = Tango::string_dup("unknown exception caught"); + errors[0].reason = Tango::string_dup("an error occured while trying to extract data"); + errors[0].origin = Tango::string_dup("GroupCmdReply::operator>>"); DevFailed df(errors); GroupReply::exception_m = df; throw GroupReply::exception_m; @@ -1785,9 +1785,9 @@ bool GroupAttrReply::operator>> (T& dest) Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("no available data"); - errors[0].reason = CORBA::string_dup("no data - group member is disabled"); - errors[0].origin = CORBA::string_dup("GroupAttrReply::operator>>"); + errors[0].desc = Tango::string_dup("no available data"); + errors[0].reason = Tango::string_dup("no data - group member is disabled"); + errors[0].origin = Tango::string_dup("GroupAttrReply::operator>>"); DevFailed df(errors); throw df; } @@ -1821,9 +1821,9 @@ bool GroupAttrReply::operator>> (T& dest) Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("unknown exception caught"); - errors[0].reason = CORBA::string_dup("an error occured while trying to extract data"); - errors[0].origin = CORBA::string_dup("GroupAttrReply::operator>>"); + errors[0].desc = Tango::string_dup("unknown exception caught"); + errors[0].reason = Tango::string_dup("an error occured while trying to extract data"); + errors[0].origin = Tango::string_dup("GroupAttrReply::operator>>"); DevFailed df(errors); GroupReply::exception_m = df; throw GroupReply::exception_m; diff --git a/cppapi/client/helpers/DeviceProxyHelper.h b/include/tango/client/helpers/DeviceProxyHelper.h similarity index 99% rename from cppapi/client/helpers/DeviceProxyHelper.h rename to include/tango/client/helpers/DeviceProxyHelper.h index 55d4093fc..00bb327b6 100644 --- a/cppapi/client/helpers/DeviceProxyHelper.h +++ b/include/tango/client/helpers/DeviceProxyHelper.h @@ -156,7 +156,7 @@ //============================================================================= // DEPENDENCIES //============================================================================= -#include +#include //============================================================================= // MACRO diff --git a/cppapi/client/helpers/PogoHelper.h b/include/tango/client/helpers/PogoHelper.h similarity index 100% rename from cppapi/client/helpers/PogoHelper.h rename to include/tango/client/helpers/PogoHelper.h diff --git a/cppapi/client/helpers/TangoExceptionsHelper.h b/include/tango/client/helpers/TangoExceptionsHelper.h similarity index 96% rename from cppapi/client/helpers/TangoExceptionsHelper.h rename to include/tango/client/helpers/TangoExceptionsHelper.h index 42389a77e..6318eee37 100644 --- a/cppapi/client/helpers/TangoExceptionsHelper.h +++ b/include/tango/client/helpers/TangoExceptionsHelper.h @@ -192,9 +192,9 @@ Tango::DevErrorList errors(1); \ errors.length(1); \ errors[0].severity = Tango::ERR; \ - errors[0].reason = CORBA::string_dup("OUT_OF_MEMORY"); \ - errors[0].desc = CORBA::string_dup(d.str().c_str()); \ - errors[0].origin = CORBA::string_dup(o.str().c_str()); \ + errors[0].reason = Tango::string_dup("OUT_OF_MEMORY"); \ + errors[0].desc = Tango::string_dup(d.str().c_str()); \ + errors[0].origin = Tango::string_dup(o.str().c_str()); \ Tango::DevFailed df(errors); \ _ERROR_STREAM << df << std::endl; \ throw df; \ @@ -210,9 +210,9 @@ Tango::DevErrorList errors(1); \ errors.length(1); \ errors[0].severity = Tango::ERR; \ - errors[0].reason = CORBA::string_dup("UNKNOWN_ERROR"); \ - errors[0].desc = CORBA::string_dup(d.str().c_str()); \ - errors[0].origin = CORBA::string_dup(o.str().c_str()); \ + errors[0].reason = Tango::string_dup("UNKNOWN_ERROR"); \ + errors[0].desc = Tango::string_dup(d.str().c_str()); \ + errors[0].origin = Tango::string_dup(o.str().c_str()); \ Tango::DevFailed df(errors); \ _ERROR_STREAM << df << std::endl; \ throw df; \ diff --git a/cppapi/client/helpers/Xstring.h b/include/tango/client/helpers/Xstring.h similarity index 100% rename from cppapi/client/helpers/Xstring.h rename to include/tango/client/helpers/Xstring.h diff --git a/cppapi/client/lockthread.h b/include/tango/client/lockthread.h similarity index 100% rename from cppapi/client/lockthread.h rename to include/tango/client/lockthread.h diff --git a/cppapi/server/attrdesc.h b/include/tango/server/attrdesc.h similarity index 100% rename from cppapi/server/attrdesc.h rename to include/tango/server/attrdesc.h diff --git a/cppapi/server/attribute.h b/include/tango/server/attribute.h similarity index 99% rename from cppapi/server/attribute.h rename to include/tango/server/attribute.h index 981a09d30..083b8cea1 100644 --- a/cppapi/server/attribute.h +++ b/include/tango/server/attribute.h @@ -34,9 +34,9 @@ #define _ATTRIBUTE_H #include -#include -#include -#include +#include +#include +#include #include #include @@ -2509,7 +2509,7 @@ inline void Attribute::throw_startup_exception(const char* origin) event_exceptions.push_back(it->first); else opt_exceptions.push_back(it->first); - for(CORBA::ULong i = 0 ; i < it->second.errors.length(); i++) + for(DevULong i = 0 ; i < it->second.errors.length(); i++) { string tmp_msg = string(it->second.errors[i].desc); size_t pos = tmp_msg.rfind('\n'); @@ -2692,7 +2692,7 @@ inline void Attribute::set_att_conf_event_sub(int cl_lib) if (true) \ { \ string s = B.str(); \ - A = CORBA::string_dup(s.c_str()); \ + A = Tango::string_dup(s.c_str()); \ B.str(""); \ B.clear(); \ } \ diff --git a/cppapi/server/attribute.tpp b/include/tango/server/attribute.tpp similarity index 96% rename from cppapi/server/attribute.tpp rename to include/tango/server/attribute.tpp index 46e7f457d..4e5989e46 100644 --- a/cppapi/server/attribute.tpp +++ b/include/tango/server/attribute.tpp @@ -1166,30 +1166,30 @@ void Attribute::set_properties(Tango::MultiAttrProp &props) AttributeConfig_5 conf; get_properties(conf); - conf.label = CORBA::string_dup(props.label.c_str()); - conf.description = CORBA::string_dup(props.description.c_str()); - conf.unit = CORBA::string_dup(props.unit.c_str()); - conf.standard_unit = CORBA::string_dup(props.standard_unit.c_str()); - conf.display_unit = CORBA::string_dup(props.display_unit.c_str()); - conf.format = CORBA::string_dup(props.format.c_str()); - conf.att_alarm.min_alarm = CORBA::string_dup(props.min_alarm); - conf.att_alarm.max_alarm = CORBA::string_dup(props.max_alarm); - conf.min_value = CORBA::string_dup(props.min_value); - conf.max_value = CORBA::string_dup(props.max_value); - conf.att_alarm.min_warning = CORBA::string_dup(props.min_warning); - conf.att_alarm.max_warning = CORBA::string_dup(props.max_warning); - conf.att_alarm.delta_t = CORBA::string_dup(props.delta_t); - conf.att_alarm.delta_val = CORBA::string_dup(props.delta_val); - conf.event_prop.per_event.period = CORBA::string_dup(props.event_period); - conf.event_prop.arch_event.period = CORBA::string_dup(props.archive_period); - conf.event_prop.ch_event.rel_change = CORBA::string_dup(props.rel_change); - conf.event_prop.ch_event.abs_change = CORBA::string_dup(props.abs_change); - conf.event_prop.arch_event.rel_change = CORBA::string_dup(props.archive_rel_change); - conf.event_prop.arch_event.abs_change = CORBA::string_dup(props.archive_abs_change); + conf.label = Tango::string_dup(props.label.c_str()); + conf.description = Tango::string_dup(props.description.c_str()); + conf.unit = Tango::string_dup(props.unit.c_str()); + conf.standard_unit = Tango::string_dup(props.standard_unit.c_str()); + conf.display_unit = Tango::string_dup(props.display_unit.c_str()); + conf.format = Tango::string_dup(props.format.c_str()); + conf.att_alarm.min_alarm = Tango::string_dup(props.min_alarm); + conf.att_alarm.max_alarm = Tango::string_dup(props.max_alarm); + conf.min_value = Tango::string_dup(props.min_value); + conf.max_value = Tango::string_dup(props.max_value); + conf.att_alarm.min_warning = Tango::string_dup(props.min_warning); + conf.att_alarm.max_warning = Tango::string_dup(props.max_warning); + conf.att_alarm.delta_t = Tango::string_dup(props.delta_t); + conf.att_alarm.delta_val = Tango::string_dup(props.delta_val); + conf.event_prop.per_event.period = Tango::string_dup(props.event_period); + conf.event_prop.arch_event.period = Tango::string_dup(props.archive_period); + conf.event_prop.ch_event.rel_change = Tango::string_dup(props.rel_change); + conf.event_prop.ch_event.abs_change = Tango::string_dup(props.abs_change); + conf.event_prop.arch_event.rel_change = Tango::string_dup(props.archive_rel_change); + conf.event_prop.arch_event.abs_change = Tango::string_dup(props.archive_abs_change); conf.enum_labels.length(props.enum_labels.size()); for (size_t loop = 0;loop < props.enum_labels.size();loop++) - conf.enum_labels[loop] = CORBA::string_dup(props.enum_labels[loop].c_str()); + conf.enum_labels[loop] = Tango::string_dup(props.enum_labels[loop].c_str()); // // Set properties and update database @@ -1357,7 +1357,7 @@ void Attribute::Attribute_2_AttributeValue_base(T *ptr,Tango::DeviceImpl *d) { Tango::DevVarStringArray str_seq(1); str_seq.length(1); - str_seq[0] = CORBA::string_dup(d->get_status().c_str()); + str_seq[0] = Tango::string_dup(d->get_status().c_str()); ptr->value.string_att_value(str_seq); } @@ -1383,7 +1383,7 @@ void Attribute::Attribute_2_AttributeValue_base(T *ptr,Tango::DeviceImpl *d) ptr->w_dim.dim_x = 0; ptr->w_dim.dim_y = 0; - ptr->name = CORBA::string_dup(name.c_str()); + ptr->name = Tango::string_dup(name.c_str()); ptr->data_format = data_format; } else @@ -1433,7 +1433,7 @@ void Attribute::Attribute_2_AttributeValue_base(T *ptr,Tango::DeviceImpl *d) ptr->time = when; ptr->quality = quality; ptr->data_format = data_format; - ptr->name = CORBA::string_dup(name.c_str()); + ptr->name = Tango::string_dup(name.c_str()); } } diff --git a/cppapi/server/attribute_spec.tpp b/include/tango/server/attribute_spec.tpp similarity index 100% rename from cppapi/server/attribute_spec.tpp rename to include/tango/server/attribute_spec.tpp diff --git a/cppapi/server/attrmanip.h b/include/tango/server/attrmanip.h similarity index 100% rename from cppapi/server/attrmanip.h rename to include/tango/server/attrmanip.h diff --git a/cppapi/server/attrprop.h b/include/tango/server/attrprop.h similarity index 100% rename from cppapi/server/attrprop.h rename to include/tango/server/attrprop.h diff --git a/cppapi/server/attrprop.tpp b/include/tango/server/attrprop.tpp similarity index 100% rename from cppapi/server/attrprop.tpp rename to include/tango/server/attrprop.tpp diff --git a/cppapi/server/attrsetval.tpp b/include/tango/server/attrsetval.tpp similarity index 100% rename from cppapi/server/attrsetval.tpp rename to include/tango/server/attrsetval.tpp diff --git a/cppapi/server/auto_tango_monitor.h b/include/tango/server/auto_tango_monitor.h similarity index 100% rename from cppapi/server/auto_tango_monitor.h rename to include/tango/server/auto_tango_monitor.h diff --git a/cppapi/server/basiccommand.h b/include/tango/server/basiccommand.h similarity index 100% rename from cppapi/server/basiccommand.h rename to include/tango/server/basiccommand.h diff --git a/cppapi/server/blackbox.h b/include/tango/server/blackbox.h similarity index 98% rename from cppapi/server/blackbox.h rename to include/tango/server/blackbox.h index 1cef99d3c..723b14369 100644 --- a/cppapi/server/blackbox.h +++ b/include/tango/server/blackbox.h @@ -47,7 +47,7 @@ namespace Tango #define IP_ADDR_BUFFER_SIZE 80 -CORBA::Boolean get_client_addr(omni::omniInterceptors::serverReceiveRequest_T::info_T &); +DevBoolean get_client_addr(omni::omniInterceptors::serverReceiveRequest_T::info_T &); class client_addr: public omni_thread::value_t { diff --git a/cppapi/server/classattribute.h b/include/tango/server/classattribute.h similarity index 100% rename from cppapi/server/classattribute.h rename to include/tango/server/classattribute.h diff --git a/cppapi/server/classpipe.h b/include/tango/server/classpipe.h similarity index 100% rename from cppapi/server/classpipe.h rename to include/tango/server/classpipe.h diff --git a/cppapi/server/command.h b/include/tango/server/command.h similarity index 100% rename from cppapi/server/command.h rename to include/tango/server/command.h diff --git a/cppapi/server/coutappender.h b/include/tango/server/coutappender.h similarity index 100% rename from cppapi/server/coutappender.h rename to include/tango/server/coutappender.h diff --git a/cppapi/server/coutbuf.h b/include/tango/server/coutbuf.h similarity index 98% rename from cppapi/server/coutbuf.h rename to include/tango/server/coutbuf.h index 789079769..795fbbc67 100644 --- a/cppapi/server/coutbuf.h +++ b/include/tango/server/coutbuf.h @@ -35,7 +35,7 @@ #ifndef _COUTBUF_H #define _COUTBUF_H -#include +#include "../../tango.h" #ifndef TANGO_HAS_LOG4TANGO # include #endif diff --git a/cppapi/server/device.h b/include/tango/server/device.h similarity index 99% rename from cppapi/server/device.h rename to include/tango/server/device.h index e6bbd463e..ca83c491b 100644 --- a/cppapi/server/device.h +++ b/include/tango/server/device.h @@ -34,18 +34,18 @@ #define _DEVICE_H #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Tango { @@ -3306,7 +3306,7 @@ class DeviceImpl : public virtual POA_Tango::Device virtual Tango::DevState state(); virtual CORBA::Any *command_inout(const char *in_cmd,const CORBA::Any &in_data); - virtual Tango::DevVarStringArray *black_box(CORBA::Long n); + virtual Tango::DevVarStringArray *black_box(DevLong n); virtual Tango::DevCmdInfoList *command_list_query(); virtual Tango::DevCmdInfo *command_query(const char *command); virtual Tango::DevInfo *info(); diff --git a/cppapi/server/device_2.h b/include/tango/server/device_2.h similarity index 99% rename from cppapi/server/device_2.h rename to include/tango/server/device_2.h index a538f06ab..d45dc3ae1 100644 --- a/cppapi/server/device_2.h +++ b/include/tango/server/device_2.h @@ -281,7 +281,7 @@ class Device_2Impl : public virtual POA_Tango::Device_2, * DevFailed exception specification */ virtual Tango::DevAttrHistoryList *read_attribute_history_2(const char* name, - CORBA::Long n) + DevLong n) throw(Tango::DevFailed, CORBA::SystemException); /** @@ -307,7 +307,7 @@ class Device_2Impl : public virtual POA_Tango::Device_2, */ virtual Tango::DevCmdHistoryList *command_inout_history_2(const char* command, - CORBA::Long n) + DevLong n) throw(Tango::DevFailed, CORBA::SystemException); //@} diff --git a/cppapi/server/device_3.h b/include/tango/server/device_3.h similarity index 99% rename from cppapi/server/device_3.h rename to include/tango/server/device_3.h index 7bd39c6c5..bb5981da9 100644 --- a/cppapi/server/device_3.h +++ b/include/tango/server/device_3.h @@ -236,7 +236,7 @@ class Device_3Impl : public virtual POA_Tango::Device_3, * DevFailed exception specification */ virtual Tango::DevAttrHistoryList_3 *read_attribute_history_3(const char* name, - CORBA::Long n); + DevLong n); /** * Get device info. diff --git a/cppapi/server/device_3.tpp b/include/tango/server/device_3.tpp similarity index 93% rename from cppapi/server/device_3.tpp rename to include/tango/server/device_3.tpp index fdc13359b..7015e1c00 100644 --- a/cppapi/server/device_3.tpp +++ b/include/tango/server/device_3.tpp @@ -270,7 +270,7 @@ void Device_3Impl::set_attribute_config_3_local(const T &new_conf,TANGO_UNUSED(c o << ends; string s = o.str(); - e.errors[0].reason = CORBA::string_dup(s.c_str()); + e.errors[0].reason = Tango::string_dup(s.c_str()); throw; } @@ -302,7 +302,7 @@ inline void Device_3Impl::error_from_devfailed(T &back,DevFailed &e,const char * { back.err_list = e.errors; back.quality = ATTR_INVALID; - back.name = CORBA::string_dup(na); + back.name = Tango::string_dup(na); clear_att_dim(back); } @@ -311,7 +311,7 @@ inline void Device_3Impl::error_from_errorlist(T &back,DevErrorList &e,const cha { back.err_list = e; back.quality = ATTR_INVALID; - back.name = CORBA::string_dup(na); + back.name = Tango::string_dup(na); clear_att_dim(back); } @@ -321,12 +321,12 @@ inline void Device_3Impl::one_error(T &back,const char *reas,const char *ori,str back.err_list.length(1); back.err_list[0].severity = Tango::ERR; - back.err_list[0].reason = CORBA::string_dup(reas); - back.err_list[0].origin = CORBA::string_dup(ori); - back.err_list[0].desc = CORBA::string_dup(mess.c_str()); + back.err_list[0].reason = Tango::string_dup(reas); + back.err_list[0].origin = Tango::string_dup(ori); + back.err_list[0].desc = Tango::string_dup(mess.c_str()); back.quality = Tango::ATTR_INVALID; - back.name = CORBA::string_dup(att.get_name().c_str()); + back.name = Tango::string_dup(att.get_name().c_str()); clear_att_dim(back); } @@ -336,12 +336,12 @@ inline void Device_3Impl::one_error(T &back,const char *reas,const char *ori,str back.err_list.length(1); back.err_list[0].severity = Tango::ERR; - back.err_list[0].reason = CORBA::string_dup(reas); - back.err_list[0].origin = CORBA::string_dup(ori); - back.err_list[0].desc = CORBA::string_dup(mess.c_str()); + back.err_list[0].reason = Tango::string_dup(reas); + back.err_list[0].origin = Tango::string_dup(ori); + back.err_list[0].desc = Tango::string_dup(mess.c_str()); back.quality = Tango::ATTR_INVALID; - back.name = CORBA::string_dup(na); + back.name = Tango::string_dup(na); clear_att_dim(back); } @@ -352,7 +352,7 @@ inline void Device_3Impl::init_polled_out_data(T &back,V &att_val) back.time = att_val.time; back.r_dim = att_val.r_dim; back.w_dim = att_val.w_dim; - back.name = CORBA::string_dup(att_val.name); + back.name = Tango::string_dup(att_val.name); } template @@ -360,7 +360,7 @@ inline void Device_3Impl::init_out_data(T &back,Attribute &att,AttrWriteType &w_ { back.time = att.get_when(); back.quality = att.get_quality(); - back.name = CORBA::string_dup(att.get_name().c_str()); + back.name = Tango::string_dup(att.get_name().c_str()); back.r_dim.dim_x = att.get_x(); back.r_dim.dim_y = att.get_y(); if ((w_type == Tango::READ_WRITE) || @@ -392,7 +392,7 @@ inline void Device_3Impl::init_out_data_quality(T &back,Attribute &att,AttrQuali { back.time = att.get_when(); back.quality = qual; - back.name = CORBA::string_dup(att.get_name().c_str()); + back.name = Tango::string_dup(att.get_name().c_str()); back.r_dim.dim_x = att.get_x(); back.r_dim.dim_y = att.get_y(); back.r_dim.dim_x = 0; @@ -421,7 +421,7 @@ inline void Device_3Impl::base_state2attr(T &back) back.time.tv_nsec = 0; #endif back.quality = Tango::ATTR_VALID; - back.name = CORBA::string_dup("State"); + back.name = Tango::string_dup("State"); back.r_dim.dim_x = 1; back.r_dim.dim_y = 0; back.w_dim.dim_x = 0; @@ -448,7 +448,7 @@ inline void Device_3Impl::base_status2attr(T &back) back.time.tv_nsec = 0; #endif back.quality = Tango::ATTR_VALID; - back.name = CORBA::string_dup("Status"); + back.name = Tango::string_dup("Status"); back.r_dim.dim_x = 1; back.r_dim.dim_y = 0; back.w_dim.dim_x = 0; diff --git a/cppapi/server/device_4.h b/include/tango/server/device_4.h similarity index 99% rename from cppapi/server/device_4.h rename to include/tango/server/device_4.h index b3a54c0b9..f2b632f90 100644 --- a/cppapi/server/device_4.h +++ b/include/tango/server/device_4.h @@ -187,7 +187,7 @@ class Device_4Impl : public virtual POA_Tango::Device_4, * DevFailed exception specification */ virtual Tango::DevAttrHistory_4 *read_attribute_history_4(const char* name, - CORBA::Long n); + DevLong n); /** * Read command value history. @@ -212,7 +212,7 @@ class Device_4Impl : public virtual POA_Tango::Device_4, */ virtual Tango::DevCmdHistory_4 *command_inout_history_4(const char* command, - CORBA::Long n); + DevLong n); /** * Execute a command. diff --git a/cppapi/server/device_5.h b/include/tango/server/device_5.h similarity index 99% rename from cppapi/server/device_5.h rename to include/tango/server/device_5.h index 3c9e1fdc9..485ab96db 100644 --- a/cppapi/server/device_5.h +++ b/include/tango/server/device_5.h @@ -273,7 +273,7 @@ class Device_5Impl : public virtual POA_Tango::Device_5, * Click here to read * DevFailed exception specification */ - virtual Tango::DevAttrHistory_5 *read_attribute_history_5(const char* name,CORBA::Long n); + virtual Tango::DevAttrHistory_5 *read_attribute_history_5(const char* name,DevLong n); /** * Get pipe(s) configuration. diff --git a/cppapi/server/deviceclass.h b/include/tango/server/deviceclass.h similarity index 100% rename from cppapi/server/deviceclass.h rename to include/tango/server/deviceclass.h diff --git a/cppapi/server/devintr.h b/include/tango/server/devintr.h similarity index 100% rename from cppapi/server/devintr.h rename to include/tango/server/devintr.h diff --git a/cppapi/server/dintrthread.h b/include/tango/server/dintrthread.h similarity index 100% rename from cppapi/server/dintrthread.h rename to include/tango/server/dintrthread.h diff --git a/cppapi/client/doc.h b/include/tango/server/doc.h similarity index 100% rename from cppapi/client/doc.h rename to include/tango/server/doc.h diff --git a/cppapi/server/dserver.h b/include/tango/server/dserver.h similarity index 100% rename from cppapi/server/dserver.h rename to include/tango/server/dserver.h diff --git a/cppapi/server/dserverclass.h b/include/tango/server/dserverclass.h similarity index 100% rename from cppapi/server/dserverclass.h rename to include/tango/server/dserverclass.h diff --git a/cppapi/server/dserversignal.h b/include/tango/server/dserversignal.h similarity index 100% rename from cppapi/server/dserversignal.h rename to include/tango/server/dserversignal.h diff --git a/cppapi/server/encoded_attribute.h b/include/tango/server/encoded_attribute.h similarity index 99% rename from cppapi/server/encoded_attribute.h rename to include/tango/server/encoded_attribute.h index ea7dec563..924c71c9a 100644 --- a/cppapi/server/encoded_attribute.h +++ b/include/tango/server/encoded_attribute.h @@ -38,7 +38,7 @@ #ifndef _ENCODED_ATT_H #define _ENCODED_ATT_H -#include +#include namespace Tango { diff --git a/cppapi/server/encoded_format.h b/include/tango/server/encoded_format.h similarity index 100% rename from cppapi/server/encoded_format.h rename to include/tango/server/encoded_format.h diff --git a/cppapi/server/eventsupplier.h b/include/tango/server/eventsupplier.h similarity index 99% rename from cppapi/server/eventsupplier.h rename to include/tango/server/eventsupplier.h index 675de7abb..d579f8ac6 100644 --- a/cppapi/server/eventsupplier.h +++ b/include/tango/server/eventsupplier.h @@ -43,7 +43,7 @@ #ifndef _EVENT_SUPPLIER_API_H #define _EVENT_SUPPLIER_API_H -#include +#include #if defined (_TG_WINDOWS_) && defined (_USRDLL) && !defined(_TANGO_LIB) #define USE_stub_in_nt_dll @@ -59,7 +59,7 @@ #undef USE_stub_in_nt_dll #endif -#include +#include #include #ifndef _TG_WINDOWS_ diff --git a/cppapi/server/except.h b/include/tango/server/except.h similarity index 89% rename from cppapi/server/except.h rename to include/tango/server/except.h index e3a570947..40cde4e45 100644 --- a/cppapi/server/except.h +++ b/include/tango/server/except.h @@ -127,10 +127,10 @@ class Except Tango::DevErrorList errors(1); errors.length(1); - errors[0].desc = CORBA::string_dup(desc); + errors[0].desc = Tango::string_dup(desc); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason); - errors[0].origin = CORBA::string_dup(origin); + errors[0].reason = Tango::string_dup(reason); + errors[0].origin = Tango::string_dup(origin); throw Tango::DevFailed(errors); } @@ -162,10 +162,10 @@ class Except Tango::DevErrorList errors(1); errors.length(1); - errors[0].desc = CORBA::string_dup(desc); + errors[0].desc = Tango::string_dup(desc); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason); - errors[0].origin = CORBA::string_dup(origin); + errors[0].reason = Tango::string_dup(reason); + errors[0].origin = Tango::string_dup(origin); delete[] origin; throw Tango::DevFailed(errors); @@ -199,10 +199,10 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].desc = CORBA::string_dup(desc); + errors[0].desc = Tango::string_dup(desc); delete[] desc; - errors[0].origin = CORBA::string_dup(origin); - errors[0].reason = CORBA::string_dup(reason); + errors[0].origin = Tango::string_dup(origin); + errors[0].reason = Tango::string_dup(reason); throw Tango::DevFailed(errors); } @@ -234,10 +234,10 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason); - errors[0].origin = CORBA::string_dup(origin); + errors[0].reason = Tango::string_dup(reason); + errors[0].origin = Tango::string_dup(origin); delete[] origin; - errors[0].desc = CORBA::string_dup(desc); + errors[0].desc = Tango::string_dup(desc); delete[] desc; throw Tango::DevFailed(errors); @@ -271,10 +271,10 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason); + errors[0].reason = Tango::string_dup(reason); delete[] reason; - errors[0].origin = CORBA::string_dup(origin); - errors[0].desc = CORBA::string_dup(desc); + errors[0].origin = Tango::string_dup(origin); + errors[0].desc = Tango::string_dup(desc); throw Tango::DevFailed(errors); } @@ -307,11 +307,11 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason); + errors[0].reason = Tango::string_dup(reason); delete[] reason; - errors[0].origin = CORBA::string_dup(origin); + errors[0].origin = Tango::string_dup(origin); delete[] origin; - errors[0].desc = CORBA::string_dup(desc); + errors[0].desc = Tango::string_dup(desc); throw Tango::DevFailed(errors); } @@ -344,10 +344,10 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason); + errors[0].reason = Tango::string_dup(reason); delete[] reason; - errors[0].origin = CORBA::string_dup(origin); - errors[0].desc = CORBA::string_dup(desc); + errors[0].origin = Tango::string_dup(origin); + errors[0].desc = Tango::string_dup(desc); delete[] desc; throw Tango::DevFailed(errors); @@ -381,11 +381,11 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason); + errors[0].reason = Tango::string_dup(reason); delete[] reason; - errors[0].origin = CORBA::string_dup(origin); + errors[0].origin = Tango::string_dup(origin); delete[] origin; - errors[0].desc = CORBA::string_dup(desc); + errors[0].desc = Tango::string_dup(desc); delete[] desc; throw Tango::DevFailed(errors); @@ -418,9 +418,9 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason.c_str()); - errors[0].origin = CORBA::string_dup(origin.c_str()); - errors[0].desc = CORBA::string_dup(desc.c_str()); + errors[0].reason = Tango::string_dup(reason.c_str()); + errors[0].origin = Tango::string_dup(origin.c_str()); + errors[0].desc = Tango::string_dup(desc.c_str()); throw Tango::DevFailed(errors); } @@ -452,9 +452,9 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason.c_str()); - errors[0].origin = CORBA::string_dup(origin); - errors[0].desc = CORBA::string_dup(desc.c_str()); + errors[0].reason = Tango::string_dup(reason.c_str()); + errors[0].origin = Tango::string_dup(origin); + errors[0].desc = Tango::string_dup(desc.c_str()); throw Tango::DevFailed(errors); } @@ -486,9 +486,9 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason.c_str()); - errors[0].origin = CORBA::string_dup(desc); - errors[0].desc = CORBA::string_dup(origin.c_str()); + errors[0].reason = Tango::string_dup(reason.c_str()); + errors[0].origin = Tango::string_dup(origin.c_str()); + errors[0].desc = Tango::string_dup(desc); throw Tango::DevFailed(errors); } @@ -520,9 +520,9 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason.c_str()); - errors[0].origin = CORBA::string_dup(origin); - errors[0].desc = CORBA::string_dup(desc); + errors[0].reason = Tango::string_dup(reason.c_str()); + errors[0].origin = Tango::string_dup(origin); + errors[0].desc = Tango::string_dup(desc); throw Tango::DevFailed(errors); } @@ -554,9 +554,9 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason); - errors[0].origin = CORBA::string_dup(origin.c_str()); - errors[0].desc = CORBA::string_dup(desc.c_str()); + errors[0].reason = Tango::string_dup(reason); + errors[0].origin = Tango::string_dup(origin.c_str()); + errors[0].desc = Tango::string_dup(desc.c_str()); throw Tango::DevFailed(errors); } @@ -588,9 +588,9 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason); - errors[0].origin = CORBA::string_dup(origin); - errors[0].desc = CORBA::string_dup(desc.c_str()); + errors[0].reason = Tango::string_dup(reason); + errors[0].origin = Tango::string_dup(origin); + errors[0].desc = Tango::string_dup(desc.c_str()); throw Tango::DevFailed(errors); } @@ -622,9 +622,9 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason); - errors[0].origin = CORBA::string_dup(origin.c_str()); - errors[0].desc = CORBA::string_dup(desc); + errors[0].reason = Tango::string_dup(reason); + errors[0].origin = Tango::string_dup(origin.c_str()); + errors[0].desc = Tango::string_dup(desc); throw Tango::DevFailed(errors); } @@ -657,10 +657,10 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason.c_str()); - errors[0].origin = CORBA::string_dup(origin); + errors[0].reason = Tango::string_dup(reason.c_str()); + errors[0].origin = Tango::string_dup(origin); delete[] origin; - errors[0].desc = CORBA::string_dup(desc.c_str()); + errors[0].desc = Tango::string_dup(desc.c_str()); throw Tango::DevFailed(errors); } @@ -693,10 +693,10 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason.c_str()); - errors[0].origin = CORBA::string_dup(desc); + errors[0].reason = Tango::string_dup(reason.c_str()); + errors[0].origin = Tango::string_dup(origin.c_str()); + errors[0].desc = Tango::string_dup(desc); delete[] desc; - errors[0].desc = CORBA::string_dup(origin.c_str()); throw Tango::DevFailed(errors); } @@ -729,10 +729,10 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason.c_str()); - errors[0].origin = CORBA::string_dup(origin); + errors[0].reason = Tango::string_dup(reason.c_str()); + errors[0].origin = Tango::string_dup(origin); delete[] origin; - errors[0].desc = CORBA::string_dup(desc); + errors[0].desc = Tango::string_dup(desc); delete desc; throw Tango::DevFailed(errors); @@ -766,10 +766,10 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason); + errors[0].reason = Tango::string_dup(reason); delete[] reason; - errors[0].origin = CORBA::string_dup(origin.c_str()); - errors[0].desc = CORBA::string_dup(desc.c_str()); + errors[0].origin = Tango::string_dup(origin.c_str()); + errors[0].desc = Tango::string_dup(desc.c_str()); throw Tango::DevFailed(errors); } @@ -802,11 +802,11 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason); + errors[0].reason = Tango::string_dup(reason); delete[] reason; - errors[0].origin = CORBA::string_dup(origin); + errors[0].origin = Tango::string_dup(origin); delete[] origin; - errors[0].desc = CORBA::string_dup(desc.c_str()); + errors[0].desc = Tango::string_dup(desc.c_str()); throw Tango::DevFailed(errors); } @@ -839,11 +839,11 @@ class Except errors.length(1); errors[0].severity = sever; - errors[0].reason = CORBA::string_dup(reason); + errors[0].reason = Tango::string_dup(reason); delete[] reason; - errors[0].origin = CORBA::string_dup(desc); + errors[0].origin = Tango::string_dup(origin.c_str()); + errors[0].desc = Tango::string_dup(desc); delete[] desc; - errors[0].desc = CORBA::string_dup(origin.c_str()); throw Tango::DevFailed(errors); } @@ -879,10 +879,10 @@ class Except long nb_err = ex.errors.length(); ex.errors.length(nb_err + 1); - ex.errors[nb_err].desc = CORBA::string_dup(desc); + ex.errors[nb_err].desc = Tango::string_dup(desc); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason); - ex.errors[nb_err].origin = CORBA::string_dup(origin); + ex.errors[nb_err].reason = Tango::string_dup(reason); + ex.errors[nb_err].origin = Tango::string_dup(origin); throw ex; } @@ -916,10 +916,10 @@ class Except long nb_err = ex.errors.length(); ex.errors.length(nb_err + 1); - ex.errors[nb_err].desc = CORBA::string_dup(desc); + ex.errors[nb_err].desc = Tango::string_dup(desc); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason); - ex.errors[nb_err].origin = CORBA::string_dup(origin); + ex.errors[nb_err].reason = Tango::string_dup(reason); + ex.errors[nb_err].origin = Tango::string_dup(origin); delete[] origin; throw ex; @@ -955,10 +955,10 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].desc = CORBA::string_dup(desc); + ex.errors[nb_err].desc = Tango::string_dup(desc); delete[] desc; - ex.errors[nb_err].origin = CORBA::string_dup(origin); - ex.errors[nb_err].reason = CORBA::string_dup(reason); + ex.errors[nb_err].origin = Tango::string_dup(origin); + ex.errors[nb_err].reason = Tango::string_dup(reason); throw ex; } @@ -992,10 +992,10 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason); - ex.errors[nb_err].origin = CORBA::string_dup(origin); + ex.errors[nb_err].reason = Tango::string_dup(reason); + ex.errors[nb_err].origin = Tango::string_dup(origin); delete[] origin; - ex.errors[nb_err].desc = CORBA::string_dup(desc); + ex.errors[nb_err].desc = Tango::string_dup(desc); delete[] desc; throw ex; @@ -1031,10 +1031,10 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason); + ex.errors[nb_err].reason = Tango::string_dup(reason); delete[] reason; - ex.errors[nb_err].origin = CORBA::string_dup(origin); - ex.errors[nb_err].desc = CORBA::string_dup(desc); + ex.errors[nb_err].origin = Tango::string_dup(origin); + ex.errors[nb_err].desc = Tango::string_dup(desc); throw ex; } @@ -1069,11 +1069,11 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason); + ex.errors[nb_err].reason = Tango::string_dup(reason); delete[] reason; - ex.errors[nb_err].origin = CORBA::string_dup(origin); + ex.errors[nb_err].origin = Tango::string_dup(origin); delete[] origin; - ex.errors[nb_err].desc = CORBA::string_dup(desc); + ex.errors[nb_err].desc = Tango::string_dup(desc); throw ex; } @@ -1108,10 +1108,10 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason); + ex.errors[nb_err].reason = Tango::string_dup(reason); delete[] reason; - ex.errors[nb_err].origin = CORBA::string_dup(origin); - ex.errors[nb_err].desc = CORBA::string_dup(desc); + ex.errors[nb_err].origin = Tango::string_dup(origin); + ex.errors[nb_err].desc = Tango::string_dup(desc); delete[] desc; throw ex; @@ -1147,11 +1147,11 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason); + ex.errors[nb_err].reason = Tango::string_dup(reason); delete[] reason; - ex.errors[nb_err].origin = CORBA::string_dup(origin); + ex.errors[nb_err].origin = Tango::string_dup(origin); delete[] origin; - ex.errors[nb_err].desc = CORBA::string_dup(desc); + ex.errors[nb_err].desc = Tango::string_dup(desc); delete[] desc; throw ex; @@ -1186,9 +1186,9 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason.c_str()); - ex.errors[nb_err].origin = CORBA::string_dup(origin.c_str()); - ex.errors[nb_err].desc = CORBA::string_dup(desc.c_str()); + ex.errors[nb_err].reason = Tango::string_dup(reason.c_str()); + ex.errors[nb_err].origin = Tango::string_dup(origin.c_str()); + ex.errors[nb_err].desc = Tango::string_dup(desc.c_str()); throw ex; } @@ -1222,9 +1222,9 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason.c_str()); - ex.errors[nb_err].origin = CORBA::string_dup(origin); - ex.errors[nb_err].desc = CORBA::string_dup(desc.c_str()); + ex.errors[nb_err].reason = Tango::string_dup(reason.c_str()); + ex.errors[nb_err].origin = Tango::string_dup(origin); + ex.errors[nb_err].desc = Tango::string_dup(desc.c_str()); throw ex; } @@ -1258,9 +1258,9 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason.c_str()); - ex.errors[nb_err].origin = CORBA::string_dup(desc); - ex.errors[nb_err].desc = CORBA::string_dup(origin.c_str()); + ex.errors[nb_err].reason = Tango::string_dup(reason.c_str()); + ex.errors[nb_err].origin = Tango::string_dup(origin.c_str()); + ex.errors[nb_err].desc = Tango::string_dup(desc); throw ex; } @@ -1294,9 +1294,9 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason.c_str()); - ex.errors[nb_err].origin = CORBA::string_dup(origin); - ex.errors[nb_err].desc = CORBA::string_dup(desc); + ex.errors[nb_err].reason = Tango::string_dup(reason.c_str()); + ex.errors[nb_err].origin = Tango::string_dup(origin); + ex.errors[nb_err].desc = Tango::string_dup(desc); throw ex; } @@ -1330,9 +1330,9 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason); - ex.errors[nb_err].origin = CORBA::string_dup(origin.c_str()); - ex.errors[nb_err].desc = CORBA::string_dup(desc.c_str()); + ex.errors[nb_err].reason = Tango::string_dup(reason); + ex.errors[nb_err].origin = Tango::string_dup(origin.c_str()); + ex.errors[nb_err].desc = Tango::string_dup(desc.c_str()); throw ex; } @@ -1366,9 +1366,9 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason); - ex.errors[nb_err].origin = CORBA::string_dup(origin); - ex.errors[nb_err].desc = CORBA::string_dup(desc.c_str()); + ex.errors[nb_err].reason = Tango::string_dup(reason); + ex.errors[nb_err].origin = Tango::string_dup(origin); + ex.errors[nb_err].desc = Tango::string_dup(desc.c_str()); throw ex; } @@ -1402,9 +1402,9 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason); - ex.errors[nb_err].origin = CORBA::string_dup(desc); - ex.errors[nb_err].desc = CORBA::string_dup(origin.c_str()); + ex.errors[nb_err].reason = Tango::string_dup(reason); + ex.errors[nb_err].origin = Tango::string_dup(origin.c_str()); + ex.errors[nb_err].desc = Tango::string_dup(desc); throw ex; } @@ -1439,10 +1439,10 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason.c_str()); - ex.errors[nb_err].origin = CORBA::string_dup(origin); + ex.errors[nb_err].reason = Tango::string_dup(reason.c_str()); + ex.errors[nb_err].origin = Tango::string_dup(origin); delete[] origin; - ex.errors[nb_err].desc = CORBA::string_dup(desc.c_str()); + ex.errors[nb_err].desc = Tango::string_dup(desc.c_str()); throw ex; } @@ -1477,10 +1477,10 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason.c_str()); - ex.errors[nb_err].origin = CORBA::string_dup(desc); + ex.errors[nb_err].reason = Tango::string_dup(reason.c_str()); + ex.errors[nb_err].origin = Tango::string_dup(origin.c_str()); + ex.errors[nb_err].desc = Tango::string_dup(desc); delete[] desc; - ex.errors[nb_err].desc = CORBA::string_dup(origin.c_str()); throw ex; } @@ -1515,10 +1515,10 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason.c_str()); - ex.errors[nb_err].origin = CORBA::string_dup(origin); + ex.errors[nb_err].reason = Tango::string_dup(reason.c_str()); + ex.errors[nb_err].origin = Tango::string_dup(origin); delete[] origin; - ex.errors[nb_err].desc = CORBA::string_dup(desc); + ex.errors[nb_err].desc = Tango::string_dup(desc); delete desc; throw ex; @@ -1554,10 +1554,10 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason); + ex.errors[nb_err].reason = Tango::string_dup(reason); delete[] reason; - ex.errors[nb_err].origin = CORBA::string_dup(origin.c_str()); - ex.errors[nb_err].desc = CORBA::string_dup(desc.c_str()); + ex.errors[nb_err].origin = Tango::string_dup(origin.c_str()); + ex.errors[nb_err].desc = Tango::string_dup(desc.c_str()); throw ex; } @@ -1592,11 +1592,11 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason); + ex.errors[nb_err].reason = Tango::string_dup(reason); delete[] reason; - ex.errors[nb_err].origin = CORBA::string_dup(origin); + ex.errors[nb_err].origin = Tango::string_dup(origin); delete[] origin; - ex.errors[nb_err].desc = CORBA::string_dup(desc.c_str()); + ex.errors[nb_err].desc = Tango::string_dup(desc.c_str()); throw ex; } @@ -1631,11 +1631,11 @@ class Except ex.errors.length(nb_err + 1); ex.errors[nb_err].severity = sever; - ex.errors[nb_err].reason = CORBA::string_dup(reason); + ex.errors[nb_err].reason = Tango::string_dup(reason); delete[] reason; - ex.errors[nb_err].origin = CORBA::string_dup(desc); + ex.errors[nb_err].origin = Tango::string_dup(origin.c_str()); + ex.errors[nb_err].desc = Tango::string_dup(desc); delete[] desc; - ex.errors[nb_err].desc = CORBA::string_dup(origin.c_str()); throw ex; } @@ -1734,13 +1734,13 @@ class Except Tango::NamedDevErrorList errors(1); errors.length(1); - errors[0].name = CORBA::string_dup(att_name); + errors[0].name = Tango::string_dup(att_name); errors[0].index_in_call = 999; errors[0].err_list.length(1); - errors[0].err_list[0].desc = CORBA::string_dup(desc); + errors[0].err_list[0].desc = Tango::string_dup(desc); errors[0].err_list[0].severity = sever; - errors[0].err_list[0].reason = CORBA::string_dup(reason); - errors[0].err_list[0].origin = CORBA::string_dup(origin); + errors[0].err_list[0].reason = Tango::string_dup(reason); + errors[0].err_list[0].origin = Tango::string_dup(origin); throw Tango::MultiDevFailed(errors); } @@ -1775,13 +1775,13 @@ class Except errors.length(a_size); for (unsigned int loop = 0;loop < a_size;loop++) { - errors[loop].name = CORBA::string_dup(atts[loop].c_str()); + errors[loop].name = Tango::string_dup(atts[loop].c_str()); errors[loop].index_in_call = 999; errors[loop].err_list.length(1); - errors[loop].err_list[0].desc = CORBA::string_dup(desc); + errors[loop].err_list[0].desc = Tango::string_dup(desc); errors[loop].err_list[0].severity = sever; - errors[loop].err_list[0].reason = CORBA::string_dup(reason); - errors[loop].err_list[0].origin = CORBA::string_dup(origin); + errors[loop].err_list[0].reason = Tango::string_dup(reason); + errors[loop].err_list[0].origin = Tango::string_dup(origin); } throw Tango::MultiDevFailed(errors); diff --git a/cppapi/server/fwdattrdesc.h b/include/tango/server/fwdattrdesc.h similarity index 100% rename from cppapi/server/fwdattrdesc.h rename to include/tango/server/fwdattrdesc.h diff --git a/cppapi/server/fwdattribute.h b/include/tango/server/fwdattribute.h similarity index 100% rename from cppapi/server/fwdattribute.h rename to include/tango/server/fwdattribute.h diff --git a/cppapi/server/fwdattribute.tpp b/include/tango/server/fwdattribute.tpp similarity index 100% rename from cppapi/server/fwdattribute.tpp rename to include/tango/server/fwdattribute.tpp diff --git a/cppapi/server/fwdattribute_spec.tpp b/include/tango/server/fwdattribute_spec.tpp similarity index 100% rename from cppapi/server/fwdattribute_spec.tpp rename to include/tango/server/fwdattribute_spec.tpp diff --git a/cppapi/server/log4tango.h b/include/tango/server/log4tango.h similarity index 97% rename from cppapi/server/log4tango.h rename to include/tango/server/log4tango.h index 72a03b2f4..4748f4a92 100644 --- a/cppapi/server/log4tango.h +++ b/include/tango/server/log4tango.h @@ -43,8 +43,8 @@ //------------------------------------------------------------- // REQUIRED TANGO LOGGING STUFFS //------------------------------------------------------------- -#include -#include +#include +#include //------------------------------------------------------------- // LOGGING MACROS (FOR DEVICE DEVELOPERS) diff --git a/cppapi/server/logcmds.h b/include/tango/server/logcmds.h similarity index 100% rename from cppapi/server/logcmds.h rename to include/tango/server/logcmds.h diff --git a/cppapi/server/logging.h b/include/tango/server/logging.h similarity index 100% rename from cppapi/server/logging.h rename to include/tango/server/logging.h diff --git a/cppapi/server/logstream.h b/include/tango/server/logstream.h similarity index 100% rename from cppapi/server/logstream.h rename to include/tango/server/logstream.h diff --git a/cppapi/server/multiattribute.h b/include/tango/server/multiattribute.h similarity index 100% rename from cppapi/server/multiattribute.h rename to include/tango/server/multiattribute.h diff --git a/cppapi/server/ntservice.h b/include/tango/server/ntservice.h similarity index 99% rename from cppapi/server/ntservice.h rename to include/tango/server/ntservice.h index 8d0a065d0..03040083d 100644 --- a/cppapi/server/ntservice.h +++ b/include/tango/server/ntservice.h @@ -21,7 +21,7 @@ #ifndef _NTSERVICE_H #define _NTSERVICE_H -#include +#include "../../tango.h" using namespace std; diff --git a/cppapi/server/pipe.h b/include/tango/server/pipe.h similarity index 100% rename from cppapi/server/pipe.h rename to include/tango/server/pipe.h diff --git a/cppapi/server/pipe.tpp b/include/tango/server/pipe.tpp similarity index 100% rename from cppapi/server/pipe.tpp rename to include/tango/server/pipe.tpp diff --git a/cppapi/server/pipedesc.h b/include/tango/server/pipedesc.h similarity index 100% rename from cppapi/server/pipedesc.h rename to include/tango/server/pipedesc.h diff --git a/cppapi/server/pollcmds.h b/include/tango/server/pollcmds.h similarity index 100% rename from cppapi/server/pollcmds.h rename to include/tango/server/pollcmds.h diff --git a/cppapi/server/pollext.h b/include/tango/server/pollext.h similarity index 100% rename from cppapi/server/pollext.h rename to include/tango/server/pollext.h diff --git a/cppapi/server/pollext.tpp b/include/tango/server/pollext.tpp similarity index 100% rename from cppapi/server/pollext.tpp rename to include/tango/server/pollext.tpp diff --git a/cppapi/server/pollobj.h b/include/tango/server/pollobj.h similarity index 99% rename from cppapi/server/pollobj.h rename to include/tango/server/pollobj.h index 9c2227afa..3d1a77a95 100644 --- a/cppapi/server/pollobj.h +++ b/include/tango/server/pollobj.h @@ -39,7 +39,7 @@ #define _POLLOBJ_H #include -#include +#include namespace Tango { diff --git a/cppapi/server/pollring.h b/include/tango/server/pollring.h similarity index 100% rename from cppapi/server/pollring.h rename to include/tango/server/pollring.h diff --git a/cppapi/server/pollring.tpp b/include/tango/server/pollring.tpp similarity index 99% rename from cppapi/server/pollring.tpp rename to include/tango/server/pollring.tpp index a73d41fe6..7ddcec6c9 100644 --- a/cppapi/server/pollring.tpp +++ b/include/tango/server/pollring.tpp @@ -195,13 +195,13 @@ void PollRing::force_copy_data(T *attr_value) union_seq.length(tmp_seq.length()); - union_seq[0].encoded_format = CORBA::string_dup(tmp_seq[0].encoded_format); + union_seq[0].encoded_format = Tango::string_dup(tmp_seq[0].encoded_format); unsigned long nb_data = tmp_seq[0].encoded_data.length(); union_seq[0].encoded_data.replace(nb_data,nb_data,tmp_seq[0].encoded_data.get_buffer(true),true); if (tmp_seq.length() == 2) { - union_seq[1].encoded_format = CORBA::string_dup(tmp_seq[1].encoded_format); + union_seq[1].encoded_format = Tango::string_dup(tmp_seq[1].encoded_format); unsigned long nb_data = tmp_seq[1].encoded_data.length(); union_seq[1].encoded_data.replace(nb_data,nb_data,tmp_seq[1].encoded_data.get_buffer(true),true); } diff --git a/cppapi/server/pollthread.h b/include/tango/server/pollthread.h similarity index 98% rename from cppapi/server/pollthread.h rename to include/tango/server/pollthread.h index 188e716e0..aba1c90fd 100644 --- a/cppapi/server/pollthread.h +++ b/include/tango/server/pollthread.h @@ -37,8 +37,8 @@ #define _POLLTHREAD_H #include -#include -#include +#include +#include #include diff --git a/cppapi/server/pollthread.tpp b/include/tango/server/pollthread.tpp similarity index 100% rename from cppapi/server/pollthread.tpp rename to include/tango/server/pollthread.tpp diff --git a/cppapi/server/readers_writers_lock.h b/include/tango/server/readers_writers_lock.h similarity index 100% rename from cppapi/server/readers_writers_lock.h rename to include/tango/server/readers_writers_lock.h diff --git a/cppapi/server/rootattreg.h b/include/tango/server/rootattreg.h similarity index 100% rename from cppapi/server/rootattreg.h rename to include/tango/server/rootattreg.h diff --git a/cppapi/server/seqvec.h b/include/tango/server/seqvec.h similarity index 97% rename from cppapi/server/seqvec.h rename to include/tango/server/seqvec.h index f2d174d4d..c55844280 100644 --- a/cppapi/server/seqvec.h +++ b/include/tango/server/seqvec.h @@ -77,7 +77,7 @@ namespace Tango inline void operator<<(DevVarCharArray &lval,const vector &rval) { size_t nb_elt = rval.size(); - lval.length((CORBA::ULong)nb_elt); + lval.length((DevULong)nb_elt); for (unsigned long i = 0;i < nb_elt;i++) lval[i] = rval[i]; } @@ -116,7 +116,7 @@ inline void operator<<(vector &lval,const DevVarCharArray &rval) inline void operator<<(DevVarShortArray &lval,const vector &rval) { size_t nb_elt = rval.size(); - lval.length((CORBA::ULong)nb_elt); + lval.length((DevULong)nb_elt); for (unsigned long i = 0;i < nb_elt;i++) lval[i] = rval[i]; } @@ -154,7 +154,7 @@ inline void operator<<(vector &lval,const DevVarShortArray &rval) inline void operator<<(DevVarLongArray &lval,const vector &rval) { size_t nb_elt = rval.size(); - lval.length((CORBA::ULong)nb_elt); + lval.length((DevULong)nb_elt); for (unsigned long i = 0;i < nb_elt;i++) lval[i] = rval[i]; } @@ -193,7 +193,7 @@ inline void operator<<(vector &lval,const DevVarLongArray &rval) inline void operator<<(DevVarLong64Array &lval,const vector &rval) { size_t nb_elt = rval.size(); - lval.length((CORBA::ULong)nb_elt); + lval.length((DevULong)nb_elt); for (unsigned long i = 0;i < nb_elt;i++) lval[i] = rval[i]; } @@ -231,7 +231,7 @@ inline void operator<<(vector &lval,const DevVarLong64Array &rval) inline void operator<<(DevVarFloatArray &lval,const vector &rval) { size_t nb_elt = rval.size(); - lval.length((CORBA::ULong)nb_elt); + lval.length((DevULong)nb_elt); for (unsigned long i = 0;i < nb_elt;i++) lval[i] = rval[i]; } @@ -270,7 +270,7 @@ inline void operator<<(vector &lval,const DevVarFloatArray &rval) inline void operator<<(DevVarDoubleArray &lval,const vector &rval) { size_t nb_elt = rval.size(); - lval.length((CORBA::ULong)nb_elt); + lval.length((DevULong)nb_elt); for (unsigned long i = 0;i < nb_elt;i++) lval[i] = rval[i]; } @@ -310,7 +310,7 @@ inline void operator<<(vector &lval,const DevVarDoubleArray &rval) inline void operator<<(DevVarBooleanArray &lval,const vector &rval) { size_t nb_elt = rval.size(); - lval.length((CORBA::ULong)nb_elt); + lval.length((DevULong)nb_elt); for (unsigned long i = 0;i < nb_elt;i++) lval[i] = rval[i]; } @@ -349,7 +349,7 @@ inline void operator<<(vector &lval,const DevVarBooleanArray &rval) inline void operator<<(DevVarUShortArray &lval,const vector &rval) { size_t nb_elt = rval.size(); - lval.length((CORBA::ULong)nb_elt); + lval.length((DevULong)nb_elt); for (unsigned long i = 0;i < nb_elt;i++) lval[i] = rval[i]; } @@ -389,7 +389,7 @@ inline void operator<<(vector &lval,const DevVarUShortArray &rva inline void operator<<(DevVarULongArray &lval,const vector &rval) { size_t nb_elt = rval.size(); - lval.length((CORBA::ULong)nb_elt); + lval.length((DevULong)nb_elt); for (unsigned long i = 0;i < nb_elt;i++) lval[i] = rval[i]; } @@ -429,7 +429,7 @@ inline void operator<<(vector &lval,const DevVarULongArray &rval) inline void operator<<(DevVarULong64Array &lval,const vector &rval) { size_t nb_elt = rval.size(); - lval.length((CORBA::ULong)nb_elt); + lval.length((DevULong)nb_elt); for (unsigned long i = 0;i < nb_elt;i++) lval[i] = rval[i]; } @@ -467,9 +467,9 @@ inline void operator<<(vector &lval,const DevVarULong64Array &rval) inline void operator<<(DevVarStringArray &lval,const vector &rval) { size_t nb_elt = rval.size(); - lval.length((CORBA::ULong)nb_elt); + lval.length((DevULong)nb_elt); for (unsigned long i = 0;i < nb_elt;i++) - lval[i] = CORBA::string_dup(rval[i].c_str()); + lval[i] = Tango::string_dup(rval[i].c_str()); } /** @@ -509,7 +509,7 @@ inline void operator<<(vector &lval,const DevVarStringArray &rval) inline void operator<<(DevVarStateArray &lval,const vector &rval) { size_t nb_elt = rval.size(); - lval.length((CORBA::ULong)nb_elt); + lval.length((DevULong)nb_elt); for (unsigned long i = 0;i < nb_elt;i++) lval[i] = rval[i]; } diff --git a/cppapi/server/subdev_diag.h b/include/tango/server/subdev_diag.h similarity index 100% rename from cppapi/server/subdev_diag.h rename to include/tango/server/subdev_diag.h diff --git a/cppapi/server/tango_config.h b/include/tango/server/tango_config.h similarity index 100% rename from cppapi/server/tango_config.h rename to include/tango/server/tango_config.h diff --git a/cppapi/server/tango_const.h b/include/tango/server/tango_const.h similarity index 99% rename from cppapi/server/tango_const.h rename to include/tango/server/tango_const.h index 113f37914..dd1056d9d 100644 --- a/cppapi/server/tango_const.h +++ b/include/tango/server/tango_const.h @@ -455,13 +455,6 @@ const char* const API_WrongNumberOfArgs = "API_WrongNumberOfArgs"; const char* const API_ZmqFailed = "API_ZmqFailed"; const char* const API_ZmqInitFailed = "API_ZmqInitFailed"; -// -// A short inline function to hide the CORBA::string_dup function -// - -inline char * string_dup(char *s) {return CORBA::string_dup(s);} -inline char * string_dup(const char *s) {return CORBA::string_dup(s);} - // // Many, many typedef // diff --git a/cppapi/server/tango_monitor.h b/include/tango/server/tango_monitor.h similarity index 100% rename from cppapi/server/tango_monitor.h rename to include/tango/server/tango_monitor.h diff --git a/cppapi/server/tangoappender.h b/include/tango/server/tangoappender.h similarity index 100% rename from cppapi/server/tangoappender.h rename to include/tango/server/tangoappender.h diff --git a/cppapi/server/tangorollingfileappender.h b/include/tango/server/tangorollingfileappender.h similarity index 100% rename from cppapi/server/tangorollingfileappender.h rename to include/tango/server/tangorollingfileappender.h diff --git a/cppapi/server/utils.h b/include/tango/server/utils.h similarity index 99% rename from cppapi/server/utils.h rename to include/tango/server/utils.h index 11a89baec..283f51536 100644 --- a/cppapi/server/utils.h +++ b/include/tango/server/utils.h @@ -36,11 +36,11 @@ #define _UTILS_H #include -#include -#include +#include +#include #include -#include -#include +#include +#include #ifndef _TG_WINDOWS_ #include diff --git a/cppapi/server/utils.tpp b/include/tango/server/utils.tpp similarity index 99% rename from cppapi/server/utils.tpp rename to include/tango/server/utils.tpp index 7ea3d4a87..7e4c8a7f1 100644 --- a/cppapi/server/utils.tpp +++ b/include/tango/server/utils.tpp @@ -280,7 +280,7 @@ void Util::fill_attr_polling_buffer(DeviceImpl *dev,string &att_name,AttrHistory (*aid.data_5)[0].time.tv_nsec = 0; (*aid.data_5)[0].quality = qu; - (*aid.data_5)[0].name = CORBA::string_dup(att_name.c_str()); + (*aid.data_5)[0].name = Tango::string_dup(att_name.c_str()); (*aid.data_5)[0].w_dim.dim_x = 0; (*aid.data_5)[0].w_dim.dim_y = 0; @@ -297,7 +297,7 @@ void Util::fill_attr_polling_buffer(DeviceImpl *dev,string &att_name,AttrHistory (*aid.data_4)[0].time.tv_nsec = 0; (*aid.data_4)[0].quality = qu; - (*aid.data_4)[0].name = CORBA::string_dup(att_name.c_str()); + (*aid.data_4)[0].name = Tango::string_dup(att_name.c_str()); (*aid.data_4)[0].w_dim.dim_x = 0; (*aid.data_4)[0].w_dim.dim_y = 0; @@ -313,7 +313,7 @@ void Util::fill_attr_polling_buffer(DeviceImpl *dev,string &att_name,AttrHistory (*aid.data_3)[0].time.tv_nsec = 0; (*aid.data_3)[0].quality = qu; - (*aid.data_3)[0].name = CORBA::string_dup(att_name.c_str()); + (*aid.data_3)[0].name = Tango::string_dup(att_name.c_str()); (*aid.data_3)[0].w_dim.dim_x = 0; (*aid.data_3)[0].w_dim.dim_y = 0; diff --git a/cppapi/server/utils_spec.tpp b/include/tango/server/utils_spec.tpp similarity index 100% rename from cppapi/server/utils_spec.tpp rename to include/tango/server/utils_spec.tpp diff --git a/cppapi/server/w32win.h b/include/tango/server/w32win.h similarity index 98% rename from cppapi/server/w32win.h rename to include/tango/server/w32win.h index f5e5356d8..285a0275f 100644 --- a/cppapi/server/w32win.h +++ b/include/tango/server/w32win.h @@ -35,7 +35,7 @@ #ifndef _W32WIN_H #define _W32WIN_H -#include +#include "../../tango.h" namespace Tango { diff --git a/cppapi/server/w_attribute.h b/include/tango/server/w_attribute.h similarity index 99% rename from cppapi/server/w_attribute.h rename to include/tango/server/w_attribute.h index 9e70a4371..6daffc501 100644 --- a/cppapi/server/w_attribute.h +++ b/include/tango/server/w_attribute.h @@ -36,7 +36,7 @@ #define _WATTRIBUTE_H #include -#include +#include #include #include diff --git a/cppapi/server/w_attribute.tpp b/include/tango/server/w_attribute.tpp similarity index 100% rename from cppapi/server/w_attribute.tpp rename to include/tango/server/w_attribute.tpp diff --git a/cppapi/server/w_attribute_spec.tpp b/include/tango/server/w_attribute_spec.tpp similarity index 100% rename from cppapi/server/w_attribute_spec.tpp rename to include/tango/server/w_attribute_spec.tpp diff --git a/cppapi/server/w_attrsetval.tpp b/include/tango/server/w_attrsetval.tpp similarity index 100% rename from cppapi/server/w_attrsetval.tpp rename to include/tango/server/w_attrsetval.tpp diff --git a/cppapi/server/w_pipe.h b/include/tango/server/w_pipe.h similarity index 100% rename from cppapi/server/w_pipe.h rename to include/tango/server/w_pipe.h diff --git a/cppapi/server/w_pipe.tpp b/include/tango/server/w_pipe.tpp similarity index 100% rename from cppapi/server/w_pipe.tpp rename to include/tango/server/w_pipe.tpp diff --git a/log4tango/CMakeLists.txt b/log4tango/CMakeLists.txt deleted file mode 100644 index d5e9fc42e..000000000 --- a/log4tango/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# -# +1 : ? : +1 == new interface that does not break old one -# +1 : ? : 0 == new interface that breaks old one -# ? : ? : 0 == no new interfaces, but breaks apps -# ? :+1 : ? == just some internal changes, nothing breaks but might work -# better -# CURRENT : REVISION : AGE -set (LOG4TANGO_PACKAGE_URL "https://github.com/tango-controls/cppTango/log4tango") -set (LOG4TANGO_PACKAGE_BUGREPORT "https://github.com/tango-controls/cppTango/issues") - -include(${CMAKE_CURRENT_SOURCE_DIR}/config/config.cmake) - -add_subdirectory(include) -add_subdirectory(src) -add_subdirectory(tests) \ No newline at end of file diff --git a/log4tango/COPYING b/log4tango/COPYING deleted file mode 100644 index fc8a5de7e..000000000 --- a/log4tango/COPYING +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/log4tango/ChangeLog b/log4tango/ChangeLog deleted file mode 100644 index faeb804c4..000000000 --- a/log4tango/ChangeLog +++ /dev/null @@ -1,1113 +0,0 @@ -This file describes the changes to the Log for C++ library. See the CVS repository for more detailed descriptions. - -2002-10-29 Bastiaan Bakker - * Release as 0.3.4b - - * include/log4cp/config-win32.h, src/PortabilityImpl.hh: added - workarounds for abs() and strftime() and localtime() not being - defined in std:: on MSVC6. See bug report #630334. - -2002-10-28 Bastiaan Bakker - * Release as 0.3.4. - - * tests/testPattern.cpp: added missing 'std::'. - - * src/StringUtil.hh, src/StringUtil.cpp: fixed signed-vs-unsigned - comparison warning. Let both trim() implementations return - unsigned int. - -2002-10-27 Bastiaan Bakker - * include/log4tango/OstringStream.hh, src/OstringStream.cpp: removed - * src/StringUtil.hh, src/StringUtil.cpp: added vform() method. - * PortabilityImpl.cpp: added. - - * include/log4tango/Appender.hh, include/log4tango/HierachyMaintainer.hh, - include/log4tango/Log4cppCleanup.hh, src/Appender.cpp, - src/HierrachyMaintainer.cpp, src/log4tangoCleanup.cpp: - removed Log4cppCleanup, it was kinda broken anyway. - - * msvc6/log4tango/log4tango.dsp, msvc6/log4tangoDLL/log4tangoDLL.dsp, - bcb5/log4tango/log4tango.bpf, bcb5/log4tango/log4tango.bpr, - bcb5/log4tango/log4tango.mak: added BasicConfigurator. - - * src/PatternLayout.cpp: define static constant strings in - TimeStampComponent outside class declaration. - -2002-10-26 Bastiaan Bakker - * Release as 0.3.3. - - * include/log4tango/config-win32.h, src/PortabilityImpl.hh, - src/Makefile.am: worked around header definition bug in MSVC by - aliasing cstdlib/cstring functions in 'std::'. See #628211. - - * src/NDC.cpp: added parentheses to return statement in _get() as - suggested by Derrick Hastings to fix #415160. - - * include/log4tango/PattenLayout.hh, src/PatternLayout.cpp: added - default conversion patterns. - - * msvc6/log4tangoDLL/Makefile.in: removed. - -2002-10-19 Bastiaan Bakker - * include/log4tango/PatternLayout.hh, src/PatternLayout.cpp: - replaced PatternLayout implementation: it now preparses the message - format for quicker layouting and implements format specifiers, - e.g. '%-5p'. - * tests/testPattern.cpp: added tests for format specifiers and more. - -2002-10-10 Bastiaan Bakker - * include/log4tango/threading/MSThreads.hh: added #include - -2002-10-05 Bastiaan Bakker - * log4tango.spec.in: don't require log4tango for log4tango-doc. - - * doc/Makefile.am: fix install location. - - * Makefile.am: use 'rpmbuild' instead of 'rpm'. - -2002-10-05 Bastiaan Bakker - * release as 0.3.2 - - * doc/html/index.html: added notes for 0.3.2 and 0.3.2rc5 - - * configure.in, msvc6/Makefile.am, msvc6/testDLL/Makefile.am, - msvc6/testMain/Makefile.am, msvc6/testNTEventLog/Makefile.am, - msvc6/testPattern/Makefile.am: added missing makefiles. - -2002-09-26 Bastiaan Bakker - * src/StringUtil.hh: fix compilation problem on Sun CC 5.3 - (bug #614903). - -2002-09-18 Bastiaan Bakker - * src/RemoteSyslogAppender.cpp: fixed log facility in _append(), as - reported by Derek Atkins. - - * src/PropertyConfiguratorImpl.cpp, src/SimpleConfigurator.cpp: - multiply syslog facility value by 8. - -2002-09-17 Bastiaan Bakker - * log4tango.spec.in: fix relocatability of log4tango-devel by patching - lib/liblog4tango.la and bin/log4tango-config in %post. Unfortunately - this results in 'rpm --verify' reporting these files as modified. - -2002-09-15 Bastiaan Bakker - * release as 0.3.25rc5 - - * include/threading/DummyThreads.hh, include/threading/MSThreads.hh, - include/threading/OmniThreads.hh, include/threading/Pthreads.hh, - src/DummyThreads.cpp, src/MSThreads.cpp, src/OmniThreads.cpp, - src/Pthreads.cpp: moved bodies of getThreadId() to .cpp files. - - * src/Makefile.am, msvc6/log4tango/log4tango.dsp, - msvc6/log4tangoDLL/log4tangoDLL.dsp, bcb5/log4tango/log4tango.mak, - bcb5/log4tango/log4tango.bpr, bcb5/log4tango/log4tango.bpf: added *Threads.cpp - files - - * configure.in, include/log4tango/Appender.hh, - include/log4tango/AppenderSkeleton.hh, m4/BB_CHECK_PTHREADS.m4, - m4/PETI_PEDANTIC_GCC.m4, src/FileAppender.cpp, src/Level.cpp, - src/Properties.cpp, src/PropertyConfiguratorImpl.hh, - src/RemoteSyslogAppender.cpp,src/StringUtil.hh, tests/Clock.cpp, - tests/Clock.hh, tests/testConfig.cpp, tests/testPropertyConfig.cpp, - tests/testbench.cpp: - Merged patch #605143, contributed by Harald Wellman: support for - compilation in QNX Neutrino. - -2002-09-05 Bastiaan Bakker - * src/PropertyConfiguratorImpl.cpp, tests/testConfig.log4tango.properties: - Merged patch #604991, contributed by Richard Brodie: support for - setting additivity via properties file using - 'log4j.addivity.=[true|false]'. - -2002-08-16 Bastiaan Bakker - * include/log4tango/threading/Makefile.am: added MSThreads.hh - -2002-08-16 Bastiaan Bakker - * Release as 0.3.2rc3 - - * src/SimpleConfigurator.cpp, src/PropertyConfiguratorImpl.cpp: - put #ifdef WIN32 around #include of NTEventLogAppender and - Win32DebugAppender. - - * include/log4tango/threading/PThreads.hh: use reinterpret_cast<>. - - * tests/testProperties.cpp: add std::. - -2002-08-14 Bastiaan Bakker - * Release as 0.3.2rc2 - - * Makefile.am, include/log4tango/Makefile.am, tests/Makefile.am: - added distclean-local targets. - - * doc/Doxyfile.in: predefine 'WIN32' as suggested by David Resnick. - * include/log4tango/NTEventLogAppender.hh, - include/log4tango/Win32DebugAppender.hh: added warnings about platform - dependency. - -2002-08-13 David Resnick - * include/log4tango/PatternLayout.hh: documentation fixes. - -2002-08-09 Bastiaan Bakker - * msvc6/log4tangoDLL/log4tangoDLL.rc: update version and product info. - - * include/log4tango/Portability.hh: added comments. - - * src/Category.cpp: added lock to getAllAppenders(). - - * doc/html/index.html: more documentation updates. - - * tests/testCategory.cpp, tests/testConfig.cpp, tests/testDLL.cpp, - tests/testFilter.cpp, tests/testPropConfig.cpp, - tests/testbench.cpp: Replaced #include "log4tango/X" with - #include - - * tests/testProperties.cpp, tests/testPropertyConfig.cpp: added. - - * configure.in, doc/Makefile.am, doc/html/Makefile.am: added doc/html - to automake. - -2002-08-09 Bastiaan Bakker - * include/log4tango/RollingFileAppender.hh: correct constness of - constructor parameters, as pointed out by James Emery. - -2002-08-06 Bastiaan Bakker - * configure.ac, configure.in: renamed configure.ac back to - configure.in due to bug in libtoolize 1.4.2 - - * NEWS, README, INSTALL, doc/html/index.html: converted most - documentation to HTML. - - * m4/CREATE_GENERIC_CONFIG.m4: fix log4tango-config creation (use - PACKAGE_TARNAME instead of PACKAGE). - -2002-08-06 David Resnick - * msvc6/log4tangoDLL/log4tangoDLL.rc: Cleanup. - * msvc6/log4tangoDLL/resource.h deleted: Unnecessary. - -2002-08-05 David Resnick - * msvc6/log4tangoDLL/log4tangoDLL.rc, msvc6/log4tangoDLL/resource.h: - Version property sheet added to DLL. - -2002-08-04 David Resnick - * src/PropertyConfiguratorImpl.cpp: added RollingFileAppender, - NTEventLogAppender. Threshold attrib added for appenders. Invalid - level in configureCategory prints message of invalid_argument - exception. - * src/Level.cpp: surrounding quotes added around invalid level - in thrown invalid_argument exception. - * tests/testPropConfig.cpp, tests/log4tango.property, - msvc6\testPropConfig\testPropConfig.dsp: test for PropertyConfigurator - added. - -2002-08-02 Bastiaan Bakker - * doc/Makefile.am, doc/Doxyfile.in, doc/html/index.html, - doc/html/default.css: added new index page and move Doxygen generated - docs to api subdirectory. - -2002-08-01 Bastiaan Bakker - * include/log4tango/threading/PThreads.hh: added POSIX threads support - file contributed by Emiliano Martin. - * include/log4tango/threading/Makefile.am, - include/log4tango/threading/Threading.hh: add PThreads.hh - * configure.ac: added test for POSIX threads - * m4/BB_CHECK_PTHREADS.m4: added. Crude initial pthreads check. Need - to nick a good macro somewhere else :-) - * m4/BB_CHECK_OMNITHREADS.m4: added 'thread safity' defines, needed - at least for STL. - * THANKS: added Emiliano. - -2002-07-30 Bastiaan Bakker - * include/log4tango/TimeStatemp.hh: added some doxygen comments - - * m4/AC_CREATE_PREFIX_CONFIG_H.m4: removed a debug print statement. - - * src/PropertyConfgiruratorImpl.cpp: added 'append' property for - FileAppender. - - * src/LoggingEvent.cpp: fill in the thread Id. - -2002-07-22 Bastiaan Bakker - * configure.in, configure.ac: renamed configure.in to configure.ac. - - * configure.ac, log4tango.spec.in, doc/Doxyfile.in, doc/Makefile.am, - m4/AC_CREATE_PREFIX_CONFIG_H.m4, m4/AC_CXX_HAVE_SSTREAM.m4, - m4/AC_CXX_NAMESPACES.m4, m4/BB_CHECK_OMNITHREADS.m4: - updated AC macros and variables to autoconf 2.50. - - * src/Level.cpp: put names[] in anonymous namespace instead of - declaring it static. This should solve Solaris 8 dynamic library - problem (see patch #583905). - -2002-07-11 Bastiaan Bakker - * src/PatternLayout.cpp: use std::string::size_type instead of int. - * src/PropertyConfiguratorImpl.cpp: use map.lower_bound() to determine - begin and end for appender and logger properties. - -2002-07-10 David Resnick - * src/PatternLayout.cpp, include/log4tango/PatternLayout.hh, - tests/testPattern.cpp, msvc6/testPattern/testPattern.dsp: added support - for formatting date and testing that new support. - - * tests/testDLL.cpp, msvc6/testDLL/testDLL.dsp: added project that - tests log4tango DLL (on win32 platform), including export of container - object. - - * msvc6/log4tango/log4tango.dsp, msvc6/log4tangoDLL/log4tangoDLL.dsp: fixed so - that PropertyConfigurator and attendant files are compiled in MSVC6. - -2002-07-09 Bastiaan Bakker - * src/StringUtil.hh, src/StringUtil.cpp: added a more generic split() - method taking an output_iterator instead of a vector to store the - result. - - * src/PropertyConfiguratorImpl.hh, src/PropertyConfiguratorImpl.cpp: - renamed addAppenders() to configureCategory(). - fixed configureCategory(): had a nested loop for priorities and - appenders. - replaced find(property, '.') with StringUtil::split() in several - places. - - * src/PropertyConfiguratorImpl.cpp: fixed configureCategory() fix. - -2002-07-05 Bastiaan Bakker - * src/StringUtil.hh, src/StringUtil.cpp: added split() method. - - * src/PropertyConfiguratorImpl.hh, src/PropertyConfiguratorImpl.hh: - changed the way configuration is done: first instantatiate all - Appenders defined in the config, then add them to Categories where - necessary. Multiple Appenders per Category are now supported. - Currently doConfigure() leaks all Appenders, as they will be not be - owned by any Categories. This will be fixed in the future by having - the LoggerRepository maintain ownership of all Categories, Appenders, - etc. - -2002-07-04 Bastiaan Bakker - * include/log4tango/BasicConfigurator.hh, src/BasicConfigurator.cpp: - added. - - * src/Properties.hh, src/Properties.cpp: added Log4j style variable - substitution: ${NAME} will be substituted with environment variable - NAME or if not found with property NAME. '${${}' denotes a literal - '${' sequence. - -2002-07-03 Bastiaan Bakker - * src/SyslogAppender.cpp (SysLogAppender()): accept '-1' for facility and portNumber, - implying the 'default value'. - - * src/ConfiguratorSkeleton.cpp: changed property names to JavaBeans/log4j style. - Use the appender name as name (duh) instead of the 'name' property. - Don't set a layout if none have been specified. - Use std::string::size_type where applicable. - Made some exception messages clearer. - Compacted the code a bit. - - * src/Properties.hh, src/Properties.cpp: added, moved - PropertyConfigurator::parseConfig() to load(). - * src/PropertyConfiguratorImpl.hh, src/PropertyConfiguratorImpl.cpp: - added. This class is a merge of PropertyConfigurator and - ConfiguratorSkeleton. ConfiguratorSkeleton is not generic enough to - be exposed in the API. - * include/log4tango/PropertyConfigurator.hh, - src/PropertyConfigurator.cpp: leave only 2 static configure() methods, - like SimpleConfigurator. The actual implementation is now in - PropertyConfiguratorImpl. - * include/log4tango/ConfiguratorSkeleton.hh, - src/ConfiguratorSkeleton.cpp: removed. - - * src/StringUtil.hh, src/StringUtil.cpp: added, contains - ConfiguratorSkeleton::trim(). - - * src/RollingFileAppender.cpp: fix signed/unsigned comparison warning. - - * m4/PETI_PEDANTIC_GCC.m4: remove -pedantic flag for g++ 2.96 to - get rid of those iritating warnings about std IOstreams code. - - * src/TimeStamp.cpp: replaced #include with . - - * src/PropertyConfiguratorImpl.cpp: use getString(), etc. to get - properties. - - * include/log4tango/Category.hh, include/log4tango/FixedContextCategory.hh, - include/log4tango/CategoryStream.hh: fixed documentation buglets. - -2002-07-02 Bastiaan Bakker - * include/log4tango/HierarchyMaintainer.hh, include/log4tango/Category.hh, - src/HierarchyMaintainer.cpp, src/Category.cpp: - Changed return type of getCurrentCategories() to std:vector. - vector<> is more efficient than set<> and works around MSVC++ DLL - export brain damage, see Microsoft Q168958. - - * include/log4tango/Configurator.hh, include/log4tango/ConfiguratorSkeleton.hh, - include/log4tango/SimpleConfigurator.hh, include/log4tango/PropertyConfigurator.hh, - src/Configurator.cpp, src/ConfiguratorSkeleton.cpp, src/SimpleConfigurator.cpp, - src/PropertyConfigurator.cpp: integrated PropertyConfigurator contributed by - Alan Anderson . - - * msvc6/log4tango/log4tango.dsp, bcb5/log4tango/log4tango.bpf, bcb5/log4tango/log4tango.bpr, - bcb5/log4tango/log4tango.mak: added PropertyConfigurator files. - -2002-06-19 Bastiaan Bakker - * src/Makefile.am: added NTEventlog.cpp and DllMain.cpp to sources. - * src/DllMan.cpp: enclosed in #ifdef LOG4TANGO_SUPPLY_DLLMAIN - * include/log4tango/config-win32.h: #define LOG4TANGO_SUPPLY_DLLMAIN - * include/log4tango/Makefile.am: added NTEventLog.hh - * msvc6/Makefile.am: added NTEventLogCategories. - -2002-06-18 Bastiaan Bakker - * src/NDC.cpp: fix top level context falling off, if depth > 2. - (reported by Hong Yang ) - * tests/testNDC.cpp: push 3 contexts to test for bug above. - -2002-06-17 Aaron Ingram - * Fixed default port for syslog in SimpleConfigurator.cpp - * Added a sample configuration file: log4tango.cfg - -2002-06-17 David Resnick - * Merge of MS Threads & DLL Build support patch by Aaron Ingram - with these changes: - * src/main.cpp renamed to src/DllMain.cpp - * Run-time library used for log4tangoDLL changed to - Multithreaded DLL (fixed need for #pragma warning(disable:4275)) - * pragma directives moved from various headers to - include/log4tango/Portability.hh. - * include/log4tango/threading/MSThreads.hh: reset(): TlsSetValue - uses parameter value instead of deleted one. - - * include/log4tango/NTEventLogAppender.hh, - src/NTEventLogAppender.cpp, msvc/NTEventLogAppender.mc, - tests/testNTEventLog.cpp: added NTEventLogAppender. - - * msvc/testMain/testMain.dsp, msvc/testNTEventLog/testNTEventLog.dsp - added. - -2002-06-03 Cedric Le Goater - * Makefile.am: added log4tango.m4 installation - * log4tango.m4: added aclocal support - * tests/Clock.cpp: fixed rdtscl() support on linux - -2002-05-22 Bastiaan Bakker - * include/log4tango/config-win32.h: fix compilation in Visual .NET. - -2002-05-12 Bastiaan Bakker - * src/RollingFileAppender.cpp: explicitly remove oldest file in - rollOver() because win98 cannot rename() to existing files. - (Paulo Pizarro) - - * Makefile.am: convert *.bpg files to CRLF in dist.(Paulo Pizarro) - - * bcb5/log4tango/log4tango.bpf, bcb5/log4tango/log4tango.bpr, - bcb5/log4tango/log4tango.mak, include/log4tango/Makefile.am, - msvc6/log4tango/log4tango.dsp, src/Makefile.am, - include/log4tango/Win32DebugAppender.hh, - src/Win32DebugAppender.cpp: added Win32DebugAppender contributed by - Alan Anderson. - -2002-04-21 Bastiaan Bakker - * include/log4tango/config-win32.h: added mode_t typedef. - - * m4/AC_C_INT64_T.m4: added #define of HAVE_STDINT_H. - * src/PatternLaout.cpp: #include only if available. - -2002-04-09 Bastiaan Bakker - * tests/Clock.cpp: test for i386 architecture on linux (patch #541608) - -2002-04-04 Bastiaan Bakker - * Release as 0.3.1 - - * src/Category.cpp: fix previous fix for bug #527467. - - * m4/PETI_PEDANTIC_GCC.m4: add -Wno-unused to g++ options. - - * configure.in: increment version to 0.3.1. - - * msvc6/log4tango/log4tango.dsp: Added RollingFileAppender and threading - files. - * bcb5/log4tango/log4tango.bpf, bcb5/log4tango/log4tango.bpr, - bcb5/log4tango/log4tango.mak: Added RollingFileAppender - -2002-03-31 Bastiaan Bakker - * include/log4tango/Portability.hh: Disable exception specifier - warnings (issue #536668) - -2002-03-27 Bastiaan Bakker - * m4/AC_C_INT64_T.m4: #include and remove $GCC check. - * src/PatternLayout.cpp: #include - - * configure.in, include/log4tango/Portability.hh: back out strcasecmp() - stuff. - -2002-03-22 Bastiaan Bakker - * include/log4tango/FileAppender.hh, src/FileAppender.cpp: - added 'append' and 'mode' options. - - * include/log4tango/RollingFileAppender.hh, include/log4tango/Makefile.am, - src/RollingFileAppender.cpp, src/SimpleConfigurator.cpp, - src/Makefile.am: added RollingFileAppender contributed by - Paulo Pizarro - -2002-03-20 Bastiaan Bakker - * include/log4tango/SimpleConfigurator.hh, src/SimpleConfigurator.cpp: - added configure(std::istream&) method. (feature request #527760) - - * src/Log4cppCleanup.cpp: set variable to NULL after delete. - (feature request #527393) - - * include/log4cp/Category.hh, include/log4tango/FixedContextCategory.hh, - src/Category.hh, src/Category.cpp: added getAllAppenders() method. - (feature request #527381) - - * src/Category.cpp: removeAllAppenders(): fix invalidated iterator - usage. (bug #527467) - -2002-03-17 Bastiaan Bakker - * tests/testbench.cpp: added missing 'std::' specifiers. (bug #530332) - - * src/SyslogAppender.cpp: fix format string bug. (bug #527475) - -2002-02-18 Bastiaan Bakker - * Release as 0.3.0 - - * INSTALL: added some platform specific build instructions. - - * tests/Clock.hh: replaced "long long" with int64_t. - - * src/OstringStream.cpp: fix typo. - - * src/Appender.cpp: added missing Mutex. - - * include/log4tango/threading/OmniThreads.hh: added Doxygen comments. - - * NEWS: release 0.3.0. - - * configure.in: upped release to 0.3.0 and LT version to 4.0.0 - -2002-02-11 Bastiaan Bakker - * configure.in: integrated check of omnithreads. - * m4/BB_CHECK_OMNITHREADS.m4: added - - * include/log4tango/threading/DummyThreads.hh: scoped lock is now - an integer. - - * include/log4tango/Category.hh, - include/log4tango/FixedContextCategory.hh, - include/log4tango/HierarchyMaintainer.hh, - include/log4tango/NDC.hh, - src/Category.cpp, src/FixedContextCategory.cpp, - src/HierarchyMaintainer.cpp, src/NDC.cpp: - added threadsafety provisions. - - * include/log4tango/*.hh: replaced #include"" with #include<> - * src/*.cpp: replaced #include"" with #include<> - - * include/log4tango/Appender.hh, src/Appender.cpp: - added Mutex for _allAppender map. - -2002-02-08 Bastiaan Bakker - * include/log4tango/threading/Threading.hh, - include/log4tango/threading/OmniThreads.hh, - include/log4tango/threading/DummyThreads.hh, - include/log4tango/threading/BoostThreads.hh, - include/log4tango/threading/Makefile.am: added - -2002-02-05 Bastiaan Bakker - * src/AppenderSkeleton.cpp: doAppend(): correct comparison of - _threshold against event level (bug #513481). - - * tests/Clock.cpp: add missing 'std::'. - -2002-01-27 Bastiaan Bakker - * Release as 0.2.7 - - * configure.in: upped version to 0.2.7. - - * testbench.cpp: added more measurements, using crude cut&paste - of code. - - * NEWS: set release date for 0.2.7, added bug #506907 fixed. - - * bcb5/testPattern/Makefile.am: set EXTRA_DIST. - -2002-01-25 Bastiaan Bakker - * configure.in: added bcb5/testConfig/Makefile to AC_OUTPUT - - * include/log4tango/FixedContextCategory.hh: removed superfluous class - qualification for ownsAppender(). - -2002-01-25 Uwe Jäger - * src/SimpleConfigurator.cpp: Replaced STDOUT_FILENO and STDERR_FILENO - with fileno(stdout) and fileno(stderr) which seems to be more portable. - - * tests/testConfig.cpp: Replace ?-:-operator with if/else because of - compiler problems; retabbed file. - - * bcb5/Makefile.am, bcb5/bcb5.bpg, bcb5/bcb5.mak: Added testConfig - - * bcb5/log4tango/log4tango.bpf, bcb5/log4tango/log4tango.bpr, - bcb5/log4tango/log4tango.mak: Added new files. - - * bcb5/testConfig/Makefile.am, bcb5/testConfig/testConfig.bpf, - bcb5/testConfig/testConfig.bpr, bcb5/testConfig/testConfig.mak: Added - testConfig. - - * bcb5/testCategory/testCategory.bpr, - bcb5/testFixedContextCategory/testFixedContextCategory.bpr, - bcb5/testNDC/testNDC.bpr, bcb5/testPattern/testPattern.bpr - bcb5/testPattern/testPattern.mak, bcb5/testmain/testmain.bpr: Adjusted - makefiles/project files for BCB. - -2002-01-23 Bastiaan Bakker - * src/SimpleConfigurator.cpp: try to fix bug #506907 (MSVC++ - compile failure) with ::dup(fileno(stdout)) - - * configure.in: upped version to 0.2.7rc2 - -2002-01-21 Bastiaan Bakker - * src/Category.cpp: fix ownsAppender() methods. - - * tests/testCategory.cpp: rename appender 'default' to 'default2'. - - * configure.in: upped version to 0.2.7rc1 and LT_VERSION to 3:1:2 - - * src/SimpleConfigurator.cpp, tests/testFixedContextCategory.cpp, - tests/testPattern.cpp, tests/testbench.cpp, tests/testmain.cpp: - replaced setAppender() with addAppender(). - - * include/log4tango/Category.hh: update doxygen comments. - - * include/log4tango/FixedContextCategory.hh, - src/FixedContextCategory.cpp: sync methods for multiple Appender - support. - - * NEWS: added summary for 0.2.7 release - -2002-01-20 Bastiaan Bakker - * include/log4tango/Category.hh, src/Category.cpp, - tests/testCategory.cpp: merged in support for multiple Appenders, - contributed by Brendan B. Boerner. - * THANKS: Added Brendan. - -2002-01-17 Bastiaan Bakker - * include/log4tango/HierarchyMaintainer.hh, src/HierarchyMaintainer.cpp: - added getExistingInstance(std::string). - * include/log4tango/Category.hh, src/Category.cpp: - added exists(std::string). - - * include/log4tango/RollingFileAppender.hh, - include/log4tango/Makefile.am, - src/RollingFileAppender.cpp, src/MakeFile.am: removed - RollingFileAppender, to be replaced with DailyRollingFileAppender. - -2002-01-16 Bastiaan Bakker - * include/log4tango/Category.hh, src/Category.cpp: fix bug #504314: - added missing log methods for level 'fatal'. - - * src/SimpleConfigurator.cpp: added 'stdout' and 'stderr' appenders. - -2002-01-10 Bastiaan Bakker - * configure.in: added check for strcasecmp() and stricmp(). - * include/log4tango/config-win32.h: have stricmp() but not strcasecmp(). - * include/log4tango/Portability.hh: use stricmp() if strcasecmp() is - not available. - - * include/log4tango/RemoteSyslogAppender.hh: added SyslogFacility type. - -2002-01-09 Bastiaan Bakker - * src/SimpleConfigurator.cpp: skip all whitespace before PatternLayout - pattern, not just one. - - * include/log4tango/RollingFileAppender.cpp, - include/log4tango/Makefile.am, - src/RollingFileAppender.cpp, src/MakeFile.am: - added RollingFileAppender contributed by Alex Tapaccos. - -2002-01-08 Bastiaan Bakker - * src/SimpleConfigurator.cpp: skip space before PatternLayout - pattern (Bug #500766). - - * src/SimpleConfigurator.cpp: fix screwy fix for Bug #500766, - now using Alex' method. (Obsoletes Patch #500832). - -2002-01-04 Bastiaan Bakker - * include/log4tango/config-openvms.h: #include for int64_t. - - * src/PatternLayout.cpp(doFormat): removed superfluous return - statement. - - * include/log4tango/config-win32.h: fix int64_t for Borland compiler. - - * include/log4tango/SyslogAppender.hh, - include/log4tango/RemoteSyslogAppender.hh, - src/SyslogAppender.cpp, src/RemoteSyslogAppender.cpp: - inherit from LayoutApppender instead of AppenderSkeleton - (Bug #499524). - -2002-01-03 Bastiaan Bakker - * include/log4tango/Filter.hh: decide() is NOT abstract. - - * tests/testFilter.cpp: added - * tests/Makefile.am: added testFilter.cpp to tests. - -2001-12-21 Bastiaan Bakker - * Release as 0.2.6b - - * configure.in: upped release to 0.2.6b - - * src/Level.cpp: getLevelValue(): fix bug in numerical input - handling. - - * tests/Makefile.am: added very simple test for Level. - * tests/testLevel.cpp: added. - -2001-12-13 Bastiaan Bakker - * src/OstringStream.cpp: use portable_vsnprintf(), not - portable_snprintf(). - -2001-12-11 Bastiaan Bakker - * Release as 0.2.6 - - * TODO: Mark PatternLayout and SimpleConfigurator as done. - - * NEWS: release 0.2.6 - - * Makefile.am: exclude CVS subdir from doc-dist tar ball. - - * include/log4tango/config-win32.h: #define int64_t as __int64, - #define LOG4TANGO_MISSING_INT64_OSTREAM_OP - - * src/PatternLatout.cpp: workaround missing << operator for int64_t - on MSVC. - - * src/TimeStamp.cpp: fix ref typo for timeb struct. - - * include/log4tango/config-win32.h: #define LOG4TANGO_USE_CLEANUP. - -2001-11-30 Bastiaan Bakker - * tests/testbench.cpp: use TimeStamp instead of ::time() - - * include/log4tango/Makefile.am: added config-openvms.h to headers. - - * include/log4tango/Appender.hh, include/log4tango/HierarchyMaintainer.hh, - include/log4tango/Log4cpCleanup.hh, src/Appender.cpp, - src/HierarchyMaintainer.cpp, src/Log4cppCleanup.cpp: conditionally - use Log4cppCleanup, depending on #define LOG4TANGO_USE_CLEANUP. The new - default is NOT to use it, because it causes segfaults on some - platforms (e.g. Solaris). - -2001-11-29 Bastiaan Bakker - * include/log4tango/Portability.hh: use config-openvms.h based on - __OPENVMS__ flag. - - * src/snprintf.c: replaced static_cast with C-style cast: this file - should remain C only. - - * configure.in, Makefile.am: added openvms subdirectory. - * openvms/Makefile.am: added empty Makefile template. - - * THANKS: added Tony Cheung. - - * src/Makefile.am: added snprintf.c to noinst_HEADERS. - - * include/log4tango/TimeStamp.hh: moved class description to the - correct location. - -2001-11-28 Bastiaan Bakker - * src/snprintf.c: added portable snprintf 2.2 from - http://www.ijs.si/software/snprintf/ - - * src/OstringStream.cpp: replace alternative snprintf with one in - snprintf.c. - - * src/snprintf.c: add static cast from void* to const char*. - - * include/log4tango/config-openvms.h: added. - -2001-11-26 Bastiaan Bakker - * include/log4tango/TimeStamp.hh, include/log4tango/Makefile.am, - src/TimeStamp.cpp, src/Makefile.am: added micro second - precise time stamp. - * configure.in: added test for 'ftime()' function. - * include/log4tango/LoggingEvent.hh, include/log4tango/PatternLayout.hh, - src/LoggingEvent.cpp, src/BasicLayout.cpp, src/PatternLayout.cpp: - Use new TimeStamp class. - - * tests/testPattern.cpp: included '%r' in test pattern. - - * src/SimpleConfigurator.cpp: added support for RemoteSyslogAppender. - - * bcb5/log4tango/log4tango.bpr, bcb5/log4tango/log4tango.bpf: Added TimeStamp - class. - - * msvc6/log4tango/log4tango.dsp: Added TimeStamp, PatternLayout and - SimpleConfigurator classes. - - * include/log4tango/RemoteSyslogAppender.hh: replaced #defines with - enum. - - * include/log4tango/config-win32.h: sync with #defines in - include/log4tango/config.h. - - * tests/Makefile.am: made log4tango.init check_DATA. - - * tests/testConfig.cpp: read $srcdir for location of log4tango.init in - order to fix distcheck target. - -2001-11-23 Bastiaan Bakker - * tests/testConfig.cpp, tests/log4tango.init: added test for - SimpleConfigurator. - - * include/log4tango/Makefile.am, src/Makefile.am, tests/Makefile.am: - integrated SimpleConfigurator in autoconf. - - * src/SimpleConfigurator.cpp: added support for comments in config - file (starting with a '#'). added support for SyslogAppender. use - Level::getLevelValue() to convert priorities. - -2001-11-09 Bastiaan Bakker - * m4/CREATE_GENERIC_CONFIG.m4: escape $* - - * tests/testFixedContextCategory.cpp: Use contructor for - FixedContextCategory instead of assignment. - -2001-11-05 Bastiaan Bakker - * m4/CREATE_GENERIC_CONFIG.m4: fix /bin/sh incompatibility on Solaris. - - * include/log4tango/Category.hh: Added private copy constructor and - assignment operator (pointed out by Shane Baker). - -2001-11-01 Bastiaan Bakker - * src/Category.cpp: in setAppender(Appender*) allow NULL Appender. - * include/log4tango/Category.hh: in setAppender(Appender*) document - allowing NULL Appender parameter. - -2001-10-24 Bastiaan Bakker - * configure.in: - Added bcb5/testPattern/Makefile to AC_OUTPUT. - - * include/log4tango/Level.hh, src/Level.cpp: - Added getLevelValue() method. - - * src/PatternLatout.cpp: - Added support for sstream predating c++ stream libraries. - -2001-10-05 Uwe Jäger - * bcb5/Makefile.am, bcb5/bcb5.bpg, bcb5/bcb5.mak: - Added testPattern. - - * bcb5/log4tango/log4tango.bpf, bcb5/log4tango/log4tango.mak: - Added PatternLayout and SimpleConfigurator. - - * bcb5/testPattern/testPattern.bpf, bcb5/testPattern/testPattern.bpr, bcb5/testPattern/testPattern.mak: - Added project file and makefile for pattern test. - - * include/log4tango/config-win32.h: - Added support for PatternLayout. - - * include/log4tango/SimpleConfigurator.hh, src/SimpleConfigurator.cpp: - Make it compile with Borland C++. - - * src/PatternLayout.cpp, src/RemoteSyslogAppender.cpp, tests/testPattern.cpp: - Port to Borland C++. - -2001-10-04 Bastiaan Bakker - * src/SimpleConfigurator.cpp, include/log4tango/SimpleConfigurator.hh: - Added simple configurator class contributed by Glenn Scott. Not - usable yet. - - * src/Level.cpp: fix conversion from LevelLevel to LevelName. - - * include/log4tango/Makefile.am, src/Makefile.am, tests/Makefile.am: - Added PatternLayout files - * configure.in, Makefile.am, m4/C_C_INT64_T: Added check for int64_t. - * configure.in: Added check for gettimeofday. - * src/PatternLayout.cpp: use LOG4TANGO_HAVE_TIMEOFDAY and - LOG4TANGO_HAVE_INT64_T - - * include/log4tango/LoggingEvent.hh: made strings real member variables. - -2001-09-18 Bastiaan Bakker - * include/log4tango/PatternLayout.hh, src/PatternLayout.cpp, - tests/testPattern.cpp: - Added PatternLayout contributed by Glenn Scott. Is not in autoconf - setup yet. - -2001-09-17 Bastiaan Bakker - * configure.in: - Added checks for -lsocket and -lnsl - - * m4/AC_FUNC_SNPRINTF.m4: - Relax snprintf() check: full C99 compliancy is not needed. - - * include/log4tango/Level.hh: - Fix workaround for #define DEBUG - - * config/Makefile.am: - Added newline to keep broken tar utilities happy - - * include/log4tango/FixedContextCategory.hh: - Added default value for context parameter in constructor. - - * include/log4tango/LayoutAppender.hh: - Made BasicLayout the DefaultLayoutType - - * configure.in: - Set requirement for Autoconf 2.50 - Bumped version to 0.2.6 - Incremented LT_VERSION to 2:0:1 - - * Makefile.am: - Fix EXTRA_DIST m4 inclusion. - - * bcb5/log4tango/log4tango.bpf, bcb5/log4tango/log4tango.bpr, - bcb5/log4tango/log4tango.mak: - Added RemoteSyslogAppender. - -2001-08-23 Bastiaan Bakker - * include/log4tango/Level.hh: - Added workaround for #define DEBUG in EDK.h on Win32. - -2001-07-17 Walter Stroebel - * include/log4tango/RemoteSyslogAppender.hh, - src/RemoteSyslogAppender: - Added. - -2001-07-16 Uwe Jäger - * bcb5/log4tango.bpf, bcb5/log4tango.bpr: - Adjusted project files to compile CategoryStream.cpp. - * bcb5/bcb5.mak, bcb5/log4tango/log4tango.mak, - bcb5/log4tango/testCategory/testCategory.mak, - bcb5/log4tango/testFixedContextCategory/testFixedContextCategory.mak, - bcb5/log4tango/testmain/testmain.mak, - bcb5/log4tango/testNDC/testNDC.mak: - Added makefiles for Borland make to build without IDE. - -2001-06-17 Bastiaan Bakker - * include/log4tango/Category.hh, include/log4tango/CategoryStream.hh, - include/log4tango/Makefile.am, - src/Category.cpp, src/CategoryStream.cpp, src/Makefile.am: - Put CategoryStream class into its own files. - - -2001-06-11 Bastiaan Bakker - * m4/AC_CREATE_PREFIX_CONFIG_H.m4: fix to overwrite - include/log4tango/config.h instead of append to it. - * include/log4tango/Makefile.am: remove config.h from dist. - -2001-06-11 Bastiaan Bakker - * Release as 0.2.5 - - * NEWS: inclusion of Borland C++ Builder support. - - * Makefile.am: only include *.m4 files in m4/ in dist. - * Makefile.am: fix typos in debian and doc-dir targets. - -2001-06-07 Bastiaan Bakker - * include/log4tango/LayoutAppender.hh: set SimpleLayout as - DefaultLayoutType. - * src/LayoutAppender.cpp (LayoutAppender, setLayout): use - DefaultLayoutType to construct new Layouts. - * src/LayoutAppender.cpp (setLayout): check whether old Layout and - new Layout are the same object. - - * src/Category.cpp (setAppender): check whether old and new Appender - are the same object. - * src/Filter.cpp (setChainedFilter): check whether old and new Filter - are the same object. - - * include/log4tango/Config.hh, include/log4tango/Portability.hh, - include/log4tango/OstringStream.hh, include/log4tango/Makefile.am, - src/Appender.cpp, src/AppenderSkeleton.cpp, src/BasicLayout.cpp, - src/Category.cpp, src/FileAppender.cpp, src/Filter.cpp, - src/FixedContextCategory.cpp, src/HierarchyMaintainer.cpp, - src/IdsaAppender.cpp, src/LayoutAppender.cpp, src/Log4cppCleanup.cpp, - src/LoggingEvent.cpp, src/Log4cppCleanup.cpp, src/LoggingEvent.cpp, - src/NDC.cpp, src/OstreamAppender.cpp, src/OstringStream.cpp, - src/Level.cpp, src/SimpleLayout.cpp, src/StringQueueAppender.cpp, - src/SyslogAppender.cpp, msvc6/log4tango/log4tango.dsp, - tests/testmain.cpp: renamed Config.hh to Portability.hh - - * m4/AC_AS_DIRNAME.m4, m4/AC_AS_MKDIR_P.m4, m4/AC_ECHO_MKFILE.m4: - removed - * m4/AC_CREATE_PREFIX_CONFIG_H.m4: replaced AC_ECHO_MKFILE with - AS_DIRNAME. This means autoconf >= 2.4 required. - - * configure.in, include/log4tango/config-win32.h: upped version number - to 0.2.5. - * configure.in: upped LT_VERSION to 1:0:0. - -2001-06-06 Bastiaan Bakker - * include/log4tango/AppenderSkeleton.hh, include/log4tango/BasicLayout.hh, - include/log4tango/HierarchyMaintainer.hh, - include/log4tango/IdsaAppender.hh, include/log4tango/Log4cppCleanup.hh, - include/log4tango/LoggingEvent.hh, include/log4tango/OstreamAppender.hh, - include/log4tango/OstringStream.hh, include/log4tango/Level.hh, - include/log4tango/SimpleLayout.hh, include/log4tango/SyslogAppender.hh: - Documentation updates. - -2001-06-06 Uwe Jäger - * include/log4tango/config-win32.h: LOG4TANGO_HAVE_SNPRINTF, WIN32, - LOG4TANGO_FIX_ERROR_COLLISION are defined for win32 - * tests/testmain.cpp: added #ifdef's to make it compile with Borland - C++ Builder - -2001-06-05 Bastiaan Bakker - * include/log4tango/Config.hh, include/log4tango/config-win32.h: Added - * include/log4tango/Makefile.am: added Export.hh and config-win32.h to - liblog4tangoinclude_HEADERS. - * include/log4tango/Config-win32.hh: removed - -2001-06-04 Bastiaan Bakker - * Makefile.am: removed config.h copy from dist-hook - - * m4/AC_CREATE_GENERIC_CONFIG.m4: added - * log4tango-config.in: removed (obsoleted by AC_CREATE_GENERIC_CONFIG) - * Configure.in: added AC_CREATE_GENERIC_CONFIG, removed - log4tango-config from AC_OUTPUT - -2001-06-03 Bastiaan Bakker - * configure.in: added AC_CREATE_PREFIX_CONFIG_H for creation of - include/log4tango/config.h (which has been removed from - AM_CONFIG_HEADER) - * Config.hh.in: removed - * Config.hh: copied from Config.hh.in. include - and remove LOG4TANGO_* defines. - * include/log4tango/Makefile.am: added config.h, removed Config.hh.in - * Appender.cpp, AppenderSkeleton.cpp, BasicLayout.cpp, Category.cpp, - FileAppender.cpp, Filter.cpp, FixedContextCategory.cpp, - HierarchyMaintainer.cpp, IdsaAppender.cpp, LayoutAppender.cpp, - Log4cppCleanup.cpp, LoggingEvent.cpp, NDC.cpp, OstreamAppender.cpp, - OstringStream.cpp, Level.cpp, SimpleLayout.cpp, - StringQueueAppender.cpp,SyslogAppender.cpp: added inclusion of - , prefixed autoconf #ifdefs with LOG4TANGO_ - * AC_AS_DIRNAME.m4, AC_AS_MKDIR_P.m4, AC_CREATE_PREFIX_CONFIG_H.m4, - AC_ECHO_MKFILE.m4: added - -2001-06-01 Bastiaan Bakker - * Level.hh: #define ERROR workaround try 3, put fix inside - LOG4TANGO_FIX_ERROR_COLLISION switch. - * tests/testErrorCollision.cpp, tests/Makefile.am: added test for - #define ERROR workaround. - -2001-05-29 Bastiaan Bakker - * Level.hh: #define ERROR workaround try 2. - * Merge of Borland support patch by Uwe Jäger . - -2001-05-28 Bastiaan Bakker - * Level.hh: included workaround for #define ERROR rudeness in - windows.h on Win32. - -2001-05-23 Bastiaan Bakker - * log4tango.spec.in: run ldconfig after install or uninstall. Upped - release# to 3. - * Makefile.am: in rpm target corrected top_srcdir variable name. - -2001-05-19 Bastiaan Bakker - * Fixed distcheck target. - * Fixed check target. It runs testNDC, testCategory and - testFixedContextCategory as tests. - * Added subdir m4 with (common) autoconf macros. - * Started adding throw() specifiers to methods. - -2001-04-21 Bastiaan Bakker - Rereleased as 0.2.4b - MSVC++: Stripped '\r' characters from .dsp and .dsw files. - MSVC++: Added StringQueueAppender and FixedContextCategory to - log4tango.dsp. - -2001-04-20 Steve Ostlind - MSVC++: build log4tango library with multithreaded DLL. - -2001-04-19 Bastiaan Bakker - Now also added the files in debian and msvc6 to EXTRA_DIST, so they - finally get into the dist tar ball. Sigh. - -2001-04-18 Bastiaan Bakker - Released as 0.2.4 - Added debian and msvc6 subdirs to autoconf configuration: they were - missing from the dist target. - -2001-04-17 Bastiaan Bakker - Made Category subclassable. - Added FixedContextCategory class. - -2001-04-12 Bastiaan Bakker - Merged Marcel Harkema's patch for Debian package support. - -2001-04-11 Bastiaan Bakker - Added StringQueueAppender class. - Separated API docs from devel RPM, into a doc RPM. - -2001-04-10 Bastiaan Bakker - Rerelease as 0.2.3b - Fixed bugs: - #415056 Win32: log4tango project file broken - #415059 Win32: problem with 'using namespace std' - -2001-04-09 Bastiaan Bakker - Release 0.2.3 - Fixed and resolved Bugs: - #411711 missing Clock.hh - #411902 invalid AppenderMap iterator - #412008 memory leak in OstringStream::str() - #412232 _append problem - #414958 printf style logging kaputt - -2001-04-06 Bastiaan Bakker - Added class Filter, with which Appenders can filter out LoggingEvents - Added class AppenderSkeleton, base class for Appender implementations - Modified the Layout interface: it now returns a std::string instead of - a char*. - -2001-03-?? Cedric Le Goater - Cleanup of Hints and StreamUtil to OstringStream. - -2001-03-11 Bastiaan Bakker - Added LayoutAppender. Changed Layout ownership for Appenders: they - now own their Appender. - -2001-03-07 Bastiaan Bakker - Moved to new iostreams. - -2001-03-04 Bastiaan Bakker - Release 0.2.2 - Added doc-dist make target - Added testCategory to tests - -2001-02-25 Bastiaan Bakker - Merged in Win32 / MSVC++6.0 support patches from Lynn Owen - - -2001-02-15 Bastiaan Bakker - Release 0.2.1 - Changed license to the GNU Lesser General Public License (LGPL). - -2001-01-25 Cedric Le Goater - Added EMER, ALERT, CRIT and NOTICE shortcuts methods to Category. - -2000-12-22 Bastiaan Bakker - Merged more patches from Cedric Le Goater, including an RPMS spec - file and a testbench. - -2000-12-18 Bastiaan Bakker - Added IdsaAppender contributed by Marc Welz. - Merged Tru64 support patches from Cedric Le Goater. - -2000-12-10 Bastiaan Bakker - Release 0.2.0 - Integrated autoconf setup contributed by Cedric Le Goater. - Fixed compilation problem in NDC on platforms with g++-2 library - (instead of g++-3). (Reported by Louis Bayle .) - Added CategoryStream. - -2000-12-07 Bastiaan Bakker - Release 0.1 - Added Doxygen generated API documentation. Most of it has been - copied verbatim from LOG4J. - Added NDC (Nested Diagnostic Context) class. - Added OstreamAppender. - Added SyslogAppender. - Fixed bug in HierarchyMaintainer: getInstance should NOT set - the Appender of a newly instantiated Category. - -2000-12-03 Bastiaan Bakker - Release 0.0 - First CVS import at SourceForge. diff --git a/log4tango/INSTALL b/log4tango/INSTALL deleted file mode 100644 index 095b1eb40..000000000 --- a/log4tango/INSTALL +++ /dev/null @@ -1,231 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free -Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - -By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PREFIX', the package will -use PREFIX as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/log4tango/Makefile.am b/log4tango/Makefile.am deleted file mode 100644 index cf58febba..000000000 --- a/log4tango/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -SUBDIRS = config src include tests - -ACLOCAL_AMFLAGS = -I m4 - -if DOC -SUBDIRS += doc -endif - -DIST_SUBDIRS = config src include tests - -if DOC -DIST_SUBDIRS += doc -endif - -EXTRA_DIST = log4tango.pc.in \ - log4tango.m4 \ - m4/AC_CREATE_PREFIX_CONFIG_H.m4 \ - m4/BB_ENABLE_DOXYGEN.m4 \ - m4/AC_CXX_HAVE_SSTREAM.m4 \ - m4/CREATE_GENERIC_CONFIG.m4 \ - m4/AC_CXX_NAMESPACES.m4 \ - m4/PETI_PEDANTIC_GCC.m4 \ - m4/AC_FUNC_SNPRINTF.m4 \ - m4/AC_C_INT64_T.m4 - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = log4tango.pc - -.PHONY: check rpm docs doc-dist - -distclean-local: - $(RM) CONTENTS TAGS log4tango-config - -CONTENTS:: - find $(top_srcdir) \( ! -type l -a -name '*.cpp' -o -name '*.hh' -o -name Makefile.am \) > $@ - -TAGS:: CONTENTS - etags `cat $<` - -rpm: dist - rpm -ta $(PACKAGE)-$(VERSION).tar.gz - mv -f /usr/src/redhat/SRPMS/$(PACKAGE)-$(VERSION)-*.rpm $(top_srcdir) - mv -f /usr/src/redhat/RPMS/*/$(PACKAGE)-$(VERSION)-*.rpm $(top_srcdir) - mv -f /usr/src/redhat/RPMS/*/$(PACKAGE)-devel-$(VERSION)-*.rpm \ - $(top_srcdir) - mv -f /usr/src/redhat/RPMS/*/$(PACKAGE)-doc-$(VERSION)-*.rpm \ - $(top_srcdir) - -debian: - chmod a+x $(top_srcdir)/debian/rules - dpkg-buildpackage -rfakeroot -sa -us -uc -tc - -docs: - $(MAKE) -C doc - -doc-dist: docs - tar -zcf $(PACKAGE)-docs-$(VERSION).tar.gz -C $(top_srcdir)/doc/html --exclude CVS . - diff --git a/log4tango/Makefile.in b/log4tango/Makefile.in deleted file mode 100644 index 3458fcd1b..000000000 --- a/log4tango/Makefile.in +++ /dev/null @@ -1,812 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -@DOC_TRUE@am__append_1 = doc -@DOC_TRUE@am__append_2 = doc -subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/log4tango.pc.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - THANKS -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/AC_CREATE_PREFIX_CONFIG_H.m4 \ - $(top_srcdir)/m4/AC_CXX_HAVE_SSTREAM.m4 \ - $(top_srcdir)/m4/AC_CXX_NAMESPACES.m4 \ - $(top_srcdir)/m4/AC_C_INT64_T.m4 \ - $(top_srcdir)/m4/AC_FUNC_SNPRINTF.m4 \ - $(top_srcdir)/m4/BB_CHECK_PTHREADS.m4 \ - $(top_srcdir)/m4/BB_ENABLE_DOXYGEN.m4 \ - $(top_srcdir)/m4/CREATE_GENERIC_CONFIG.m4 \ - $(top_srcdir)/m4/PETI_PEDANTIC_GCC.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_SUNPRO_CC.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/config.h -CONFIG_CLEAN_FILES = log4tango.pc -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(pkgconfigdir)" -DATA = $(pkgconfig_DATA) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - if test -d "$(distdir)"; then \ - find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -rf "$(distdir)" \ - || { sleep 5 && rm -rf "$(distdir)"; }; \ - else :; fi -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ - | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GENERIC_CONFIG = @GENERIC_CONFIG@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = config src include tests $(am__append_1) -ACLOCAL_AMFLAGS = -I m4 -DIST_SUBDIRS = config src include tests $(am__append_2) -EXTRA_DIST = log4tango.pc.in \ - log4tango.m4 \ - m4/AC_CREATE_PREFIX_CONFIG_H.m4 \ - m4/BB_ENABLE_DOXYGEN.m4 \ - m4/AC_CXX_HAVE_SSTREAM.m4 \ - m4/CREATE_GENERIC_CONFIG.m4 \ - m4/AC_CXX_NAMESPACES.m4 \ - m4/PETI_PEDANTIC_GCC.m4 \ - m4/AC_FUNC_SNPRINTF.m4 \ - m4/AC_C_INT64_T.m4 - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = log4tango.pc -all: all-recursive - -.SUFFIXES: -am--refresh: Makefile - @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -$(am__aclocal_m4_deps): -log4tango.pc: $(top_builddir)/config.status $(srcdir)/log4tango.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool config.lt -install-pkgconfigDATA: $(pkgconfig_DATA) - @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ - done - -uninstall-pkgconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - test -d "$(distdir)" || mkdir "$(distdir)" - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done - -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -755 \ - -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r "$(distdir)" -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-lzip: distdir - tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - -dist-xz: distdir - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.lz*) \ - lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(AM_DISTCHECK_CONFIGURE_FLAGS) \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ - && cd "$$am__cwd" \ - || exit 1 - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -distuninstallcheck: - @test -n '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: trying to run $@ with an empty' \ - '$$(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - $(am__cd) '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile $(DATA) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-local distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: install-pkgconfigDATA - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-pkgconfigDATA - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic \ - distclean-libtool distclean-local distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-pkgconfigDATA install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-pkgconfigDATA - - -.PHONY: check rpm docs doc-dist - -distclean-local: - $(RM) CONTENTS TAGS log4tango-config - -CONTENTS:: - find $(top_srcdir) \( ! -type l -a -name '*.cpp' -o -name '*.hh' -o -name Makefile.am \) > $@ - -TAGS:: CONTENTS - etags `cat $<` - -rpm: dist - rpm -ta $(PACKAGE)-$(VERSION).tar.gz - mv -f /usr/src/redhat/SRPMS/$(PACKAGE)-$(VERSION)-*.rpm $(top_srcdir) - mv -f /usr/src/redhat/RPMS/*/$(PACKAGE)-$(VERSION)-*.rpm $(top_srcdir) - mv -f /usr/src/redhat/RPMS/*/$(PACKAGE)-devel-$(VERSION)-*.rpm \ - $(top_srcdir) - mv -f /usr/src/redhat/RPMS/*/$(PACKAGE)-doc-$(VERSION)-*.rpm \ - $(top_srcdir) - -debian: - chmod a+x $(top_srcdir)/debian/rules - dpkg-buildpackage -rfakeroot -sa -us -uc -tc - -docs: - $(MAKE) -C doc - -doc-dist: docs - tar -zcf $(PACKAGE)-docs-$(VERSION).tar.gz -C $(top_srcdir)/doc/html --exclude CVS . - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/log4tango/NEWS b/log4tango/NEWS deleted file mode 100644 index 1ce8af642..000000000 --- a/log4tango/NEWS +++ /dev/null @@ -1,2 +0,0 @@ -See 'Releases' section of HTML documentation. - diff --git a/log4tango/aclocal.m4 b/log4tango/aclocal.m4 deleted file mode 100644 index 34b6fd858..000000000 --- a/log4tango/aclocal.m4 +++ /dev/null @@ -1,1038 +0,0 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) - -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 9 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 12 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -AC_SUBST([am__nodep])dnl -_AM_SUBST_NOTMAKE([am__nodep])dnl -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -#serial 5 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 16 - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) - -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST(install_sh)]) - -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering - -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 5 - -# AM_MAINTAINER_MODE([DEFAULT-MODE]) -# ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) - -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 6 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 5 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# -------------------- -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ------------------------ -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 5 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -esac - -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 3 - -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) - -# AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR - -m4_include([m4/AC_CREATE_PREFIX_CONFIG_H.m4]) -m4_include([m4/AC_CXX_HAVE_SSTREAM.m4]) -m4_include([m4/AC_CXX_NAMESPACES.m4]) -m4_include([m4/AC_C_INT64_T.m4]) -m4_include([m4/AC_FUNC_SNPRINTF.m4]) -m4_include([m4/BB_CHECK_PTHREADS.m4]) -m4_include([m4/BB_ENABLE_DOXYGEN.m4]) -m4_include([m4/CREATE_GENERIC_CONFIG.m4]) -m4_include([m4/PETI_PEDANTIC_GCC.m4]) -m4_include([m4/RSSH_CHECK_SUNPRO_CC.m4]) -m4_include([m4/libtool.m4]) -m4_include([m4/ltoptions.m4]) -m4_include([m4/ltsugar.m4]) -m4_include([m4/ltversion.m4]) -m4_include([m4/lt~obsolete.m4]) diff --git a/log4tango/bootstrap b/log4tango/bootstrap deleted file mode 100755 index bb876dd58..000000000 --- a/log4tango/bootstrap +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/sh - -# $Id$ -# This script is used to bootstrap the build process, that is, to -# create the aclocal, the ac_config.h.tmp.in, the Makefile.in, and the -# configure files -# It must be run in order to let changes in configure.in be reflected -# in configure. - -# from the info file for autoconf aclocal -# The `aclocal' program will automatically generate `aclocal.m4' files -# based on the contents of `configure.in'. This provides a convenient -# way to get Automake-provided macros, without having to search around. -# Also, the `aclocal' mechanism is extensible for use by other packages. -echo "running aclocal -I m4" -aclocal -I m4 - -echo "running libtoolize --copy --force " -libtoolize --copy --force - -# from the info file for autoconf -# The `autoheader' program can create a template file of C `#define' -# statements for `configure' to use. If `configure.ac' invokes -# `AC_CONFIG_HEADERS(FILE)', `autoheader' creates `FILE.in'; if multiple -# file arguments are given, the first one is used. Otherwise, -# `autoheader' creates `config.h.in'. -echo "running autoheader" -autoheader - -# from the info file for automake -# Automake is a tool for automatically generating `Makefile.in's from -# files called `Makefile.am'. Each `Makefile.am' is basically a series -# of `make' macro definitions (with rules being thrown in occasionally). -# The generated `Makefile.in's are compliant with the GNU Makefile -# standards. -# -# creates the Makefile.ins -echo "running automake --gnu --add-missing" -automake --gnu --add-missing - -# from the info file for autoconf -# Autoconf is a tool for producing shell scripts that automatically -# configure software source code packages to adapt to many kinds of -# UNIX-like systems. The configuration scripts produced by Autoconf are -# independent of Autoconf when they are run, so their users do not need -# to have Autoconf. -# -# creates the configure script -echo "running autoconf" -autoconf - diff --git a/log4tango/config/Makefile.am b/log4tango/config/Makefile.am deleted file mode 100755 index 139597f9c..000000000 --- a/log4tango/config/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/log4tango/config/Makefile.in b/log4tango/config/Makefile.in deleted file mode 100644 index 4338451bc..000000000 --- a/log4tango/config/Makefile.in +++ /dev/null @@ -1,380 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = config -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in config.guess \ - config.sub depcomp install-sh ltmain.sh missing mkinstalldirs -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/AC_CREATE_PREFIX_CONFIG_H.m4 \ - $(top_srcdir)/m4/AC_CXX_HAVE_SSTREAM.m4 \ - $(top_srcdir)/m4/AC_CXX_NAMESPACES.m4 \ - $(top_srcdir)/m4/AC_C_INT64_T.m4 \ - $(top_srcdir)/m4/AC_FUNC_SNPRINTF.m4 \ - $(top_srcdir)/m4/BB_CHECK_PTHREADS.m4 \ - $(top_srcdir)/m4/BB_ENABLE_DOXYGEN.m4 \ - $(top_srcdir)/m4/CREATE_GENERIC_CONFIG.m4 \ - $(top_srcdir)/m4/PETI_PEDANTIC_GCC.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_SUNPRO_CC.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GENERIC_CONFIG = @GENERIC_CONFIG@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu config/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/log4tango/config/config.guess b/log4tango/config/config.guess deleted file mode 100755 index 2fc3acce2..000000000 --- a/log4tango/config/config.guess +++ /dev/null @@ -1,1411 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - -timestamp='2003-06-17' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY 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 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; - --version | -v ) - echo "$version" ; exit 0 ;; - --help | --h* | -h ) - echo "$usage"; exit 0 ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -## for Red Hat Linux -if test -f /etc/redhat-release ; then - VENDOR=redhat ; -else - VENDOR= ; -fi - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms - exit 0 ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit 0 ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit 0 ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit 0;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit 0 ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit 0;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit 0 ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit 0 ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; - esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit 0 ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit 0 ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 - echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit 0 ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit 0 ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit 0 ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit 0 ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit 0 ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit 0 ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit 0 ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit 0 ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit 0 ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit 0 ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit 0 ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit 0 ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit 0 ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit 0 ;; - *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit 0 ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit 0 ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit 0 ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit 0 ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit 0 ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit 0 ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo unknown-hitachi-hiuxwe2 - exit 0 ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit 0 ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit 0 ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit 0 ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit 0 ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit 0 ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit 0 ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit 0 ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit 0 ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit 0 ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit 0 ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit 0 ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit 0 ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit 0 ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - *:GNU:*:*) - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; - arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit 0 ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu - exit 0 ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 - ;; - ppc:Linux:*:*) - echo powerpc-${VENDOR:-unknown}-linux-gnu - exit 0 ;; - ppc64:Linux:*:*) - echo powerpc64-${VENDOR:-unknown}-linux-gnu - exit 0 ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit 0 ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit 0 ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu - exit 0 ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - x86_64:Linux:*:*) - echo x86_64-${VENDOR:-unknown}-linux-gnu - exit 0 ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #ifdef __INTEL_COMPILER - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit 0 ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit 0 ;; - i*86:*:5:[78]*) - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit 0 ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp - exit 0 ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit 0 ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit 0 ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit 0 ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit 0 ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit 0 ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit 0 ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit 0 ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit 0 ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit 0 ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit 0 ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit 0 ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit 0 ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit 0 ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit 0 ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit 0 ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit 0 ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; - *:Darwin:*:*) - case `uname -p` in - *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit 0 ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit 0 ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit 0 ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit 0 ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit 0 ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit 0 ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit 0 ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit 0 ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit 0 ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; - c34*) - echo c34-convex-bsd - exit 0 ;; - c38*) - echo c38-convex-bsd - exit 0 ;; - c4*) - echo c4-convex-bsd - exit 0 ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/log4tango/config/config.sub b/log4tango/config/config.sub deleted file mode 100755 index 7cee3d6ec..000000000 --- a/log4tango/config/config.sub +++ /dev/null @@ -1,1500 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - -timestamp='2003-06-18' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY 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 -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; - --version | -v ) - echo "$version" ; exit 0 ;; - --help | --h* | -h ) - echo "$usage"; exit 0 ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit 0;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) - os= - basic_machine=$1 - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k \ - | m32r | m68000 | m68k | m88k | mcore \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64vr | mips64vrel \ - | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | msp430 \ - | ns16k | ns32k \ - | openrisc | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | s390 | s390x \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xscale | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ - | m32r-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ - | s390-* | s390x-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ - | ymp-* \ - | z8k-*) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - crds | unos) - basic_machine=m68k-crds - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - or32 | or32-*) - basic_machine=or32-unknown - os=-coff - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv9 | sparcv9b) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-ibm) - os=-aix - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/log4tango/config/depcomp b/log4tango/config/depcomp deleted file mode 100755 index 11e2d3bfe..000000000 --- a/log4tango/config/depcomp +++ /dev/null @@ -1,522 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2004-05-31.23 - -# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY 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 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva . - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to . -EOF - exit 0 - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit 0 - ;; -esac - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" - if test "$libtool" = yes; then - "$@" -Wc,-M - else - "$@" -M - fi - stat=$? - - if test -f "$tmpdepfile"; then : - else - stripped=`echo "$stripped" | sed 's,^.*/,,'` - tmpdepfile="$stripped.u" - fi - - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - - if test -f "$tmpdepfile"; then - outname="$stripped.o" - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # Dependencies are output in .lo.d with libtool 1.4. - # With libtool 1.5 they are output both in $dir.libs/$base.o.d - # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the - # latter, because the former will be cleaned when $dir.libs is - # erased. - tmpdepfile1="$dir.libs/$base.lo.d" - tmpdepfile2="$dir$base.o.d" - tmpdepfile3="$dir.libs/$base.d" - "$@" -Wc,-MD - else - tmpdepfile1="$dir$base.o.d" - tmpdepfile2="$dir$base.d" - tmpdepfile3="$dir$base.d" - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - if test -f "$tmpdepfile1"; then - tmpdepfile="$tmpdepfile1" - elif test -f "$tmpdepfile2"; then - tmpdepfile="$tmpdepfile2" - else - tmpdepfile="$tmpdepfile3" - fi - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. - "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no - for arg in "$@"; do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E | - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - "$@" || exit $? - IFS=" " - for arg - do - case "$arg" in - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/log4tango/config/install-sh b/log4tango/config/install-sh deleted file mode 100755 index dd97db7aa..000000000 --- a/log4tango/config/install-sh +++ /dev/null @@ -1,322 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2004-09-10.20 - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -chmodcmd="$chmodprog 0755" -chowncmd= -chgrpcmd= -stripcmd= -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src= -dst= -dir_arg= -dstarg= -no_target_directory= - -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG -" - -while test -n "$1"; do - case $1 in - -c) shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - --help) echo "$usage"; exit 0;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; - - --version) echo "$0 $scriptversion"; exit 0;; - - *) # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - test -n "$dir_arg$dstarg" && break - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done - break;; - esac -done - -if test -z "$1"; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src ;; - esac - - if test -n "$dir_arg"; then - dst=$src - src= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi - else - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dstarg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dstarg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst ;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 - exit 1 - fi - dst=$dst/`basename "$src"` - fi - fi - - # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - - # Make sure that the destination directory exists. - - # Skip lots of stat calls in the usual case. - if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" - - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - IFS=$oIFS - - pathcomp= - - while test $# -ne 0 ; do - pathcomp=$pathcomp$1 - shift - if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit - fi - pathcomp=$pathcomp/ - done - fi - - if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - - else - dstfile=`basename "$dst"` - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - trap '(exit $?); exit' 1 2 13 15 - - # Copy the file name to the temp name. - $doit $cpprog "$src" "$dsttmp" && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ - || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - } - } - fi || { (exit 1); exit; } -done - -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit -} - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/log4tango/config/ltmain.sh b/log4tango/config/ltmain.sh deleted file mode 100755 index c2852d856..000000000 --- a/log4tango/config/ltmain.sh +++ /dev/null @@ -1,9661 +0,0 @@ - -# libtool (GNU libtool) 2.4.2 -# Written by Gordon Matzigkeit , 1996 - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# GNU Libtool is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY 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 GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . - -PROGRAM=libtool -PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1ubuntu1" -TIMESTAMP="" -package_revision=1.3337 - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} - -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" -done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL - -$lt_unset CDPATH - - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" - - - -: ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${MAKE="make"} -: ${MKDIR="mkdir"} -: ${MV="mv -f"} -: ${RM="rm -f"} -: ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" - -dirname="s,/[^/]*$,," -basename="s,^.*/,," - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation - - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation - - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation - - -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' - -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} - -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done - - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi - - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} - -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result - -# Make sure we have an absolute path for reexecution: -case $progpath in - [\\/]*|[A-Za-z]:\\*) ;; - *[\\/]*) - progdir=$func_dirname_result - progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" - ;; - *) - save_IFS="$IFS" - IFS=${PATH_SEPARATOR-:} - for progdir in $PATH; do - IFS="$save_IFS" - test -x "$progdir/$progname" && break - done - IFS="$save_IFS" - test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' - -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" - -# Standard options: -opt_dry_run=false -opt_help=false -opt_quiet=false -opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} - -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} - - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : -} - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} - -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -} - -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} - -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default - - -# func_grep expression filename -# Check whether EXPRESSION matches any line of FILENAME, without output. -func_grep () -{ - $GREP "$1" "$2" >/dev/null 2>&1 -} - - -# func_mkdir_p directory-path -# Make sure the entire path to DIRECTORY-PATH is available. -func_mkdir_p () -{ - my_directory_path="$1" - my_dir_list= - - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then - - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; - esac - - # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do - # ...make a list in topmost first order. Use a colon delimited - # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" - - # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac - - # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` - done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` - - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes - # try to create one of the directories concurrently. Don't - # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : - done - IFS="$save_mkdir_p_IFS" - - # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" - fi -} - - -# func_mktempdir [string] -# Make a temporary directory that won't clash with other running -# libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. -func_mktempdir () -{ - my_template="${TMPDIR-/tmp}/${1-$progname}" - - if test "$opt_dry_run" = ":"; then - # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" - else - - # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - - if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" - - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi - - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi - - $ECHO "$my_tmpdir" -} - - -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () -{ - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac - - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac -} - - -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () -{ - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac - - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac - - func_quote_for_expand_result="$my_arg" -} - - -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - - -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac -} - - -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} - -# func_usage -# Echo short help message to standard output and exit. -func_usage () -{ - $opt_debug - - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? -} - -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. -func_help () -{ - $opt_debug - - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi -} - -# func_missing_arg argname -# Echo program name prefixed message to standard error and set global -# exit_cmd. -func_missing_arg () -{ - $opt_debug - - func_error "missing argument for $1." - exit_cmd=exit -} - - -# func_split_short_opt shortopt -# Set func_split_short_opt_name and func_split_short_opt_arg shell -# variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () -{ - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' - - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation - - -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () -{ - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' - - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation - -exit_cmd=: - - - - - -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" - -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 - -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation - -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation - - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation - - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation - - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation - - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation - - -# func_fatal_configuration arg... -# Echo program name prefixed message to standard error, followed by -# a configuration failure hint, and exit. -func_fatal_configuration () -{ - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." -} - - -# func_config -# Display the configuration for all the tags in this script. -func_config () -{ - re_begincf='^# ### BEGIN LIBTOOL' - re_endcf='^# ### END LIBTOOL' - - # Default configuration. - $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" - - # Now print the configurations for the tags. - for tagname in $taglist; do - $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" - done - - exit $? -} - -# func_features -# Display the features supported by this script. -func_features () -{ - echo "host: $host" - if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" - else - echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then - echo "enable static libraries" - else - echo "disable static libraries" - fi - - exit $? -} - -# func_enable_tag tagname -# Verify that TAGNAME is valid, and either flag an error and exit, or -# enable the TAGNAME tag. We also add TAGNAME to the global $taglist -# variable here. -func_enable_tag () -{ - # Global variable: - tagname="$1" - - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac - - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; - *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" - - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac -} - -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () -{ - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF - fi - - exit $EXIT_MISMATCH - fi -} - - -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac - - - -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false - - -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - - # Validate options: - - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi - - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - - $opt_help || { - # Sanity checks first: - func_check_version_match - - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } - - - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE -} - - - - -## ----------- ## -## Main. ## -## ----------- ## - -# func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_lalib_p () -{ - test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 -} - -# func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. -# This function implements the same check as func_lalib_p without -# resorting to external programs. To this end, it redirects stdin and -# closes it afterwards, without saving the original file descriptor. -# As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. -func_lalib_unsafe_p () -{ - lalib_p=no - if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then - for lalib_p_l in 1 2 3 4 - do - read lalib_p_line - case "$lalib_p_line" in - \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; - esac - done - exec 0<&5 5<&- - fi - test "$lalib_p" = yes -} - -# func_ltwrapper_script_p file -# True iff FILE is a libtool wrapper script -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_script_p () -{ - func_lalib_p "$1" -} - -# func_ltwrapper_executable_p file -# True iff FILE is a libtool wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_executable_p () -{ - func_ltwrapper_exec_suffix= - case $1 in - *.exe) ;; - *) func_ltwrapper_exec_suffix=.exe ;; - esac - $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 -} - -# func_ltwrapper_scriptname file -# Assumes file is an ltwrapper_executable -# uses $file to determine the appropriate filename for a -# temporary ltwrapper_script. -func_ltwrapper_scriptname () -{ - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -} - -# func_ltwrapper_p file -# True iff FILE is a libtool wrapper script or wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_p () -{ - func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" -} - - -# func_execute_cmds commands fail_cmd -# Execute tilde-delimited COMMANDS. -# If FAIL_CMD is given, eval that upon failure. -# FAIL_CMD may read-access the current command in variable CMD! -func_execute_cmds () -{ - $opt_debug - save_ifs=$IFS; IFS='~' - for cmd in $1; do - IFS=$save_ifs - eval cmd=\"$cmd\" - func_show_eval "$cmd" "${2-:}" - done - IFS=$save_ifs -} - - -# func_source file -# Source FILE, adding directory component if necessary. -# Note that it is not necessary on cygwin/mingw to append a dot to -# FILE even if both FILE and FILE.exe exist: automatic-append-.exe -# behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. -func_source () -{ - $opt_debug - case $1 in - */* | *\\*) . "$1" ;; - *) . "./$1" ;; - esac -} - - -# func_resolve_sysroot PATH -# Replace a leading = in PATH with a sysroot. Store the result into -# func_resolve_sysroot_result -func_resolve_sysroot () -{ - func_resolve_sysroot_result=$1 - case $func_resolve_sysroot_result in - =*) - func_stripname '=' '' "$func_resolve_sysroot_result" - func_resolve_sysroot_result=$lt_sysroot$func_stripname_result - ;; - esac -} - -# func_replace_sysroot PATH -# If PATH begins with the sysroot, replace it with = and -# store the result into func_replace_sysroot_result. -func_replace_sysroot () -{ - case "$lt_sysroot:$1" in - ?*:"$lt_sysroot"*) - func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" - ;; - *) - # Including no sysroot. - func_replace_sysroot_result=$1 - ;; - esac -} - -# func_infer_tag arg -# Infer tagged configuration to use if any are available and -# if one wasn't chosen via the "--tag" command line option. -# Only attempt this if the compiler in the base compile -# command doesn't match the default compiler. -# arg is usually of the form 'gcc ...' -func_infer_tag () -{ - $opt_debug - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - for z in $available_tags; do - if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. - func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` - case "$@ " in - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" -# else -# func_verbose "using $tagname tagged configuration" - fi - ;; - esac - fi -} - - - -# func_write_libtool_object output_name pic_name nonpic_name -# Create a libtool object file (analogous to a ".la" file), -# but don't create it if we're doing a dry run. -func_write_libtool_object () -{ - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' - else - write_lobj=none - fi - - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' - else - write_oldobj=none - fi - - $opt_dry_run || { - cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then - func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` - else - func_convert_core_file_wine_to_w32_result= - fi - fi -} -# end: func_convert_core_file_wine_to_w32 - - -# func_convert_core_path_wine_to_w32 ARG -# Helper function used by path conversion functions when $build is *nix, and -# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -# configured wine environment available, with the winepath program in $build's -# $PATH. Assumes ARG has no leading or trailing path separator characters. -# -# ARG is path to be converted from $build format to win32. -# Result is available in $func_convert_core_path_wine_to_w32_result. -# Unconvertible file (directory) names in ARG are skipped; if no directory names -# are convertible, then the result may be empty. -func_convert_core_path_wine_to_w32 () -{ - $opt_debug - # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" - if test -n "$1"; then - oldIFS=$IFS - IFS=: - for func_convert_core_path_wine_to_w32_f in $1; do - IFS=$oldIFS - func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then - if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" - else - func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" - fi - fi - done - IFS=$oldIFS - fi -} -# end: func_convert_core_path_wine_to_w32 - - -# func_cygpath ARGS... -# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -# (2), returns the Cygwin file name or path in func_cygpath_result (input -# file name or path is assumed to be in w32 format, as previously converted -# from $build's *nix or MSYS format). In case (3), returns the w32 file name -# or path in func_cygpath_result (input file name or path is assumed to be in -# Cygwin format). Returns an empty string on error. -# -# ARGS are passed to cygpath, with the last one being the file name or path to -# be converted. -# -# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -# environment variable; do not put it in $PATH. -func_cygpath () -{ - $opt_debug - if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then - func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` - if test "$?" -ne 0; then - # on failure, ensure result is empty - func_cygpath_result= - fi - else - func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" - fi -} -#end: func_cygpath - - -# func_convert_core_msys_to_w32 ARG -# Convert file name or path ARG from MSYS format to w32 format. Return -# result in func_convert_core_msys_to_w32_result. -func_convert_core_msys_to_w32 () -{ - $opt_debug - # awkward: cmd appends spaces to result - func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -} -#end: func_convert_core_msys_to_w32 - - -# func_convert_file_check ARG1 ARG2 -# Verify that ARG1 (a file name in $build format) was converted to $host -# format in ARG2. Otherwise, emit an error message, but continue (resetting -# func_to_host_file_result to ARG1). -func_convert_file_check () -{ - $opt_debug - if test -z "$2" && test -n "$1" ; then - func_error "Could not determine host file name corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_file_result="$1" - fi -} -# end func_convert_file_check - - -# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -# Verify that FROM_PATH (a path in $build format) was converted to $host -# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -# func_to_host_file_result to a simplistic fallback value (see below). -func_convert_path_check () -{ - $opt_debug - if test -z "$4" && test -n "$3"; then - func_error "Could not determine the host path corresponding to" - func_error " \`$3'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This is a deliberately simplistic "conversion" and - # should not be "improved". See libtool.info. - if test "x$1" != "x$2"; then - lt_replace_pathsep_chars="s|$1|$2|g" - func_to_host_path_result=`echo "$3" | - $SED -e "$lt_replace_pathsep_chars"` - else - func_to_host_path_result="$3" - fi - fi -} -# end func_convert_path_check - - -# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -# and appending REPL if ORIG matches BACKPAT. -func_convert_path_front_back_pathsep () -{ - $opt_debug - case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" - ;; - esac - case $4 in - $2 ) func_append func_to_host_path_result "$3" - ;; - esac -} -# end func_convert_path_front_back_pathsep - - -################################################## -# $build to $host FILE NAME CONVERSION FUNCTIONS # -################################################## -# invoked via `$to_host_file_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# Result will be available in $func_to_host_file_result. - - -# func_to_host_file ARG -# Converts the file name ARG from $build format to $host format. Return result -# in func_to_host_file_result. -func_to_host_file () -{ - $opt_debug - $to_host_file_cmd "$1" -} -# end func_to_host_file - - -# func_to_tool_file ARG LAZY -# converts the file name ARG from $build format to toolchain format. Return -# result in func_to_tool_file_result. If the conversion in use is listed -# in (the comma separated) LAZY, no conversion takes place. -func_to_tool_file () -{ - $opt_debug - case ,$2, in - *,"$to_tool_file_cmd",*) - func_to_tool_file_result=$1 - ;; - *) - $to_tool_file_cmd "$1" - func_to_tool_file_result=$func_to_host_file_result - ;; - esac -} -# end func_to_tool_file - - -# func_convert_file_noop ARG -# Copy ARG to func_to_host_file_result. -func_convert_file_noop () -{ - func_to_host_file_result="$1" -} -# end func_convert_file_noop - - -# func_convert_file_msys_to_w32 ARG -# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_file_result. -func_convert_file_msys_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_w32 - - -# func_convert_file_cygwin_to_w32 ARG -# Convert file name ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_file_cygwin_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # because $build is cygwin, we call "the" cygpath in $PATH; no need to use - # LT_CYGPATH in this case. - func_to_host_file_result=`cygpath -m "$1"` - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_cygwin_to_w32 - - -# func_convert_file_nix_to_w32 ARG -# Convert file name ARG from *nix to w32 format. Requires a wine environment -# and a working winepath. Returns result in func_to_host_file_result. -func_convert_file_nix_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_w32 - - -# func_convert_file_msys_to_cygwin ARG -# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_file_msys_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_cygwin - - -# func_convert_file_nix_to_cygwin ARG -# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -# in func_to_host_file_result. -func_convert_file_nix_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. - func_convert_core_file_wine_to_w32 "$1" - func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_cygwin - - -############################################# -# $build to $host PATH CONVERSION FUNCTIONS # -############################################# -# invoked via `$to_host_path_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# The result will be available in $func_to_host_path_result. -# -# Path separators are also converted from $build format to $host format. If -# ARG begins or ends with a path separator character, it is preserved (but -# converted to $host format) on output. -# -# All path conversion functions are named using the following convention: -# file name conversion function : func_convert_file_X_to_Y () -# path conversion function : func_convert_path_X_to_Y () -# where, for any given $build/$host combination the 'X_to_Y' value is the -# same. If conversion functions are added for new $build/$host combinations, -# the two new functions must follow this pattern, or func_init_to_host_path_cmd -# will break. - - -# func_init_to_host_path_cmd -# Ensures that function "pointer" variable $to_host_path_cmd is set to the -# appropriate value, based on the value of $to_host_file_cmd. -to_host_path_cmd= -func_init_to_host_path_cmd () -{ - $opt_debug - if test -z "$to_host_path_cmd"; then - func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" - fi -} - - -# func_to_host_path ARG -# Converts the path ARG from $build format to $host format. Return result -# in func_to_host_path_result. -func_to_host_path () -{ - $opt_debug - func_init_to_host_path_cmd - $to_host_path_cmd "$1" -} -# end func_to_host_path - - -# func_convert_path_noop ARG -# Copy ARG to func_to_host_path_result. -func_convert_path_noop () -{ - func_to_host_path_result="$1" -} -# end func_convert_path_noop - - -# func_convert_path_msys_to_w32 ARG -# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_path_result. -func_convert_path_msys_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from ARG. MSYS - # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; - # and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_msys_to_w32 - - -# func_convert_path_cygwin_to_w32 ARG -# Convert path ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_path_cygwin_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_cygwin_to_w32 - - -# func_convert_path_nix_to_w32 ARG -# Convert path ARG from *nix to w32 format. Requires a wine environment and -# a working winepath. Returns result in func_to_host_file_result. -func_convert_path_nix_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_nix_to_w32 - - -# func_convert_path_msys_to_cygwin ARG -# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_path_msys_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_msys_to_cygwin - - -# func_convert_path_nix_to_cygwin ARG -# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -# func_to_host_file_result. -func_convert_path_nix_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_nix_to_cygwin - - -# func_mode_compile arg... -func_mode_compile () -{ - $opt_debug - # Get the compilation command and the source file. - base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal - libobj= - later= - pie_flag= - - for arg - do - case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" - arg_mode=normal - ;; - - target ) - libobj="$arg" - arg_mode=normal - continue - ;; - - normal ) - # Accept any command-line options. - case $arg in - -o) - test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" - arg_mode=target - continue - ;; - - -pie | -fpie | -fPIE) - func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) - func_append later " $arg" - continue - ;; - - -no-suppress) - suppress_opt=no - continue - ;; - - -Xcompiler) - arg_mode=arg # the next one goes into the "base_compile" arg list - continue # The current "srcfile" will either be retained or - ;; # replaced later. I would guess that would be a bug. - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" - func_append_quoted lastarg "$arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. - func_append base_compile " $lastarg" - continue - ;; - - *) - # Accept the current argument as the source file. - # The previous "srcfile" becomes the current argument. - # - lastarg="$srcfile" - srcfile="$arg" - ;; - esac # case $arg - ;; - esac # case $arg_mode - - # Aesthetically quote the previous argument. - func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in - arg) - func_fatal_error "you must specify an argument for -Xcompile" - ;; - target) - func_fatal_error "you must specify a target with \`-o'" - ;; - *) - # Get the name of the library object. - test -z "$libobj" && { - func_basename "$srcfile" - libobj="$func_basename_result" - } - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo - case $libobj in - *.[cCFSifmso] | \ - *.ada | *.adb | *.ads | *.asm | \ - *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) - func_xform "$libobj" - libobj=$func_xform_result - ;; - esac - - case $libobj in - *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; - *) - func_fatal_error "cannot determine name of library object from \`$libobj'" - ;; - esac - - func_infer_tag $base_compile - - for arg in $later; do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" - build_old_libs=no - continue - ;; - - -static) - build_libtool_libs=no - build_old_libs=yes - continue - ;; - - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no - continue - ;; - esac - done - - func_quote_for_eval "$libobj" - test "X$libobj" != "X$func_quote_for_eval_result" \ - && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." - func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname - - test -z "$base_compile" && \ - func_fatal_help "you must specify a compilation command" - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then - removelist="$obj $lobj $libobj ${libobj}T" - else - removelist="$lobj $libobj ${libobj}T" - fi - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in - cygwin* | mingw* | pw32* | os2* | cegcc*) - pic_mode=default - ;; - esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi - - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - else - output_obj= - need_locks=no - lockfile= - fi - - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then - $ECHO "\ -*** ERROR, $lockfile exists and contains: -`cat $lockfile 2>/dev/null` - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist - func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - - func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 - srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - - # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then - # Without this assignment, base_compile gets emptied. - fbsd_hideous_sh_bug=$base_compile - - if test "$pic_mode" != no; then - command="$base_compile $qsrcfile $pic_flag" - else - # Don't build PIC code - command="$base_compile $qsrcfile" - fi - - func_mkdir_p "$xdir$objdir" - - if test -z "$output_obj"; then - # Place PIC objects in $objdir - func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ - 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - func_show_eval '$MV "$output_obj" "$lobj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - - # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then - suppress_output=' >/dev/null 2>&1' - fi - fi - - # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then - # Don't build PIC code - command="$base_compile $qsrcfile$pie_flag" - else - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then - func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. - func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - func_show_eval '$MV "$output_obj" "$obj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - fi - - $opt_dry_run || { - func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" - - # Unlock the critical section if it was locked - if test "$need_locks" != no; then - removelist=$lockfile - $RM "$lockfile" - fi - } - - exit $EXIT_SUCCESS -} - -$opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} -} - -func_mode_help () -{ - # We need to display help for each of the modes. - case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. - func_help - ;; - - clean) - $ECHO \ -"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - - compile) - $ECHO \ -"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to build PIC objects only - -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - - execute) - $ECHO \ -"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - - finish) - $ECHO \ -"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - - install) - $ECHO \ -"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The following components of INSTALL-COMMAND are treated specially: - - -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - - link) - $ECHO \ -"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -bindir BINDIR specify path to binaries directory (for systems where - libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -shared only do dynamic linking of libtool libraries - -shrext SUFFIX override the standard shared library file extension - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -weak LIBNAME declare that the target provides the LIBNAME interface - -Wc,FLAG - -Xcompiler FLAG pass linker-specific FLAG directly to the compiler - -Wl,FLAG - -Xlinker FLAG pass linker-specific FLAG directly to the linker - -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - - uninstall) - $ECHO \ -"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - - *) - func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - - echo - $ECHO "Try \`$progname --help' for more information about other modes." -} - -# Now that we've collected a possible --mode arg, show help if necessary -if $opt_help; then - if test "$opt_help" = :; then - func_mode_help - else - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done - } | - sed '1d - /^When reporting/,/^Report/{ - H - d - } - $x - /information about other modes/d - /more detailed .*MODE/d - s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' - fi - exit $? -fi - - -# func_mode_execute arg... -func_mode_execute () -{ - $opt_debug - # The first argument is the command name. - cmd="$nonopt" - test -z "$cmd" && \ - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. - for file in $opt_dlopen; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" - - # Read the libtool library. - dlname= - library_names= - func_source "$file" - - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" - continue - fi - - func_dirname "$file" "" "." - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then - func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" - fi - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - func_dirname "$file" "" "." - dir="$func_dirname_result" - ;; - - *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" - continue - ;; - esac - - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" - - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -* | *.la | *.lo ) ;; - *) - # Do a test to see if this is really a libtool program. - if func_ltwrapper_script_p "$file"; then - func_source "$file" - # Transform arg to wrapped name. - file="$progdir/$program" - elif func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - func_source "$func_ltwrapper_scriptname_result" - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi - - # Restore saved environment variables - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - else - $lt_unset $lt_var - fi" - done - - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS - fi -} - -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - -# func_mode_finish arg... -func_mode_finish () -{ - $opt_debug - libs= - libdirs= - admincmds= - - for opt in "$nonopt" ${1+"$@"} - do - if test -d "$opt"; then - func_append libdirs " $opt" - - elif test -f "$opt"; then - if func_lalib_unsafe_p "$opt"; then - func_append libs " $opt" - else - func_warning "\`$opt' is not a valid libtool archive" - fi - - else - func_fatal_error "invalid argument \`$opt'" - fi - done - - if test -n "$libs"; then - if test -n "$lt_sysroot"; then - sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` - sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" - else - sysroot_cmd= - fi - - # Remove sysroot references - if $opt_dry_run; then - for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" - done - else - tmpdir=`func_mktempdir` - for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ - > $tmpdir/tmp-la - mv -f $tmpdir/tmp-la $lib - done - ${RM}r "$tmpdir" - fi - fi - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - func_execute_cmds "$finish_cmds" 'admincmds="$admincmds -'"$cmd"'"' - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - - echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" - echo "pages." - ;; - *) - echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - echo "----------------------------------------------------------------------" - fi - exit $EXIT_SUCCESS -} - -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - -# func_mode_install arg... -func_mode_install () -{ - $opt_debug - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then - # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " - arg=$1 - shift - else - install_prog= - arg=$nonopt - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; - *) install_cp=false ;; - esac - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - no_mode=: - for arg - do - arg2= - if test -n "$dest"; then - func_append files " $dest" - dest=$arg - continue - fi - - case $arg in - -d) isdir=yes ;; - -f) - if $install_cp; then :; else - prev=$arg - fi - ;; - -g | -m | -o) - prev=$arg - ;; - -s) - stripme=" -s" - continue - ;; - -*) - ;; - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then - arg2=$install_override_mode - no_mode=false - fi - prev= - else - dest=$arg - continue - fi - ;; - esac - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi - func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ - func_fatal_help "you must specify an install program" - - test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" - - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - - if test -z "$files"; then - if test -z "$dest"; then - func_fatal_help "no file or destination specified" - else - func_fatal_help "you must specify a destination" - fi - fi - - # Strip any trailing slash from the destination. - func_stripname '' '/' "$dest" - dest=$func_stripname_result - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" - - # Not a directory, so check to see that there is only one file specified. - set dummy $files; shift - test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - func_fatal_help "\`$destdir' must be an absolute directory name" - ;; - esac - done - ;; - esac - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do - - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - func_append staticlibs " $file" - ;; - - *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" - - library_names= - old_library= - relink_command= - func_source "$file" - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" - func_append dir "$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - - func_warning "relinking \`$file'" - func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' - fi - - # See the names of the shared library. - set dummy $library_names; shift - if test -n "$1"; then - realname="$1" - shift - - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. - func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ - 'exit $?' - tstripme="$stripme" - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - case $realname in - *.dll.a) - tstripme="" - ;; - esac - ;; - esac - if test -n "$tstripme" && test -n "$striplib"; then - func_show_eval "$striplib $destdir/$realname" 'exit $?' - fi - - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. - for linkname - do - test "$linkname" != "$realname" \ - && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" - done - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - func_execute_cmds "$postinstall_cmds" 'exit $?' - fi - - # Install the pseudo-library for information purposes. - func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. - test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) - # Install (i.e. copy) a libtool object. - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - func_lo2o "$destfile" - staticdest=$func_lo2o_result - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" - ;; - esac - - # Install the libtool object if requested. - test -n "$destfile" && \ - func_show_eval "$install_prog $file $destfile" 'exit $?' - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - func_lo2o "$file" - staticobj=$func_lo2o_result - func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' - fi - exit $EXIT_SUCCESS - ;; - - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install - stripped_ext="" - case $file in - *.exe) - if test ! -f "$file"; then - func_stripname '' '.exe' "$file" - file=$func_stripname_result - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin* | *mingw*) - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - wrapper=$func_ltwrapper_scriptname_result - else - func_stripname '' '.exe' "$file" - wrapper=$func_stripname_result - fi - ;; - *) - wrapper=$file - ;; - esac - if func_ltwrapper_script_p "$wrapper"; then - notinst_deplibs= - relink_command= - - func_source "$wrapper" - - # Check the variables that should have been set. - test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" - - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - func_source "$lib" - fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no - fi - done - - relink_command= - func_source "$wrapper" - - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - $opt_dry_run || { - if test "$finalize" = yes; then - tmpdir=`func_mktempdir` - func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - - $opt_silent || { - func_quote_for_expand "$relink_command" - eval "func_echo $func_quote_for_expand_result" - } - if eval "$relink_command"; then : - else - func_error "error: relink \`$file' with the above command before installing it" - $opt_dry_run || ${RM}r "$tmpdir" - continue - fi - file="$outputname" - else - func_warning "cannot relink \`$file'" - fi - } - else - # Install the binary that we compiled earlier. - file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - func_stripname '' '.exe' "$destfile" - destfile=$func_stripname_result - ;; - esac - ;; - esac - func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' - $opt_dry_run || if test -n "$outputname"; then - ${RM}r "$tmpdir" - fi - ;; - esac - done - - for file in $staticlibs; do - func_basename "$file" - name="$func_basename_result" - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - - func_show_eval "$install_prog \$file \$oldlib" 'exit $?' - - if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $tool_oldlib" 'exit $?' - fi - - # Do each command in the postinstall commands. - func_execute_cmds "$old_postinstall_cmds" 'exit $?' - done - - test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi -} - -test "$opt_mode" = install && func_mode_install ${1+"$@"} - - -# func_generate_dlsyms outputname originator pic_p -# Extract symbols from dlprefiles and create ${outputname}S.o with -# a dlpreopen symbol table. -func_generate_dlsyms () -{ - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` - my_dlsyms= - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" - else - func_error "not configured to extract global symbols from dlpreopened files" - fi - fi - - if test -n "$my_dlsyms"; then - case $my_dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" - - func_show_eval "$RM $nlist ${nlist}S ${nlist}T" - - # Parse the name list into a source file. - func_verbose "creating $output_objdir/$my_dlsyms" - - $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" -#endif - -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - -/* External symbol declarations for the compiler. */\ -" - - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" - - $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do - func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" - $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $opt_dry_run || { - eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - if test -n "$export_symbols_regex"; then - $opt_dry_run || { - eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" - $opt_dry_run || { - $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - } - else - $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - } - fi - fi - - for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" - case $host in - *cygwin* | *mingw* | *cegcc* ) - # if an import library, we need to obtain dlname - if func_win32_import_lib_p "$dlprefile"; then - func_tr_sh "$dlprefile" - eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" - if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then - # Use subshell, to avoid clobbering current variable values - dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then - func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" - else - # no lafile. user explicitly requested -dlpreopen . - $sharedlib_from_linklib_cmd "$dlprefile" - dlprefile_dlbasename=$sharedlib_from_linklib_result - fi - fi - $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then - eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' - else - func_warning "Could not compute DLL name from $name" - eval '$ECHO ": $name " >> "$nlist"' - fi - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | - $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" - } - else # not an import lib - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - fi - ;; - *) - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - ;; - esac - done - - $opt_dry_run || { - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $MV "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. - if $GREP -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 - else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - $GREP -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' - else - echo '/* NONE */' >> "$output_objdir/$my_dlsyms" - fi - - echo >> "$output_objdir/$my_dlsyms" "\ - -/* The mapping between symbol names and symbols. */ -typedef struct { - const char *name; - void *address; -} lt_dlsymlist; -extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; -LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," - - case $need_lib_prefix in - no) - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - *) - eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - esac - echo >> "$output_objdir/$my_dlsyms" "\ - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_${my_prefix}_LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - } # !$opt_dry_run - - pic_flag_for_symtable= - case "$compile_command " in - *" -static "*) ;; - *) - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; - *-*-hpux*) - pic_flag_for_symtable=" $pic_flag" ;; - *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi - ;; - esac - ;; - esac - symtab_cflags= - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; - *) func_append symtab_cflags " $arg" ;; - esac - done - - # Now compile the dynamic symbol file. - func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' - - # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' - - # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" - case $host in - *cygwin* | *mingw* | *cegcc* ) - if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - else - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - fi - ;; - *) - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - ;; - esac - ;; - *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" - ;; - esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` - fi -} - -# func_win32_libid arg -# return the library type of file 'arg' -# -# Need a lot of goo to handle *both* DLLs and import libs -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -# Despite the name, also deal with 64 bit binaries. -func_win32_libid () -{ - $opt_debug - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' - 1,100{ - / I /{ - s,.*,import, - p - q - } - }'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac - fi - ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; - esac - ;; - esac - $ECHO "$win32_libid_type" -} - -# func_cygming_dll_for_implib ARG -# -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib () -{ - $opt_debug - sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -} - -# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -# -# The is the core of a fallback implementation of a -# platform-specific function to extract the name of the -# DLL associated with the specified import library LIBNAME. -# -# SECTION_NAME is either .idata$6 or .idata$7, depending -# on the platform and compiler that created the implib. -# -# Echos the name of the DLL associated with the -# specified import library. -func_cygming_dll_for_implib_fallback_core () -{ - $opt_debug - match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` - $OBJDUMP -s --section "$1" "$2" 2>/dev/null | - $SED '/^Contents of section '"$match_literal"':/{ - # Place marker at beginning of archive member dllname section - s/.*/====MARK====/ - p - d - } - # These lines can sometimes be longer than 43 characters, but - # are always uninteresting - /:[ ]*file format pe[i]\{,1\}-/d - /^In archive [^:]*:/d - # Ensure marker is printed - /^====MARK====/p - # Remove all lines with less than 43 characters - /^.\{43\}/!d - # From remaining lines, remove first 43 characters - s/^.\{43\}//' | - $SED -n ' - # Join marker and all lines until next marker into a single line - /^====MARK====/ b para - H - $ b para - b - :para - x - s/\n//g - # Remove the marker - s/^====MARK====// - # Remove trailing dots and whitespace - s/[\. \t]*$// - # Print - /./p' | - # we now have a list, one entry per line, of the stringified - # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is - # a '.' (that is, objdump's representation of an unprintable - # character.) This should work for all archives with less than - # 0x302f exports -- but will fail for DLLs whose name actually - # begins with a literal '.' or a single character followed by - # a '.'. - # - # Of those that remain, print the first one. - $SED -e '/^\./d;/^.\./d;q' -} - -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - -# func_cygming_dll_for_implib_fallback ARG -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# -# This fallback implementation is for use when $DLLTOOL -# does not support the --identify-strict option. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib_fallback () -{ - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then - # binutils import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then - # ms-generated import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` - else - # unknown - sharedlib_from_linklib_result="" - fi -} - - -# func_extract_an_archive dir oldlib -func_extract_an_archive () -{ - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then - lockfile=$f_ex_an_ar_oldlib.lock - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - fi - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ - 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then - $opt_dry_run || rm -f "$lockfile" - fi - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" - fi -} - - -# func_extract_archives gentop oldlib ... -func_extract_archives () -{ - $opt_debug - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - func_basename "$my_xlib" - my_xlib="$func_basename_result" - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) - func_arith $extracted_serial + 1 - extracted_serial=$func_arith_result - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; - esac - done - extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" - - func_mkdir_p "$my_xdir" - - case $host in - *-darwin*) - func_verbose "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - $opt_dry_run || { - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` - darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` - if test -n "$darwin_arches"; then - darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ - cd "$darwin_orig_dir" - else - cd $darwin_orig_dir - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - } # !$opt_dry_run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" -} - - -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. -# -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=${1-no} - - $ECHO "\ -#! $SHELL - -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='$sed_quote_subst' - -# Be Bourne compatible -if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command=\"$relink_command\" - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variables: - generated_by_libtool_version='$macro_version' - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$ECHO are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - file=\"\$0\"" - - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` - $ECHO "\ - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - ECHO=\"$qECHO\" - fi - -# Very basic option parsing. These options are (a) specific to -# the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on -# windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match -# this pattern). -# -# There are only two supported options: --lt-debug and -# --lt-dump-script. There is, deliberately, no --lt-help. -# -# The first argument to this parsing function should be the -# script's $0 value, followed by "$@". -lt_option_debug= -func_parse_lt_options () -{ - lt_script_arg0=\$0 - shift - for lt_opt - do - case \"\$lt_opt\" in - --lt-debug) lt_option_debug=1 ;; - --lt-dump-script) - lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` - test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. - lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` - cat \"\$lt_dump_D/\$lt_dump_F\" - exit 0 - ;; - --lt-*) - \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 - exit 1 - ;; - esac - done - - # Print the debug banner immediately: - if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 - fi -} - -# Used when --lt-debug. Prints its arguments to stdout -# (redirection is the responsibility of the caller) -func_lt_dump_args () -{ - lt_dump_args_N=1; - for lt_arg - do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" - lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` - done -} - -# Core function for launching the target application -func_exec_program_core () -{ -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 -} - -# A function to encapsulate launching the target application -# Strips options in the --lt-* namespace from \$@ and -# launches target application with the remaining arguments. -func_exec_program () -{ - case \" \$* \" in - *\\ --lt-*) - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done ;; - esac - func_exec_program_core \${1+\"\$@\"} -} - - # Parse options - func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` - done - - # Usually 'no', except on cygwin/mingw when embedded into - # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 - if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then - # special case for '.' - if test \"\$thisdir\" = \".\"; then - thisdir=\`pwd\` - fi - # remove .libs from thisdir - case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; - $objdir ) thisdir=. ;; - esac - fi - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" - - if test "$fast_install" = yes; then - $ECHO "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" - - if test ! -d \"\$progdir\"; then - $MKDIR \"\$progdir\" - else - $RM \"\$progdir/\$file\" - fi" - - $ECHO "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" - exit 1 - fi - fi - - $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $RM \"\$progdir/\$program\"; - $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $RM \"\$progdir/\$file\" - fi" - else - $ECHO "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" - fi - - $ECHO "\ - - if test -f \"\$progdir/\$program\"; then" - - # fixup the dll searchpath if we need to. - # - # Fix the DLL searchpath if we need to. Do this before prepending - # to shlibpath, because on Windows, both are PATH and uninstalled - # libraries must come first. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` - - export $shlibpath_var -" - fi - - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. - func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi -fi\ -" -} - - -# func_emit_cwrapperexe_src -# emit the source code for a wrapper executable on stdout -# Must ONLY be called from within func_mode_link because -# it depends on a number of variable set therein. -func_emit_cwrapperexe_src () -{ - cat < -#include -#ifdef _MSC_VER -# include -# include -# include -#else -# include -# include -# ifdef __CYGWIN__ -# include -# endif -#endif -#include -#include -#include -#include -#include -#include -#include -#include - -/* declarations of non-ANSI functions */ -#if defined(__MINGW32__) -# ifdef __STRICT_ANSI__ -int _putenv (const char *); -# endif -#elif defined(__CYGWIN__) -# ifdef __STRICT_ANSI__ -char *realpath (const char *, char *); -int putenv (char *); -int setenv (const char *, const char *, int); -# endif -/* #elif defined (other platforms) ... */ -#endif - -/* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -# define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -#elif defined(__CYGWIN__) -# define HAVE_SETENV -# define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ -#endif - -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif - -#ifndef S_IXOTH -# define S_IXOTH 0 -#endif -#ifndef S_IXGRP -# define S_IXGRP 0 -#endif - -/* path handling portability macros */ -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' -#endif - -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# define FOPEN_WB "wb" -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif -#endif - -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ - -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ - -#ifndef FOPEN_WB -# define FOPEN_WB "w" -#endif -#ifndef _O_BINARY -# define _O_BINARY 0 -#endif - -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) - -#if defined(LT_DEBUGWRAPPER) -static int lt_debug = 1; -#else -static int lt_debug = 0; -#endif - -const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - -void *xmalloc (size_t num); -char *xstrdup (const char *string); -const char *base_name (const char *name); -char *find_executable (const char *wrapper); -char *chase_symlinks (const char *pathspec); -int make_executable (const char *path); -int check_executable (const char *path); -char *strendzap (char *str, const char *pat); -void lt_debugprintf (const char *file, int line, const char *fmt, ...); -void lt_fatal (const char *file, int line, const char *message, ...); -static const char *nonnull (const char *s); -static const char *nonempty (const char *s); -void lt_setenv (const char *name, const char *value); -char *lt_extend_str (const char *orig_value, const char *add, int to_end); -void lt_update_exe_path (const char *name, const char *value); -void lt_update_lib_path (const char *name, const char *value); -char **prepare_spawn (char **argv); -void lt_dump_script (FILE *f); -EOF - - cat <= 0) - && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) - return 1; - else - return 0; -} - -int -make_executable (const char *path) -{ - int rval = 0; - struct stat st; - - lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", - nonempty (path)); - if ((!path) || (!*path)) - return 0; - - if (stat (path, &st) >= 0) - { - rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); - } - return rval; -} - -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise - Does not chase symlinks, even on platforms that support them. -*/ -char * -find_executable (const char *wrapper) -{ - int has_slash = 0; - const char *p; - const char *p_next; - /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; - int tmp_len; - char *concat_name; - - lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", - nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; - - /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif - - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char *path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char *q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR (*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = - XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - return NULL; -} - -char * -chase_symlinks (const char *pathspec) -{ -#ifndef S_ISLNK - return xstrdup (pathspec); -#else - char buf[LT_PATHMAX]; - struct stat s; - char *tmp_pathspec = xstrdup (pathspec); - char *p; - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { - lt_debugprintf (__FILE__, __LINE__, - "checking path component for symlinks: %s\n", - tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) - { - has_symlinks = 1; - break; - } - - /* search backwards for last DIR_SEPARATOR */ - p = tmp_pathspec + strlen (tmp_pathspec) - 1; - while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - p--; - if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - { - /* no more DIR_SEPARATORS left */ - break; - } - *p = '\0'; - } - else - { - lt_fatal (__FILE__, __LINE__, - "error accessing file \"%s\": %s", - tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); - - if (!has_symlinks) - { - return xstrdup (pathspec); - } - - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { - lt_fatal (__FILE__, __LINE__, - "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); -#endif -} - -char * -strendzap (char *str, const char *pat) -{ - size_t len, patlen; - - assert (str != NULL); - assert (pat != NULL); - - len = strlen (str); - patlen = strlen (pat); - - if (patlen <= len) - { - str += len - patlen; - if (strcmp (str, pat) == 0) - *str = '\0'; - } - return str; -} - -void -lt_debugprintf (const char *file, int line, const char *fmt, ...) -{ - va_list args; - if (lt_debug) - { - (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); - } -} - -static void -lt_error_core (int exit_status, const char *file, - int line, const char *mode, - const char *message, va_list ap) -{ - fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - - if (exit_status >= 0) - exit (exit_status); -} - -void -lt_fatal (const char *file, int line, const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); -} - -static const char * -nonnull (const char *s) -{ - return s ? s : "(null)"; -} - -static const char * -nonempty (const char *s) -{ - return (s && !*s) ? "(empty)" : nonnull (s); -} - -void -lt_setenv (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_setenv) setting '%s' to '%s'\n", - nonnull (name), nonnull (value)); - { -#ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ - char *str = xstrdup (value); - setenv (name, str, 1); -#else - int len = strlen (name) + 1 + strlen (value) + 1; - char *str = XMALLOC (char, len); - sprintf (str, "%s=%s", name, value); - if (putenv (str) != EXIT_SUCCESS) - { - XFREE (str); - } -#endif - } -} - -char * -lt_extend_str (const char *orig_value, const char *add, int to_end) -{ - char *new_value; - if (orig_value && *orig_value) - { - int orig_value_len = strlen (orig_value); - int add_len = strlen (add); - new_value = XMALLOC (char, add_len + orig_value_len + 1); - if (to_end) - { - strcpy (new_value, orig_value); - strcpy (new_value + orig_value_len, add); - } - else - { - strcpy (new_value, add); - strcpy (new_value + add_len, orig_value); - } - } - else - { - new_value = xstrdup (add); - } - return new_value; -} - -void -lt_update_exe_path (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { - char *new_value = lt_extend_str (getenv (name), value, 0); - /* some systems can't cope with a ':'-terminated path #' */ - int len = strlen (new_value); - while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) - { - new_value[len-1] = '\0'; - } - lt_setenv (name, new_value); - XFREE (new_value); - } -} - -void -lt_update_lib_path (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { - char *new_value = lt_extend_str (getenv (name), value, 0); - lt_setenv (name, new_value); - XFREE (new_value); - } -} - -EOF - case $host_os in - mingw*) - cat <<"EOF" - -/* Prepares an argument vector before calling spawn(). - Note that spawn() does not by itself call the command interpreter - (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : - ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&v); - v.dwPlatformId == VER_PLATFORM_WIN32_NT; - }) ? "cmd.exe" : "command.com"). - Instead it simply concatenates the arguments, separated by ' ', and calls - CreateProcess(). We must quote the arguments since Win32 CreateProcess() - interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a - special way: - - Space and tab are interpreted as delimiters. They are not treated as - delimiters if they are surrounded by double quotes: "...". - - Unescaped double quotes are removed from the input. Their only effect is - that within double quotes, space and tab are treated like normal - characters. - - Backslashes not followed by double quotes are not special. - - But 2*n+1 backslashes followed by a double quote become - n backslashes followed by a double quote (n >= 0): - \" -> " - \\\" -> \" - \\\\\" -> \\" - */ -#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -char ** -prepare_spawn (char **argv) -{ - size_t argc; - char **new_argv; - size_t i; - - /* Count number of arguments. */ - for (argc = 0; argv[argc] != NULL; argc++) - ; - - /* Allocate new argument vector. */ - new_argv = XMALLOC (char *, argc + 1); - - /* Put quoted arguments into the new argument vector. */ - for (i = 0; i < argc; i++) - { - const char *string = argv[i]; - - if (string[0] == '\0') - new_argv[i] = xstrdup ("\"\""); - else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) - { - int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); - size_t length; - unsigned int backslashes; - const char *s; - char *quoted_string; - char *p; - - length = 0; - backslashes = 0; - if (quote_around) - length++; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - length += backslashes + 1; - length++; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - length += backslashes + 1; - - quoted_string = XMALLOC (char, length + 1); - - p = quoted_string; - backslashes = 0; - if (quote_around) - *p++ = '"'; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - { - unsigned int j; - for (j = backslashes + 1; j > 0; j--) - *p++ = '\\'; - } - *p++ = c; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - { - unsigned int j; - for (j = backslashes; j > 0; j--) - *p++ = '\\'; - *p++ = '"'; - } - *p = '\0'; - - new_argv[i] = quoted_string; - } - else - new_argv[i] = (char *) string; - } - new_argv[argc] = NULL; - - return new_argv; -} -EOF - ;; - esac - - cat <<"EOF" -void lt_dump_script (FILE* f) -{ -EOF - func_emit_wrapper yes | - $SED -n -e ' -s/^\(.\{79\}\)\(..*\)/\1\ -\2/ -h -s/\([\\"]\)/\\\1/g -s/$/\\n/ -s/\([^\n]*\).*/ fputs ("\1", f);/p -g -D' - cat <<"EOF" -} -EOF -} -# end: func_emit_cwrapperexe_src - -# func_win32_import_lib_p ARG -# True if ARG is an import lib, as indicated by $file_magic_cmd -func_win32_import_lib_p () -{ - $opt_debug - case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -} - -# func_mode_link arg... -func_mode_link () -{ - $opt_debug - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - # It is impossible to link a dll without this setting, and - # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra - # flag for every libtool invocation. - # allow_undefined=no - - # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not - # even a static library is built. For now, we need to specify - # -no-undefined on the libtool link line when we can be certain - # that all symbols are satisfied, otherwise we get a static library. - allow_undefined=yes - ;; - *) - allow_undefined=yes - ;; - esac - libtool_args=$nonopt - base_compile="$nonopt $@" - compile_command=$nonopt - finalize_command=$nonopt - - compile_rpath= - finalize_rpath= - compile_shlibpath= - finalize_shlibpath= - convenience= - old_convenience= - deplibs= - old_deplibs= - compiler_flags= - linker_flags= - dllsearchpath= - lib_search_path=`pwd` - inst_prefix_dir= - new_inherited_linker_flags= - - avoid_version=no - bindir= - dlfiles= - dlprefiles= - dlself=no - export_dynamic=no - export_symbols= - export_symbols_regex= - generated= - libobjs= - ltlibs= - module=no - no_install=no - objs= - non_pic_objects= - precious_files_regex= - prefer_static_libs=no - preload=no - prev= - prevarg= - release= - rpath= - xrpath= - perm_rpath= - temp_rpath= - thread_safe=no - vinfo= - vinfo_number=no - weak_libs= - single_module="${wl}-single_module" - func_infer_tag $base_compile - - # We need to know -static, to get the right output filenames. - for arg - do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" - build_old_libs=no - break - ;; - -all-static | -static | -static-libtool-libs) - case $arg in - -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then - func_warning "complete static linking is impossible in this configuration" - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=built - ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done - - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result - func_append libtool_args " $func_quote_for_eval_result" - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - func_append compile_command " @OUTPUT@" - func_append finalize_command " @OUTPUT@" - ;; - esac - - case $prev in - bindir) - bindir="$arg" - prev= - continue - ;; - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - func_append compile_command " @SYMFILE@" - func_append finalize_command " @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - func_append dlfiles " $arg" - else - func_append dlprefiles " $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - framework) - case $host in - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; - *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; - esac - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat "$save_arg"` - do -# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - if test -z "$pic_object" || - test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - done - else - func_fatal_error "link input file \`$arg' does not exist" - fi - arg=$save_arg - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) func_append xrpath " $arg" ;; - esac - fi - prev= - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - weak) - func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) - func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n "$prev" - - prevarg="$arg" - - case $arg in - -all-static) - if test -n "$link_static_flag"; then - # See comment for -static flag below, for more details. - func_append compile_command " $link_static_flag" - func_append finalize_command " $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" - ;; - - -avoid-version) - avoid_version=yes - continue - ;; - - -bindir) - prev=bindir - continue - ;; - - -dlopen) - prev=dlfiles - continue - ;; - - -dlpreopen) - prev=dlprefiles - continue - ;; - - -export-dynamic) - export_dynamic=yes - continue - ;; - - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - func_fatal_error "more than one -exported-symbols argument is not allowed" - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; - - -framework) - prev=framework - continue - ;; - - -inst-prefix-dir) - prev=inst_prefix - continue - ;; - - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - func_append compile_command " $arg" - func_append finalize_command " $arg" - ;; - esac - continue - ;; - - -L*) - func_stripname "-L" '' "$arg" - if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "* | *" $arg "*) - # Will only happen for absolute or sysroot arguments - ;; - *) - # Preserve sysroot, but never include relative directories - case $dir in - [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; - *) func_append deplibs " -L$dir" ;; - esac - func_append lib_search_path " $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; - *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac - continue - ;; - - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - func_append deplibs " $arg" - continue - ;; - - -module) - module=yes - continue - ;; - - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot|--sysroot) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler - continue - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; - * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; - - -multi_module) - single_module="${wl}-multi_module" - continue - ;; - - -no-fast-install) - fast_install=no - continue - ;; - - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) - # The PATH hackery in wrapper scripts is required on Windows - # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; - - -no-undefined) - allow_undefined=no - continue - ;; - - -objectlist) - prev=objectlist - continue - ;; - - -o) prev=output ;; - - -precious-files-regex) - prev=precious_regex - continue - ;; - - -release) - prev=release - continue - ;; - - -rpath) - prev=rpath - continue - ;; - - -R) - prev=xrpath - continue - ;; - - -R*) - func_stripname '-R' '' "$arg" - dir=$func_stripname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - =*) - func_stripname '=' '' "$dir" - dir=$lt_sysroot$func_stripname_result - ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) func_append xrpath " $dir" ;; - esac - continue - ;; - - -shared) - # The effects of -shared are defined in a previous loop. - continue - ;; - - -shrext) - prev=shrext - continue - ;; - - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue - ;; - - -thread-safe) - thread_safe=yes - continue - ;; - - -version-info) - prev=vinfo - continue - ;; - - -version-number) - prev=vinfo - vinfo_number=yes - continue - ;; - - -weak) - prev=weak - continue - ;; - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Xlinker) - prev=xlinker - continue - ;; - - -XCClinker) - prev=xcclinker - continue - ;; - - # -msg_* for osf cc - -msg_*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - # Flags to be passed through unchanged, with rationale: - # -64, -mips[0-9] enable 64-bit mode for the SGI compiler - # -r[0-9][0-9]* specify processor for the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler - # +DA*, +DD* enable 64-bit mode for the HP compiler - # -q* compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* architecture-specific flags for GCC - # -F/path path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* profiling flags for GCC - # @file GCC response files - # -tp=* Portland pgcc target processor selection - # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" - func_append compiler_flags " $arg" - continue - ;; - - # Some other compiler flag. - -* | +*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - *.$objext) - # A standard object. - func_append objs " $arg" - ;; - - *.lo) - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - if test -z "$pic_object" || - test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - ;; - - *.$libext) - # An archive. - func_append deplibs " $arg" - func_append old_deplibs " $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - - func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - func_append dlfiles " $func_resolve_sysroot_result" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - func_append dlprefiles " $func_resolve_sysroot_result" - prev= - else - func_append deplibs " $func_resolve_sysroot_result" - fi - continue - ;; - - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - esac # arg - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - done # argument parsing loop - - test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - - oldlibs= - # calculate the name of the file, without its directory - func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` - else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" - func_to_tool_file "$output_objdir/" - tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - - # Determine the type of output - case $output in - "") - func_fatal_help "you must specify an output file" - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - specialdeplibs= - - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then - case "$libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append libs " $deplib" - done - - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" - - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac - func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= - fi - - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries - - case $linkmode in - lib) - passes="conv dlpreopen link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" - ;; - esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - - for pass in $passes; do - # The preopen pass in lib mode reverses $deplibs; put it back here - # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then - ## FIXME: Find the place where the list is rebuilt in the wrong - ## order, and fix it there properly - tmp_deplibs= - for deplib in $deplibs; do - tmp_deplibs="$deplib $tmp_deplibs" - done - deplibs="$tmp_deplibs" - fi - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= - fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; - esac - fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then - # Collect and forward deplibs of preopened libtool libs - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= - func_resolve_sysroot "$lib" - case $lib in - *.la) func_source "$func_resolve_sysroot_result" ;; - esac - - # Collect preopened libtool deplibs, except any this library - # has declared as weak libs - for deplib in $dependency_libs; do - func_basename "$deplib" - deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; - *) func_append deplibs " $deplib" ;; - esac - done - done - libs="$dlprefiles" - fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi - - for deplib in $libs; do - lib= - found=no - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" - continue - fi - func_stripname '-l' '' "$deplib" - name=$func_stripname_result - if test "$linkmode" = lib; then - searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" - else - searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" - fi - for searchdir in $searchdirs; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - fi - break 2 - fi - done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if func_lalib_p "$lib"; then - library_names= - old_library= - func_source "$lib" - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi - continue - ;; - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - prog) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) - func_resolve_sysroot "$deplib" - lib=$func_resolve_sysroot_result - ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - # Linking convenience modules into shared libraries is allowed, - # but linking other static libraries is non-portable. - case " $dlpreconveniencelibs " in - *" $deplib "*) ;; - *) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then - echo - $ECHO "*** Warning: Trying to link with static lib archive $deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because the file extensions .$libext of this argument makes me believe" - echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - ;; - esac - continue - ;; - prog) - if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append newdlfiles " $deplib" - fi - fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" - - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - inherited_linker_flags= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - avoidtemprpath= - - - # Read the .la file - func_source "$lib" - - # Convert "-framework foo" to "foo.ltframework" - if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; - *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - done - fi - dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && func_append dlfiles " $dlopen" - test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. - func_append convenience " $ladir/$objdir/$old_library" - func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi - continue - fi # $pass = conv - - - # Get the name of the library we link against. - linklib= - if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then - linklib=$old_library - else - for l in $old_library $library_names; do - linklib="$l" - done - fi - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. - func_append dlprefiles " $lib $dependency_libs" - else - func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen - - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; - *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" - func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" - fi - ;; - esac - func_basename "$lib" - laname="$func_basename_result" - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" - name=$func_stripname_result - - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi - case "$host" in - # special handling for platforms with PE-DLLs. - *cygwin* | *mingw* | *cegcc* ) - # Linker will automatically link against shared library if both - # static and shared are present. Therefore, ensure we extract - # symbols from the import library if a shared library is present - # (otherwise, the dlopen module name will be incorrect). We do - # this by putting the import library name into $newdlprefiles. - # We recover the dlopen module name by 'saving' the la file - # name in a special purpose variable, and (later) extracting the - # dlname from the la file. - if test -n "$dlname"; then - func_tr_sh "$dir/$linklib" - eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" - func_append newdlprefiles " $dir/$linklib" - else - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - fi - ;; - * ) - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - func_append newdlprefiles " $dir/$dlname" - else - func_append newdlprefiles " $dir/$linklib" - fi - ;; - esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else - deplibs="$lib $deplibs" # used for prog,scan pass - fi - continue - fi - - - if test "$linkmode" = prog && test "$pass" != link; then - func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi - - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... - - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; - *) func_append temp_rpath "$absdir:" ;; - esac - fi - - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac - fi # $linkmode,$pass = prog,link... - - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi - - link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then - use_static_libs=no - fi - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded - func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then - func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; - esac - # This is a shared library - - # Warn about portability, can't link against -module's on some - # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" - for dlpremoduletest in $dlprefiles; do - if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" - break - fi - done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - echo - if test "$linkmode" = prog; then - $ECHO "*** Warning: Linking the executable $output against the loadable module" - else - $ECHO "*** Warning: Linking the shared library $output against the loadable module" - fi - $ECHO "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac - fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - shift - realname="$1" - shift - libname=`eval "\\$ECHO \"$libname_spec\""` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw* | *cegcc*) - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - func_basename "$soroot" - soname="$func_basename_result" - func_stripname 'lib' '.dll' "$soname" - newlib=libimp-$func_stripname_result.a - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - func_verbose "extracting exported symbol list from \`$soname'" - func_execute_cmds "$extract_expsyms_cmds" 'exit $?' - fi - - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" - func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - - if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not - # link against it, someone is ignoring the earlier warnings - if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then - if test "X$dlopenmodule" != "X$lib"; then - $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then - echo - echo "*** And there doesn't seem to be a static archive available" - echo "*** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi - elif test -n "$old_library"; then - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - - if test "$lib_linked" != yes; then - func_fatal_configuration "unsupported hardcode properties" - fi - - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - - if test "$linkmode" = prog || test "$opt_mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi - - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" - else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - echo "*** But as you try to build a module library, libtool will still create " - echo "*** a static module, that should work as long as the dlopening application" - echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? - - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) func_stripname '-R' '' "$libdir" - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) func_append xrpath " $temp_xrpath";; - esac;; - *) func_append temp_deplibs " $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - - func_append newlib_search_path " $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result";; - *) func_resolve_sysroot "$deplib" ;; - esac - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $func_resolve_sysroot_result "*) - func_append specialdeplibs " $func_resolve_sysroot_result" ;; - esac - fi - func_append tmp_libs " $func_resolve_sysroot_result" - done - - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - path= - case $deplib in - -L*) path="$deplib" ;; - *.la) - func_resolve_sysroot "$deplib" - deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." - dir=$func_dirname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" - fi - ;; - esac - if $GREP "^installed=no" $deplib > /dev/null; then - case $host in - *-*-darwin*) - depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi - ;; - *) - path="-L$absdir/$objdir" - ;; - esac - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" - - path="-L$absdir" - fi - ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then - compile_deplibs="$new_inherited_linker_flags $compile_deplibs" - finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" - else - compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - fi - fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= - fi - - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) func_append tmp_libs " $deplib" ;; - esac - ;; - *) func_append tmp_libs " $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" - ;; - esac - if test -n "$i" ; then - func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" - fi - - case $linkmode in - oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" - - test -n "$release" && \ - func_warning "\`-release' is ignored for archives" - - test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" - - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - func_append objs "$old_deplibs" - ;; - - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - func_stripname 'lib' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" - - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - func_stripname '' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - func_stripname '' '.la' "$outputname" - libname=$func_stripname_result - fi - ;; - esac - - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" - else - echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" - func_append libobjs " $objs" - fi - fi - - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" - - set dummy $rpath - shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" - - install_libdir="$1" - - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" - - test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" - else - - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - shift - IFS="$save_ifs" - - test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" - - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible - - case $vinfo_number in - yes) - number_major="$1" - number_minor="$2" - number_revision="$3" - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix - # which has an extra 1 added just for fun - # - case $version_type in - # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_minor" - lt_irix_increment=no - ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; - esac - ;; - no) - current="$1" - revision="$2" - age="$3" - ;; - esac - - # Check that each of the things are valid numbers. - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" - fi - - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; - - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - func_arith $current + 1 - minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; - - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; - - freebsd-elf) - major=".$current" - versuffix=".$current" - ;; - - irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then - func_arith $current - $age - else - func_arith $current - $age + 1 - fi - major=$func_arith_result - - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - func_arith $revision - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; - - linux) # correct to gnu/linux during the next big refactor - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" - ;; - - osf) - func_arith $current - $age - major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - func_arith $current - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - func_append verstring ":${current}.0" - ;; - - qnx) - major=".$current" - versuffix=".$current" - ;; - - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; - - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - - *) - func_fatal_configuration "unknown library version type \`$version_type'" - ;; - esac - - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi - - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi - - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - - fi - - func_generate_dlsyms "$libname" "$libname" "yes" - func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - - if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$ECHO "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext | *.gcno) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - func_append removelist " $p" - ;; - *) ;; - esac - done - test -n "$removelist" && \ - func_show_eval "${RM}r \$removelist" - fi - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - #for path in $notinst_path; do - # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` - # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` - # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` - #done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do - func_replace_sysroot "$libdir" - func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi - - # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" - dlfiles= - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; - *) func_append dlfiles " $lib" ;; - esac - done - - # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" - dlprefiles= - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; - *) func_append dlprefiles " $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework - func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then - func_append deplibs " -lc" - fi - ;; - esac - fi - - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $opt_dry_run || $RM conftest.c - cat > conftest.c </dev/null` - $nocaseglob - else - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | - $GREP " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for file magic test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" - $ECHO "*** using a file magic. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - for a_deplib in $deplibs; do - case $a_deplib in - -l*) - func_stripname -l '' "$a_deplib" - name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval "\\$ECHO \"$libname_spec\""` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" - $ECHO "*** using a regex pattern. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` - done - fi - case $tmp_deplibs in - *[!\ \ ]*) - echo - if test "X$deplibs_check_method" = "Xnone"; then - echo "*** Warning: inter-library dependencies are not supported in this platform." - else - echo "*** Warning: inter-library dependencies are not known to be supported." - fi - echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - ;; - esac - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - echo - echo "*** Warning: libtool could not satisfy all declared inter-library" - $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - echo "*** a static module, that should work as long as the dlopening" - echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - echo "*** The inter-library dependencies that have been dropped here will be" - echo "*** automatically added whenever a program is linked with this library" - echo "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then - echo - echo "*** Since this library must not contain undefined symbols," - echo "*** because either the platform does not support them or" - echo "*** it was explicitly requested with -no-undefined," - echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - case $host in - *-*-darwin*) - newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; - esac - ;; - *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" - - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. - # FIXME: should test the right _cmds variable. - case $archive_cmds in - *\$LD\ *) wl= ;; - esac - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - func_replace_sysroot "$libdir" - libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - func_append rpath "$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - shift - realname="$1" - shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi - - lib="$output_objdir/$realname" - linknames= - for link - do - func_append linknames " $link" - done - - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` - test "X$libobjs" = "X " && libobjs= - - delfiles= - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" - func_append delfiles " $export_symbols" - fi - - orig_export_symbols= - case $host_os in - cygwin* | mingw* | cegcc*) - if test -n "$export_symbols" && test -z "$export_symbols_regex"; then - # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then - # and it's NOT already a .def file. Must figure out - # which of the given symbols are data symbols and tag - # them as such. So, trigger use of export_symbols_cmds. - # export_symbols gets reassigned inside the "prepare - # the list of exported symbols" if statement, so the - # include_expsyms logic still works. - orig_export_symbols="$export_symbols" - export_symbols= - always_export_symbols=yes - fi - fi - ;; - esac - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd1 in $cmds; do - IFS="$save_ifs" - # Take the normal branch if the nm_file_list_spec branch - # doesn't work or if tool conversion is not needed. - case $nm_file_list_spec~$to_tool_file_cmd in - *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) - try_normal_branch=yes - eval cmd=\"$cmd1\" - func_len " $cmd" - len=$func_len_result - ;; - *) - try_normal_branch=no - ;; - esac - if test "$try_normal_branch" = yes \ - && { test "$len" -lt "$max_cmd_len" \ - || test "$max_cmd_len" -le -1; } - then - func_show_eval "$cmd" 'exit $?' - skipped_export=false - elif test -n "$nm_file_list_spec"; then - func_basename "$output" - output_la=$func_basename_result - save_libobjs=$libobjs - save_output=$output - output=${output_objdir}/${output_la}.nm - func_to_tool_file "$output" - libobjs=$nm_file_list_spec$func_to_tool_file_result - func_append delfiles " $output" - func_verbose "creating $NM input file list: $output" - for obj in $save_libobjs; do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > "$output" - eval cmd=\"$cmd1\" - func_show_eval "$cmd" 'exit $?' - output=$save_output - libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. - func_verbose "using reloadable object file for export list..." - skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - fi - - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - func_append tmp_deplibs " $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && - test -z "$libobjs"; then - # extract the archives, so we have objects to list. - # TODO: could optimize this to just extract one archive. - whole_archive_flag_spec= - fi - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $convenience - func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi - - if test "X$skipped_export" != "X:" && - func_len " $test_cmds" && - len=$func_len_result && - test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise - # or, if using GNU ld and skipped_export is not :, use a linker - # script. - - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - func_basename "$output" - output_la=$func_basename_result - - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - last_robj= - k=1 - - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript - func_verbose "creating GNU ld script: $output" - echo 'INPUT (' > $output - for obj in $save_libobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output - done - echo ')' >> $output - func_append delfiles " $output" - func_to_tool_file "$output" - output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" - : > $output - set x $save_libobjs - shift - firstobj= - if test "$compiler_needs_object" = yes; then - firstobj="$1 " - shift - fi - for obj - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output - done - func_append delfiles " $output" - func_to_tool_file "$output" - output=$firstobj\"$file_list_spec$func_to_tool_file_result\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext - eval test_cmds=\"$reload_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - if test "X$objlist" = X || - test "$len" -lt "$max_cmd_len"; then - func_append objlist " $obj" - else - # The command $test_cmds is almost too long, add a - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - reload_objs=$objlist - eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 - k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext - objlist=" $obj" - func_len " $last_robj" - func_arith $len0 + $func_len_result - len=$func_arith_result - fi - done - # Handle the remaining objects by creating one last - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi - func_append delfiles " $output" - - else - output= - fi - - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $opt_dry_run || $RM $export_symbols - libobjs=$output - # Append the command to create the export file. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" - fi - fi - - test -n "$save_libobjs" && - func_verbose "creating a temporary reloadable object file: $output" - - # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - if test -n "$export_symbols_regex" && ${skipped_export-false}; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - - if ${skipped_export-false}; then - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - fi - - libobjs=$output - # Restore the value of output. - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi - fi - - if test -n "$delfiles"; then - # Append the command to remove temporary files to $cmds. - eval cmds=\"\$cmds~\$RM $delfiles\" - fi - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles - func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - func_show_eval '${RM}r "$gentop"' - fi - fi - - exit $EXIT_SUCCESS - fi - - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' - fi - done - - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; - - obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" - - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" - - test -n "$release" && \ - func_warning "\`-release' is ignored for objects" - - case $output in - *.lo) - test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" - - libobj=$output - func_lo2o "$libobj" - obj=$func_lo2o_result - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $opt_dry_run || $RM $obj $libobj - - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - else - gentop="$output_objdir/${obj}x" - func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - - # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" - - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - func_execute_cmds "$reload_cmds" 'exit $?' - - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - func_execute_cmds "$reload_cmds" 'exit $?' - fi - - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - ;; - - prog) - case $host in - *cygwin*) func_stripname '' '.exe' "$output" - output=$func_stripname_result.exe;; - esac - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" - - test -n "$release" && \ - func_warning "\`-release' is ignored for programs" - - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - case $host in - *-*-darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" - ;; - esac - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; - esac - ;; - *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - - func_append compile_command " $compile_deplibs" - func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; - *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - fi - - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" - - # template prelinking step - if test -n "$prelink_cmds"; then - func_execute_cmds "$prelink_cmds" 'exit $?' - fi - - wrappers_required=yes - case $host in - *cegcc* | *mingw32ce*) - # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no - ;; - *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - esac - if test "$wrappers_required" = no; then - # Replace the output file specification. - compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' - fi - - exit $exit_status - fi - - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi - - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi - - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - - func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output_objdir/$outputname" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - # Now create the wrapper script. - func_verbose "creating $output" - - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - fi - - # Only actually do things if not in dry run mode. - $opt_dry_run || { - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) func_stripname '' '.exe' "$output" - output=$func_stripname_result ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in - *cygwin*) - exeext=.exe - func_stripname '' '.exe' "$outputname" - outputname=$func_stripname_result ;; - *) exeext= ;; - esac - case $host in - *cygwin* | *mingw* ) - func_dirname_and_basename "$output" "" "." - output_name=$func_basename_result - output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" - $RM $cwrappersource $cwrapper - trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - - func_emit_cwrapperexe_src > $cwrappersource - - # The wrapper executable is built using the $host compiler, - # because it contains $host paths and files. If cross- - # compiling, it, like the target executable, must be - # executed on the $host or under an emulation environment. - $opt_dry_run || { - $LTCC $LTCFLAGS -o $cwrapper $cwrappersource - $STRIP $cwrapper - } - - # Now, create the wrapper script for func_source use: - func_ltwrapper_scriptname $cwrapper - $RM $func_ltwrapper_scriptname_result - trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 - $opt_dry_run || { - # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then - $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result - else - func_emit_wrapper no > $func_ltwrapper_scriptname_result - fi - } - ;; - * ) - $RM $output - trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - - func_emit_wrapper no > $output - chmod +x $output - ;; - esac - } - exit $EXIT_SUCCESS - ;; - esac - - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do - - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $addlibs - func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - cmds=$old_archive_from_new_cmds - else - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles - func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - func_basename "$obj" - $ECHO "$func_basename_result" - done | sort | sort -uc >/dev/null 2>&1); then - : - else - echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - func_basename "$obj" - objbase="$func_basename_result" - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - func_arith $counter + 1 - counter=$func_arith_result - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - func_append oldobjs " $gentop/$newobj" - ;; - *) func_append oldobjs " $obj" ;; - esac - done - fi - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - elif test -n "$archiver_list_spec"; then - func_verbose "using command file archive linking..." - for obj in $oldobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > $output_objdir/$libname.libcmd - func_to_tool_file "$output_objdir/$libname.libcmd" - oldobjs=" $archiver_list_spec$func_to_tool_file_result" - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs - oldobjs= - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj - done - eval test_cmds=\"$old_archive_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - for obj in $save_oldobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - func_append objlist " $obj" - if test "$len" -lt "$max_cmd_len"; then - : - else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - len=$len0 - fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" - else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi - func_execute_cmds "$cmds" 'exit $?' - done - - test -n "$generated" && \ - func_show_eval "${RM}r$generated" - - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - func_verbose "creating $output" - - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi - - # Only create the output if not a dry run. - $opt_dry_run || { - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break - fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - func_basename "$deplib" - name="$func_basename_result" - func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" - ;; - -L*) - func_stripname -L '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -L$func_replace_sysroot_result" - ;; - -R*) - func_stripname -R '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -R$func_replace_sysroot_result" - ;; - *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - - for lib in $dlfiles; do - case $lib in - *.la) - func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" - ;; - *) func_append newdlfiles " $lib" ;; - esac - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - *.la) - # Only pass preopened files to the pseudo-archive (for - # eventual linking with the app. that links it) if we - # didn't already link the preopened objects directly into - # the library: - func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi - $RM $output - # place dlname in correct position for cygwin - # In fact, it would be nice if we could use this code for all target - # systems that can't hard-code library paths into their executables - # and that have no shared library path variable independent of PATH, - # but it turns out we can't easily determine that from inspecting - # libtool variables, so we have to hard-code the OSs to which it - # applies here; at the moment, that means platforms that use the PE - # object format with DLL files. See the long comment at the top of - # tests/bindir.at for full details. - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) - # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then - func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname - else - # Otherwise fall back on heuristic. - tdlname=../bin/$dlname - fi - ;; - esac - $ECHO > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='$tdlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Linker flags that can not go in dependency_libs. -inherited_linker_flags='$new_inherited_linker_flags' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' - -# Names of additional weak libraries provided by this library -weak_library_names='$weak_libs' - -# Version information for $libname. -current=$current -age=$age -revision=$revision - -# Is this an already installed library? -installed=$installed - -# Should we warn about portability when linking against -modules? -shouldnotlink=$module - -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' - -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $ECHO >> $output "\ -relink_command=\"$relink_command\"" - fi - done - } - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' - ;; - esac - exit $EXIT_SUCCESS -} - -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -# func_mode_uninstall arg... -func_mode_uninstall () -{ - $opt_debug - RM="$nonopt" - files= - rmforce= - exit_status=0 - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - for arg - do - case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; - -*) func_append RM " $arg" ;; - *) func_append files " $arg" ;; - esac - done - - test -z "$RM" && \ - func_fatal_help "you must specify an RM program" - - rmdirs= - - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" - else - odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" - - # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then - case " $rmdirs " in - *" $odir "*) ;; - *) func_append rmdirs " $odir" ;; - esac - fi - - # Don't error if the file doesn't exist and rm -f was used. - if { test -L "$file"; } >/dev/null 2>&1 || - { test -h "$file"; } >/dev/null 2>&1 || - test -f "$file"; then - : - elif test -d "$file"; then - exit_status=1 - continue - elif test "$rmforce" = yes; then - continue - fi - - rmfiles="$file" - - case $name in - *.la) - # Possibly a libtool archive, so verify it. - if func_lalib_p "$file"; then - func_source $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - func_append rmfiles " $odir/$n" - done - test -n "$old_library" && func_append rmfiles " $odir/$old_library" - - case "$opt_mode" in - clean) - case " $library_names " in - *" $dlname "*) ;; - *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac - test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - # FIXME: should reinstall the best remaining shared library. - ;; - esac - fi - ;; - - *.lo) - # Possibly a libtool object, so verify it. - if func_lalib_p "$file"; then - - # Read the .lo file - func_source $dir/$name - - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then - func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then - func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) - if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) - func_stripname '' '.exe' "$file" - file=$func_stripname_result - func_stripname '' '.exe' "$name" - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe - func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. - if func_ltwrapper_p "$file"; then - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result - func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename - fi - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - func_append rmfiles " $odir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi - ;; - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then - func_show_eval "rmdir $dir >/dev/null 2>&1" - fi - done - - exit $exit_status -} - -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - -test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" -} - -test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" - -if test -n "$exec_cmd"; then - eval exec "$exec_cmd" - exit $EXIT_FAILURE -fi - -exit $exit_status - - -# The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting -# choices, we go for a static library, that is the most portable, -# since we can't tell whether shared libraries were disabled because -# the user asked for that or because the platform doesn't support -# them. This is particularly important on AIX, because we don't -# support having both static and shared libraries enabled at the same -# time on that platform, so we default to a shared-only configuration. -# If a disable-shared tag is given, we'll fallback to a static-only -# configuration. But we'll never go from static-only to shared-only. - -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -build_libtool_libs=no -build_old_libs=yes -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# vi:sw=2 - diff --git a/log4tango/config/missing b/log4tango/config/missing deleted file mode 100755 index 64b5f901d..000000000 --- a/log4tango/config/missing +++ /dev/null @@ -1,353 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2004-09-07.08 - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 -# Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY 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 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case "$1" in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Send bug reports to ." - exit 0 - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit 0 - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). -case "$1" in - lex|yacc) - # Not GNU programs, they don't have --version. - ;; - - tar) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case "$f" in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if [ ! -f y.tab.h ]; then - echo >y.tab.h - fi - if [ ! -f y.tab.c ]; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if [ ! -f lex.yy.c ]; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - makeinfo) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` - fi - touch $file - ;; - - tar) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case "$firstarg" in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case "$firstarg" in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/log4tango/config/mkinstalldirs b/log4tango/config/mkinstalldirs deleted file mode 100755 index 6fbe5e117..000000000 --- a/log4tango/config/mkinstalldirs +++ /dev/null @@ -1,150 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2004-02-15.20 - -# Original author: Noah Friedman -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -errstatus=0 -dirmode="" - -usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to ." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" - exit 0 - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --version) - echo "$0 $scriptversion" - exit 0 - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. -case $dirmode in - '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version - fi - ;; - *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done - fi - ;; -esac - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/log4tango/configure b/log4tango/configure deleted file mode 100644 index d51d4d4da..000000000 --- a/log4tango/configure +++ /dev/null @@ -1,19140 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for log4tango 5.0.1. -# -# Report bugs to . -# -# -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. -# -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi -" - as_required="as_fn_return () { (exit \$1); } -as_fn_success () { as_fn_return 0; } -as_fn_failure () { as_fn_return 1; } -as_fn_ret_success () { return 0; } -as_fn_ret_failure () { return 1; } - -exitcode=0 -as_fn_success || { exitcode=1; echo as_fn_success failed.; } -as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : - -else - exitcode=1; echo positional parameters were not saved. -fi -test x\$exitcode = x0 || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 - - test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO - ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ - || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : - as_have_required=yes -else - as_have_required=no -fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : - -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - as_found=: - case $as_dir in #( - /*) - for as_base in sh bash ksh sh5; do - # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : - CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : - break 2 -fi -fi - done;; - esac - as_found=false -done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } -IFS=$as_save_IFS - - - if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} -fi - - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else - $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: nicolas.leclercq@synchrotron-soleil.fr about your -$0: system, including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." - fi - exit 1 -fi -fi -fi -SHELL=${CONFIG_SHELL-/bin/sh} -export SHELL -# Unset more variables known to interfere with behavior of common tools. -CLICOLOR_FORCE= GREP_OPTIONS= -unset CLICOLOR_FORCE GREP_OPTIONS - -## --------------------- ## -## M4sh Shell Functions. ## -## --------------------- ## -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - - - as_lineno_1=$LINENO as_lineno_1a=$LINENO - as_lineno_2=$LINENO as_lineno_2a=$LINENO - eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && - test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { - # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - -SHELL=${CONFIG_SHELL-/bin/sh} - - -test -n "$DJDIR" || exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_clean_files= -ac_config_libobj_dir=. -LIBOBJS= -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= - -# Identity of this package. -PACKAGE_NAME='log4tango' -PACKAGE_TARNAME='log4tango' -PACKAGE_VERSION='5.0.1' -PACKAGE_STRING='log4tango 5.0.1' -PACKAGE_BUGREPORT='nicolas.leclercq@synchrotron-soleil.fr' -PACKAGE_URL='' - -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS -# include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif -#endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif -# include -#endif -#ifdef HAVE_STRINGS_H -# include -#endif -#ifdef HAVE_INTTYPES_H -# include -#endif -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif" - -ac_subst_vars='am__EXEEXT_FALSE -am__EXEEXT_TRUE -LTLIBOBJS -LIBOBJS -GENERIC_CONFIG -enable_latex_docs -enable_html_docs -enable_dot -DOC_FALSE -DOC_TRUE -DOT -DOXYGEN -CXXCPP -CPP -OTOOL64 -OTOOL -LIPO -NMEDIT -DSYMUTIL -MANIFEST_TOOL -RANLIB -ac_ct_AR -AR -DLLTOOL -OBJDUMP -LN_S -NM -ac_ct_DUMPBIN -DUMPBIN -LD -FGREP -EGREP -GREP -SED -am__fastdepCC_FALSE -am__fastdepCC_TRUE -CCDEPMODE -ac_ct_CC -CFLAGS -CC -LIBTOOL -am__fastdepCXX_FALSE -am__fastdepCXX_TRUE -CXXDEPMODE -am__nodep -AMDEPBACKSLASH -AMDEP_FALSE -AMDEP_TRUE -am__quote -am__include -DEPDIR -OBJEXT -EXEEXT -ac_ct_CXX -CPPFLAGS -LDFLAGS -CXXFLAGS -CXX -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build -LT_VERSION -MAINT -MAINTAINER_MODE_FALSE -MAINTAINER_MODE_TRUE -am__untar -am__tar -AMTAR -am__leading_dot -SET_MAKE -AWK -mkdir_p -MKDIR_P -INSTALL_STRIP_PROGRAM -STRIP -install_sh -MAKEINFO -AUTOHEADER -AUTOMAKE -AUTOCONF -ACLOCAL -VERSION -PACKAGE -CYGPATH_W -am__isrc -INSTALL_DATA -INSTALL_SCRIPT -INSTALL_PROGRAM -target_alias -host_alias -build_alias -LIBS -ECHO_T -ECHO_N -ECHO_C -DEFS -mandir -localedir -libdir -psdir -pdfdir -dvidir -htmldir -infodir -docdir -oldincludedir -includedir -localstatedir -sharedstatedir -sysconfdir -datadir -datarootdir -libexecdir -sbindir -bindir -program_transform_name -prefix -exec_prefix -PACKAGE_URL -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_VERSION -PACKAGE_TARNAME -PACKAGE_NAME -PATH_SEPARATOR -SHELL' -ac_subst_files='' -ac_user_opts=' -enable_option_checking -enable_maintainer_mode -enable_dependency_tracking -enable_static -enable_shared -with_pic -enable_fast_install -with_gnu_ld -with_sysroot -enable_libtool_lock -enable_doxygen -enable_dot -enable_html_docs -enable_latex_docs -' - ac_precious_vars='build_alias -host_alias -target_alias -CXX -CXXFLAGS -LDFLAGS -LIBS -CPPFLAGS -CCC -CC -CFLAGS -CPP -CXXCPP' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -ac_unrecognized_opts= -ac_unrecognized_sep= -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' - -ac_prev= -ac_dashdash= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option - ac_prev= - continue - fi - - case $ac_option in - *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *=) ac_optarg= ;; - *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - case $ac_envvar in #( - '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; - esac - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error $? "missing argument to $ac_option" -fi - -if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac -fi - -# Check all directory arguments for consistency. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir -do - eval ac_val=\$$ac_var - # Remove trailing slashes. - case $ac_val in - */ ) - ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` - eval $ac_var=\$ac_val;; - esac - # Be sure to have absolute directory names. - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error $? "working directory cannot be determined" -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error $? "pwd does not report name of working directory" - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$as_myself" || -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_myself" : 'X\(//\)[^/]' \| \ - X"$as_myself" : 'X\(//\)$' \| \ - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures log4tango 5.0.1 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/log4tango] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF - -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of log4tango 5.0.1:";; - esac - cat <<\_ACEOF - -Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --enable-static[=PKGS] build static libraries [default=no] - --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) - --enable-doxygen enable documentation generation with doxygen (auto) - --enable-dot use 'dot' to generate graphs in doxygen (auto) - --enable-html-docs enable HTML generation with doxygen (yes) - --enable-latex-docs enable LaTeX documentation generation with doxygen (no) - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). - -Some influential environment variables: - CXX C++ compiler command - CXXFLAGS C++ compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CC C compiler command - CFLAGS C compiler flags - CPP C preprocessor - CXXCPP C++ preprocessor - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -Report bugs to . -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || - { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || - continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -log4tango configure 5.0.1 -generated by GNU Autoconf 2.68 - -Copyright (C) 2010 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit -fi - -## ------------------------ ## -## Autoconf initialization. ## -## ------------------------ ## - -# ac_fn_cxx_try_compile LINENO -# ---------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_compile - -# ac_fn_c_try_compile LINENO -# -------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_compile - -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_link - -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - -# ac_fn_c_check_func LINENO FUNC VAR -# ---------------------------------- -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_c_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ -#define $2 innocuous_$2 - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $2 - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $2 (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$2 || defined __stub___$2 -choke me -#endif - -int -main () -{ -return $2 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_func - -# ac_fn_cxx_try_cpp LINENO -# ------------------------ -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_cpp - -# ac_fn_cxx_try_link LINENO -# ------------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_link - -# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES -# --------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_cxx_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ----------------------------------------------------- ## -## Report this to nicolas.leclercq@synchrotron-soleil.fr ## -## ----------------------------------------------------- ##" - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_cxx_check_header_mongrel - -# ac_fn_cxx_try_run LINENO -# ------------------------ -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_cxx_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_run - -# ac_fn_cxx_check_func LINENO FUNC VAR -# ------------------------------------ -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_cxx_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ -#define $2 innocuous_$2 - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $2 - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $2 (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$2 || defined __stub___$2 -choke me -#endif - -int -main () -{ -return $2 (); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_cxx_check_func -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by log4tango $as_me 5.0.1, which was -generated by GNU Autoconf 2.68. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" - done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) - as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done -done -{ ac_configure_args0=; unset ac_configure_args0;} -{ ac_configure_args1=; unset ac_configure_args1;} - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - $as_echo "## ---------------- ## -## Cache variables. ## -## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - $as_echo "## ----------------- ## -## Output variables. ## -## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## -## File substitutions. ## -## ------------------- ##" - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - $as_echo "## ----------- ## -## confdefs.h. ## -## ----------- ##" - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -$as_echo "/* confdefs.h */" > confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE -if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac -elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site -else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site -fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" -do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special files - # actually), so we avoid doing that. DJGPP emulates it as a regular file. - if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -ac_aux_dir= -for ac_dir in config "$srcdir"/config; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - - -am__api_version='1.11' - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - - done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; -esac -case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; -esac - -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi - - test "$2" = conftest.file - ) -then - # Ok. - : -else - as_fn_error $? "newly created file is older than distributed files! -Check your system clock" "$LINENO" 5 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. -# By default was `s,x,x', remove it if useless. -ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` - -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` - -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -fi - -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } -if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done - done -IFS=$as_save_IFS - -fi - - test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - MKDIR_P="$ac_install_sh -d" - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } - -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AWK" && break -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - SET_MAKE= -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null - -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi - - -# Define the identity of the package. - PACKAGE='log4tango' - VERSION='5.0.1' - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - -# Some tools Automake needs. - -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - - -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - - -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - - -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AMTAR='$${TAR-tar}' - -am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } - # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then : - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=no -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } - if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' -else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= -fi - - MAINT=$MAINTAINER_MODE_TRUE - - - -# autoconf 2.50 or higher to rebuild aclocal.m4, because the -# AC_CREATE_PREFIX_CONFIG_H macro needs the AS_DIRNAME macro. - - -# -# +1 : ? : +1 == new interface that does not break old one -# +1 : ? : 0 == new interface that breaks old one -# ? : ? : 0 == no new interfaces, but breaks apps -# ? :+1 : ? == just some internal changes, nothing breaks but might work -# better -# CURRENT : REVISION : AGE -LT_VERSION=5:1:0 - - - -ac_config_headers="$ac_config_headers include/config.h" - - -# Checks for programs -# ---------------------------------------------------------------------------- -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - - -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf - -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5 -$as_echo_n "checking whether the C++ compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { { ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else - ac_file='' -fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C++ compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5 -$as_echo_n "checking for C++ compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -ac_exeext=$ac_cv_exeext - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } -if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if ${ac_cv_cxx_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if ${ac_cv_prog_cxx_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -else - CXXFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - -else - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CXX_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether using Sun Worckshop C++ compiler" >&5 -$as_echo_n "checking whether using Sun Worckshop C++ compiler... " >&6; } -if ${rssh_cv_check_sunpro_cc+:} false; then : - $as_echo_n "(cached) " >&6 -else - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __SUNPRO_CC -# include "error: this is not Sun Workshop." -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - rssh_cv_check_sunpro_cc=yes -else - rssh_cv_check_sunpro_cc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rssh_cv_check_sunpro_cc" >&5 -$as_echo "$rssh_cv_check_sunpro_cc" >&6; } -if test ${rssh_cv_check_sunpro_cc} = yes -then - - : -else - - : -fi - -if test "x$rssh_cv_check_sunpro_cc" = "xyes"; then - AR="$CXX -xar" - AR_FLAGS="-o" - LD="$CXX -pta -G" - # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=no -fi - - - - - - - - - -fi - -case `pwd` in - *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; -esac - - - -macro_version='2.4.2' -macro_revision='1.3337' - - - - - - - - - - - - - -ltmain="$ac_aux_dir/ltmain.sh" - -# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "" -} - -case "$ECHO" in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; -esac - - - - - - - - - - - - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CC" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi -else - ac_cv_path_SED=$SED -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed - -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 - then ac_cv_path_FGREP="$GREP -F" - else - if test -z "$FGREP"; then - ac_path_FGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue -# Check for GNU ac_path_FGREP and select it if it is found. - # Check for GNU $ac_path_FGREP -case `"$ac_path_FGREP" --version 2>&1` in -*GNU*) - ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" - "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_FGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_FGREP="$ac_path_FGREP" - ac_path_FGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_FGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_FGREP"; then - as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_FGREP=$FGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } - FGREP="$ac_cv_path_FGREP" - - -test -z "$GREP" && GREP=grep - - - - - - - - - - - - - - - - - - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if ${lt_cv_path_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -$as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - if test -n "$ac_tool_prefix"; then - for ac_prog in dumpbin "link -dump" - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DUMPBIN"; then - ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DUMPBIN=$ac_cv_prog_DUMPBIN -if test -n "$DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -$as_echo "$DUMPBIN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$DUMPBIN" && break - done -fi -if test -z "$DUMPBIN"; then - ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in dumpbin "link -dump" -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DUMPBIN"; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN -if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -$as_echo "$ac_ct_DUMPBIN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_DUMPBIN" && break -done - - if test "x$ac_ct_DUMPBIN" = x; then - DUMPBIN=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DUMPBIN=$ac_ct_DUMPBIN - fi -fi - - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi - - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -$as_echo_n "checking the name lister ($NM) interface... " >&6; } -if ${lt_cv_nm_interface+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -$as_echo "$lt_cv_nm_interface" >&6; } - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi - -# find the maximum length of command line arguments -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } -if ${lt_cv_sys_max_cmd_len+:} false; then : - $as_echo_n "(cached) " >&6 -else - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac - -fi - -if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } -fi -max_cmd_len=$lt_cv_sys_max_cmd_len - - - - - - -: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi - - - - - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -if ${lt_cv_to_host_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; -esac - -fi - -to_host_file_cmd=$lt_cv_to_host_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -$as_echo "$lt_cv_to_host_file_cmd" >&6; } - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -if ${lt_cv_to_tool_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - #assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 - ;; - esac - ;; -esac - -fi - -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if ${lt_cv_ld_reload_flag+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_reload_flag='-r' -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then - reload_cmds=false - fi - ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OBJDUMP" = x; then - OBJDUMP="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OBJDUMP=$ac_ct_OBJDUMP - fi -else - OBJDUMP="$ac_cv_prog_OBJDUMP" -fi - -test -z "$OBJDUMP" && OBJDUMP=objdump - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -$as_echo_n "checking how to recognize dependent libraries... " >&6; } -if ${lt_cv_deplibs_check_method+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; - -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[3-9]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } - -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` - fi - ;; - esac -fi - -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - - - - - - - - - - - - - - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DLLTOOL=$ac_ct_DLLTOOL - fi -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi - -test -z "$DLLTOOL" && DLLTOOL=dlltool - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_sharedlib_from_linklib_cmd='unknown' - -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO - - - - - - - - -if test -n "$ac_tool_prefix"; then - for ac_prog in ar - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AR" && break - done -fi -if test -z "$AR"; then - ac_ct_AR=$AR - for ac_prog in ar -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_AR" && break -done - - if test "x$ac_ct_AR" = x; then - AR="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - AR=$ac_ct_AR - fi -fi - -: ${AR=ar} -: ${AR_FLAGS=cru} - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -$as_echo_n "checking for archiver @FILE support... " >&6; } -if ${lt_cv_ar_at_file+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ar_at_file=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 - (eval $lt_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -eq 0; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 - (eval $lt_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -ne 0; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -$as_echo "$lt_cv_ar_at_file" >&6; } - -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= -else - archiver_list_spec=$lt_cv_ar_at_file -fi - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -test -z "$STRIP" && STRIP=: - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - -test -z "$RANLIB" && RANLIB=: - - - - - - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" -fi - -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if ${lt_cv_sys_global_symbol_pipe+:} false; then : - $as_echo_n "(cached) " >&6 -else - -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[BCDEGRST]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[BCDT]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[ABCDEGRST]' - fi - ;; -irix* | nonstopux*) - symcode='[BCDEGRST]' - ;; -osf*) - symcode='[BCDEGQRST]' - ;; -solaris*) - symcode='[BDRT]' - ;; -sco3.2v5*) - symcode='[DT]' - ;; -sysv4.2uw2*) - symcode='[DT]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[ABDT]' - ;; -sysv4) - symcode='[DFNSTU]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[ABCDGIRSTW]' ;; -esac - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK '"\ -" {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - # Now try to grab the symbols. - nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -LT_DLSYM_CONST struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi - else - echo "cannot find nm_test_var in $nlist" >&5 - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 - fi - else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done - -fi - -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -$as_echo "failed" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } -fi - -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then - nm_file_list_spec='@' -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -$as_echo_n "checking for sysroot... " >&6; } - -# Check whether --with-sysroot was given. -if test "${with_sysroot+set}" = set; then : - withval=$with_sysroot; -else - with_sysroot=no -fi - - -lt_sysroot= -case ${with_sysroot} in #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } - as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 - ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -$as_echo "${lt_sysroot:-no}" >&6; } - - - - - -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -fi - -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '#line '$LINENO' "configure"' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_cc_needs_belf=yes -else - lt_cv_cc_needs_belf=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -need_locks="$enable_libtool_lock" - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -set dummy ${ac_tool_prefix}mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$MANIFEST_TOOL"; then - ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -if test -n "$MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -$as_echo "$MANIFEST_TOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_MANIFEST_TOOL"; then - ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL - # Extract the first word of "mt", so it can be a program name with args. -set dummy mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_MANIFEST_TOOL"; then - ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -if test -n "$ac_ct_MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_MANIFEST_TOOL" = x; then - MANIFEST_TOOL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL - fi -else - MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -fi - -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if ${lt_cv_path_mainfest_tool+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&5 - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -$as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: -fi - - - - - - - case $host_os in - rhapsody* | darwin*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DSYMUTIL=$ac_cv_prog_DSYMUTIL -if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DSYMUTIL"; then - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. -set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_DSYMUTIL" = x; then - DSYMUTIL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DSYMUTIL=$ac_ct_DSYMUTIL - fi -else - DSYMUTIL="$ac_cv_prog_DSYMUTIL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -NMEDIT=$ac_cv_prog_NMEDIT -if test -n "$NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_NMEDIT"; then - ac_ct_NMEDIT=$NMEDIT - # Extract the first word of "nmedit", so it can be a program name with args. -set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_NMEDIT"; then - ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_NMEDIT" = x; then - NMEDIT=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - NMEDIT=$ac_ct_NMEDIT - fi -else - NMEDIT="$ac_cv_prog_NMEDIT" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. -set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$LIPO"; then - ac_cv_prog_LIPO="$LIPO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -LIPO=$ac_cv_prog_LIPO -if test -n "$LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_LIPO"; then - ac_ct_LIPO=$LIPO - # Extract the first word of "lipo", so it can be a program name with args. -set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_LIPO"; then - ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO -if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -$as_echo "$ac_ct_LIPO" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_LIPO" = x; then - LIPO=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - LIPO=$ac_ct_LIPO - fi -else - LIPO="$ac_cv_prog_LIPO" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL"; then - ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OTOOL=$ac_cv_prog_OTOOL -if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OTOOL"; then - ac_ct_OTOOL=$OTOOL - # Extract the first word of "otool", so it can be a program name with args. -set dummy otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OTOOL"; then - ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL -if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -$as_echo "$ac_ct_OTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OTOOL" = x; then - OTOOL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OTOOL=$ac_ct_OTOOL - fi -else - OTOOL="$ac_cv_prog_OTOOL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL64"; then - ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OTOOL64=$ac_cv_prog_OTOOL64 -if test -n "$OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OTOOL64"; then - ac_ct_OTOOL64=$OTOOL64 - # Extract the first word of "otool64", so it can be a program name with args. -set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OTOOL64"; then - ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 -if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OTOOL64" = x; then - OTOOL64=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OTOOL64=$ac_ct_OTOOL64 - fi -else - OTOOL64="$ac_cv_prog_OTOOL64" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -$as_echo_n "checking for -single_module linker flag... " >&6; } -if ${lt_cv_apple_cc_single_mod+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&5 - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&5 - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if ${lt_cv_ld_exported_symbols_list+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_ld_exported_symbols_list=yes -else - lt_cv_ld_exported_symbols_list=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -$as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 - echo "$RANLIB libconftest.a" >&5 - $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&5 - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -$as_echo "$lt_cv_ld_force_load" >&6; } - case $host_os in - rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -for ac_header in dlfcn.h -do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default -" -if test "x$ac_cv_header_dlfcn_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF - -fi - -done - - - -func_stripname_cnf () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname_cnf - - - - - -# Set options - - - - enable_dlopen=no - - - enable_win32_dll=no - - - # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_shared=yes -fi - - - - - - - - - - - -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : - withval=$with_pic; lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - pic_mode=default -fi - - -test -z "$pic_mode" && pic_mode=default - - - - - - - - # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then : - enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_fast_install=yes -fi - - - - - - - - - - - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -test -z "$LN_S" && LN_S="ln -s" - - - - - - - - - - - - - - -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } -objdir=$lt_cv_objdir - - - - - -cat >>confdefs.h <<_ACEOF -#define LT_OBJDIR "$lt_cv_objdir/" -_ACEOF - - - - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` - - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - - -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - else - MAGIC_CMD=: - fi -fi - - fi - ;; -esac - -# Use C for the default configuration in the libtool script - -lt_save_CC="$CC" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -objext=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* - -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* - - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - -lt_prog_compiler_no_builtin_flag= - -if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; - *) - lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } - -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -else - : -fi - -fi - - - - - - - lt_prog_compiler_wl= -lt_prog_compiler_pic= -lt_prog_compiler_static= - - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_static='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' - ;; - - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - lt_prog_compiler_static= - ;; - - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - ;; - - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic - fi - ;; - - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - lt_prog_compiler_wl='-Xlinker ' - if test -n "$lt_prog_compiler_pic"; then - lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" - fi - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - else - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static='-non_shared' - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; - nagfor*) - # NAG Fortran compiler - lt_prog_compiler_wl='-Wl,-Wl,,' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-qpic' - lt_prog_compiler_static='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' - ;; - *Sun\ F* | *Sun*Fortran*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Qoption ld ' - ;; - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' - ;; - *Intel*\ [CF]*Compiler*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - *Portland\ Group*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - esac - ;; - esac - ;; - - newsos6) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - - rdos*) - lt_prog_compiler_static='-non_shared' - ;; - - solaris*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; - esac - ;; - - sunos4*) - lt_prog_compiler_wl='-Qoption ld ' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic='-Kconform_pic' - lt_prog_compiler_static='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; - - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' - ;; - - *) - lt_prog_compiler_can_build_shared=no - ;; - esac - fi - -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= - ;; - *) - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; -esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -$as_echo "$lt_cv_prog_compiler_pic" >&6; } -lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if ${lt_cv_prog_compiler_pic_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works=yes - fi - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; - esac -else - lt_prog_compiler_pic= - lt_prog_compiler_can_build_shared=no -fi - -fi - - - - - - - - - - - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works=yes - fi - else - lt_cv_prog_compiler_static_works=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } - -if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : -else - lt_prog_compiler_static= -fi - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - runpath_var= - allow_undefined_flag= - always_export_symbols=no - archive_cmds= - archive_expsym_cmds= - compiler_needs_object=no - enable_shared_with_static_runtimes=no - export_dynamic_flag_spec= - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - hardcode_automatic=no - hardcode_direct=no - hardcode_direct_absolute=no - hardcode_libdir_flag_spec= - hardcode_libdir_separator= - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - inherit_rpath=no - link_all_deplibs=unknown - module_cmds= - module_expsym_cmds= - old_archive_from_new_cmds= - old_archive_from_expsyms_cmds= - thread_safe_flag_spec= - whole_archive_flag_spec= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs=no - ;; - esac - - ld_shlibs=yes - - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; - *\ \(GNU\ Binutils\)\ [3-9]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi - - if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.19, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs=no - fi - ;; - - haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - link_all_deplibs=yes - ;; - - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - whole_archive_flag_spec= - tmp_sharedflag='--shared' ;; - xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object=yes - ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - ld_shlibs=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - ;; - - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - - if test "$ld_shlibs" = no; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= - whole_archive_flag_spec= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds='' - hardcode_direct=yes - hardcode_direct_absolute=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes - file_list_spec='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - link_all_deplibs=no - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - export_dynamic_flag_spec='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath_ -fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath_ -fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - fi - archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - - bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - always_export_symbols=yes - file_list_spec='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, )='true' - enable_shared_with_static_runtimes=yes - exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - old_postinstall_cmds='chmod 644 $oldlib' - postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - enable_shared_with_static_runtimes=yes - ;; - esac - ;; - - darwin* | rhapsody*) - - - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - - else - whole_archive_flag_spec='' - fi - link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - - else - ld_shlibs=no - fi - - ;; - - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -$as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -b" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler__b=yes - fi - else - lt_cv_prog_compiler__b=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -$as_echo "$lt_cv_prog_compiler__b" >&6; } - -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -fi - - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct=no - hardcode_shlibpath_var=no - ;; - *) - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if ${lt_cv_irix_exported_symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int foo (void) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_irix_exported_symbol=yes -else - lt_cv_irix_exported_symbol=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - inherit_rpath=yes - link_all_deplibs=yes - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - hardcode_shlibpath_var=no - hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs=no - fi - ;; - - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - archive_cmds_need_lc='no' - hardcode_libdir_separator=: - ;; - - solaris*) - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds='$CC -r -o $output$reload_objs' - hardcode_direct=no - ;; - motorola) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - *) - ld_shlibs=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' - ;; - esac - fi - fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no - -with_gnu_ld=$with_gnu_ld - - - - - - - - - - - - - - - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : - $as_echo_n "(cached) " >&6 -else - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 - (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - then - lt_cv_archive_cmds_need_lc=no - else - lt_cv_archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } - archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc - ;; - esac - fi - ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } - -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in - *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` - ;; - esac - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[lt_foo]++; } - if (lt_freq[lt_foo] == 1) { print lt_foo; } -}'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$cc_basename in - yes,*) - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") - ;; - esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' - ;; - - *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[23].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 - ;; - -interix[3-9]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - - # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - lt_cv_shlibpath_overrides_runpath=yes -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - -fi - - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || - test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } - -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - - - - - - - if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -fi - - ;; - - *) - ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_shl_load=yes -else - ac_cv_lib_dld_shl_load=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else - ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_svld_dlopen=yes -else - ac_cv_lib_svld_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -$as_echo_n "checking for dld_link in -ldld... " >&6; } -if ${ac_cv_lib_dld_dld_link+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dld_link (); -int -main () -{ -return dld_link (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_dld_link=yes -else - ac_cv_lib_dld_dld_link=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -fi - - -fi - - -fi - - -fi - - -fi - - -fi - - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -$as_echo_n "checking whether a program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line $LINENO "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -} -_LT_EOF - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 -$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self_static+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line $LINENO "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -} -_LT_EOF - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - - - - - - - - - - - - - - - - - -striplib= -old_striplib= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ;; - esac -fi - - - - - - - - - - - - - # Report which library types will actually be built - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } - - - - -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC="$lt_save_CC" - - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if ${ac_cv_prog_CXXCPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -else - _lt_caught_CXX_error=yes -fi - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -archive_cmds_need_lc_CXX=no -allow_undefined_flag_CXX= -always_export_symbols_CXX=no -archive_expsym_cmds_CXX= -compiler_needs_object_CXX=no -export_dynamic_flag_spec_CXX= -hardcode_direct_CXX=no -hardcode_direct_absolute_CXX=no -hardcode_libdir_flag_spec_CXX= -hardcode_libdir_separator_CXX= -hardcode_minus_L_CXX=no -hardcode_shlibpath_var_CXX=unsupported -hardcode_automatic_CXX=no -inherit_rpath_CXX=no -module_cmds_CXX= -module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown -old_archive_cmds_CXX=$old_archive_cmds -reload_flag_CXX=$reload_flag -reload_cmds_CXX=$reload_cmds -no_undefined_flag_CXX= -whole_archive_flag_spec_CXX= -enable_shared_with_static_runtimes_CXX=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -objext_CXX=$objext - -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - - # save warnings/boilerplate of simple test code - ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* - - ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* - - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - CFLAGS=$CXXFLAGS - compiler=$CC - compiler_CXX=$CC - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` - - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' - else - lt_prog_compiler_no_builtin_flag_CXX= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - - - - - - - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_CXX= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - ld_shlibs_CXX=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds_CXX='' - hardcode_direct_CXX=yes - hardcode_direct_absolute_CXX=yes - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - file_list_spec_CXX='${wl}-f,' - - if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct_CXX=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_CXX=yes - hardcode_libdir_flag_spec_CXX='-L$libdir' - hardcode_libdir_separator_CXX= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - export_dynamic_flag_spec_CXX='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - always_export_symbols_CXX=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath__CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath__CXX -fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath__CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath__CXX -fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' - fi - archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_CXX=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec_CXX=' ' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=yes - file_list_spec_CXX='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' - enable_shared_with_static_runtimes_CXX=yes - # Don't use ranlib - old_postinstall_cmds_CXX='chmod 644 $oldlib' - postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # g++ - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_CXX=no - fi - ;; - esac - ;; - darwin* | rhapsody*) - - - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - - else - whole_archive_flag_spec_CXX='' - fi - link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi - - else - ld_shlibs_CXX=no - fi - - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - freebsd2.*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - ld_shlibs_CXX=no - ;; - - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes - ;; - - gnu*) - ;; - - haiku*) - archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - link_all_deplibs_CXX=yes - ;; - - hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - export_dynamic_flag_spec_CXX='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - ;; - *) - hardcode_direct_CXX=yes - hardcode_direct_absolute_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - interix[3-9]*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - link_all_deplibs_CXX=yes - ;; - esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - inherit_rpath_CXX=yes - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [1-5].* | *pgcpp\ [1-5].*) - prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - esac - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' - ;; - xl* | mpixl* | bgxl*) - # IBM XL 8.0 on PPC, with GNU ld - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object_CXX=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - ld_shlibs_CXX=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - hardcode_direct_absolute_CXX=yes - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=func_echo_all - else - ld_shlibs_CXX=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx*) - case $host in - osf3*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - ;; - *) - allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - ;; - esac - - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_shlibpath_var_CXX=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' - ;; - esac - link_all_deplibs_CXX=yes - - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - fi - - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ - '"$old_archive_cmds_CXX" - reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ - '"$reload_cmds_CXX" - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no - - GCC_CXX="$GXX" - LD_CXX="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - # Dependencies to place before and after the object being linked: -predep_objects_CXX= -postdep_objects_CXX= -predeps_CXX= -postdeps_CXX= -compiler_lib_search_path_CXX= - -cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF - - -_lt_libdeps_save_CFLAGS=$CFLAGS -case "$CC $CFLAGS " in #( -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -esac - -if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - fi - - # Expand the sysroot to ease extracting the directories later. - if test -z "$prev"; then - case $p in - -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; - -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; - -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; - esac - fi - case $p in - =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; - esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in - -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" - else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" - else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi - prev= - ;; - - *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" - else - predep_objects_CXX="$predep_objects_CXX $p" - fi - else - if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" - else - postdep_objects_CXX="$postdep_objects_CXX $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling CXX test program" -fi - -$RM -f confest.$objext -CFLAGS=$_lt_libdeps_save_CFLAGS - -# PORTME: override above test on systems where it is broken -case $host_os in -interix[3-9]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - predep_objects_CXX= - postdep_objects_CXX= - postdeps_CXX= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac - - -case " $postdeps_CXX " in -*" -lc "*) archive_cmds_need_lc_CXX=no ;; -esac - compiler_lib_search_dirs_CXX= -if test -n "${compiler_lib_search_path_CXX}"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - lt_prog_compiler_wl_CXX= -lt_prog_compiler_pic_CXX= -lt_prog_compiler_static_CXX= - - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic_CXX='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_CXX='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= - ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - lt_prog_compiler_static_CXX= - ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_CXX=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic_CXX='-fPIC -shared' - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - else - case $host_os in - aix[4-9]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - else - lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - dgux*) - case $cc_basename in - ec++*) - lt_prog_compiler_pic_CXX='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - lt_prog_compiler_pic_CXX='+Z' - fi - ;; - aCC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_CXX='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - lt_prog_compiler_static_CXX='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fpic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) - # IBM XL 8.0, 9.0 on PPC and BlueGene - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-qpic' - lt_prog_compiler_static_CXX='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - lt_prog_compiler_pic_CXX='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic_CXX='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - lt_prog_compiler_wl_CXX='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - lt_prog_compiler_pic_CXX='-pic' - ;; - cxx*) - # Digital/Compaq C++ - lt_prog_compiler_wl_CXX='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - lt_prog_compiler_pic_CXX='-pic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - lcc*) - # Lucid - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - lt_prog_compiler_pic_CXX='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - lt_prog_compiler_can_build_shared_CXX=no - ;; - esac - fi - -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_CXX= - ;; - *) - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; -esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } -lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_CXX=yes - fi - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; - esac -else - lt_prog_compiler_pic_CXX= - lt_prog_compiler_can_build_shared_CXX=no -fi - -fi - - - - - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_CXX=yes - fi - else - lt_cv_prog_compiler_static_works_CXX=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : -else - lt_prog_compiler_static_CXX= -fi - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - - - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - case $host_os in - aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; - cygwin* | mingw* | cegcc*) - case $cc_basename in - cl*) - exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - ;; - esac - ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs_CXX=no - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no - -with_gnu_ld_CXX=$with_gnu_ld - - - - - - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_CXX" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_CXX=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_CXX in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 - (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - then - lt_cv_archive_cmds_need_lc_CXX=no - else - lt_cv_archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } - archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX - ;; - esac - fi - ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } - -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$cc_basename in - yes,*) - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") - ;; - esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' - ;; - - *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[23].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 - ;; - -interix[3-9]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - - # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - lt_cv_shlibpath_overrides_runpath=yes -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - -fi - - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || - test -n "$runpath_var_CXX" || - test "X$hardcode_automatic_CXX" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 -$as_echo "$hardcode_action_CXX" >&6; } - -if test "$hardcode_action_CXX" = relink || - test "$inherit_rpath_CXX" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - - - - - - - - fi # test -n "$compiler" - - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - - - ac_config_commands="$ac_config_commands libtool" - - - - -# Only expand once: - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - SET_MAKE= -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC QCC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC QCC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if ${ac_cv_cxx_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if ${ac_cv_prog_cxx_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -else - CXXFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - -else - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CXX_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if ${ac_cv_prog_CXXCPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - - if test "$GCC" = yes; then - if test "$host" = x86-pc-nto-qnx; then - CFLAGS="$CXXFLAGS -Wno-unused -O0" - CXXFLAGS="$CXXFLAGS -Wno-unused -DLOG4TANGO_MISSING_INT64_OSTREAM_OP -O0" - else - case `$CXX --version` in - *2.97*) CFLAGS="$CFLAGS -Wall -Wno-unused -pedantic -D_ISOC99_SOURCE" - CXXFLAGS="$CXXFLAGS -Wall -Wno-unused -pedantic -D_ISOC99_SOURCE" - ;; - *2.96*) CFLAGS="$CFLAGS -Wall -Wno-unused" - CXXFLAGS="$CXXFLAGS -Wall -Wno-unused" - ;; - *) CFLAGS="$CFLAGS -Wall -Wno-unused -pedantic" - CXXFLAGS="$CXXFLAGS -Wall -Wno-unused -pedantic" - ;; - esac - fi - fi - - -# Checks header files -# ---------------------------------------------------------------------------- - -for ac_header in unistd.h -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" -if test "x$ac_cv_header_unistd_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_UNISTD_H 1 -_ACEOF - -fi - -done - -for ac_header in io.h -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "io.h" "ac_cv_header_io_h" "$ac_includes_default" -if test "x$ac_cv_header_io_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_IO_H 1 -_ACEOF - -fi - -done - - -# Check for pthreads -# ---------------------------------------------------------------------------- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_key_create" >&5 -$as_echo_n "checking for library containing pthread_key_create... " >&6; } -if ${ac_cv_search_pthread_key_create+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pthread_key_create (); -int -main () -{ -return pthread_key_create (); - ; - return 0; -} -_ACEOF -for ac_lib in '' pthread; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_search_pthread_key_create=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_pthread_key_create+:} false; then : - break -fi -done -if ${ac_cv_search_pthread_key_create+:} false; then : - -else - ac_cv_search_pthread_key_create=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_key_create" >&5 -$as_echo "$ac_cv_search_pthread_key_create" >&6; } -ac_res=$ac_cv_search_pthread_key_create -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -$as_echo "#define HAVE_THREADING /**/" >>confdefs.h - - -$as_echo "#define USE_PTHREADS /**/" >>confdefs.h - - case $host_os in - linux*) - CFLAGS="$CFLAGS -D_REENTRANT" - CXXFLAGS="$CXXFLAGS -D_REENTRANT" - ;; - solaris*) - if test x$GCC = x ; - then - CFLAGS="$CFLAGS -mt -D_POSIX_PTHREAD_SEMANTICS" - CXXFLAGS="$CXXFLAGS -mt -D_POSIX_PTHREAD_SEMANTICS" - else - CFLAGS="$CFLAGS -D_REENTRANT" - CXXFLAGS="$CXXFLAGS -D_REENTRANT" - fi - ;; - hpux*) - CFLAGS="$CFLAGS -AA -mt +inst_close" - CXXFLAGS="$CXXFLAGS -AA -mt +inst_close" - ;; - esac -else - as_fn_error $? "pthreads not found" "$LINENO" 5 -fi - - - -# Checks local idioms -# ---------------------------------------------------------------------------- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for int64_t" >&5 -$as_echo_n "checking for int64_t... " >&6; } -if ${ac_cv_c_int64_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -int64_t i; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_c_int64_t=yes -else - ac_cv_c_int64_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_int64_t" >&5 -$as_echo "$ac_cv_c_int64_t" >&6; } -if test $ac_cv_c_int64_t = yes; then - -$as_echo "#define HAVE_INT64_T /**/" >>confdefs.h - - -$as_echo "#define HAVE_STDINT_H /**/" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler implements namespaces" >&5 -$as_echo_n "checking whether the compiler implements namespaces... " >&6; } -if ${ac_cv_cxx_namespaces+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -namespace Outer { namespace Inner { int i = 0; }} -int -main () -{ -using namespace Outer::Inner; return i; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_cxx_namespaces=yes -else - ac_cv_cxx_namespaces=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_namespaces" >&5 -$as_echo "$ac_cv_cxx_namespaces" >&6; } -if test "$ac_cv_cxx_namespaces" = yes; then - -$as_echo "#define HAVE_NAMESPACES /**/" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler has stringstream" >&5 -$as_echo_n "checking whether the compiler has stringstream... " >&6; } -if ${ac_cv_cxx_have_sstream+:} false; then : - $as_echo_n "(cached) " >&6 -else - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif -int -main () -{ -stringstream message; message << "Hello"; return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_cxx_have_sstream=yes -else - ac_cv_cxx_have_sstream=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_have_sstream" >&5 -$as_echo "$ac_cv_cxx_have_sstream" >&6; } -if test "$ac_cv_cxx_have_sstream" = yes; then - -$as_echo "#define HAVE_SSTREAM /**/" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working snprintf" >&5 -$as_echo_n "checking for working snprintf... " >&6; } -if ${ac_cv_func_snprintf+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_snprintf=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int main () { int l = snprintf(NULL,0,"%d",100); exit (!((3 <= l) || (-1 == l))); } - -_ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - ac_cv_func_snprintf=yes -else - ac_cv_func_snprintf=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_snprintf" >&5 -$as_echo "$ac_cv_func_snprintf" >&6; } -if test $ac_cv_func_snprintf = yes; then - -$as_echo "#define HAVE_SNPRINTF /**/" >>confdefs.h - -fi - - -# Misc. func tests -# ---------------------------------------------------------------------------- -for ac_func in gettimeofday -do : - ac_fn_cxx_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" -if test "x$ac_cv_func_gettimeofday" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETTIMEOFDAY 1 -_ACEOF - -fi -done - -for ac_func in ftime -do : - ac_fn_cxx_check_func "$LINENO" "ftime" "ac_cv_func_ftime" -if test "x$ac_cv_func_ftime" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_FTIME 1 -_ACEOF - -fi -done - - -# Check for doxygen -# ---------------------------------------------------------------------------- - -# Check whether --enable-doxygen was given. -if test "${enable_doxygen+set}" = set; then : - enableval=$enable_doxygen; -fi - -# Check whether --enable-dot was given. -if test "${enable_dot+set}" = set; then : - enableval=$enable_dot; -fi - -# Check whether --enable-html-docs was given. -if test "${enable_html_docs+set}" = set; then : - enableval=$enable_html_docs; -else - enable_html_docs=yes -fi - -# Check whether --enable-latex-docs was given. -if test "${enable_latex_docs+set}" = set; then : - enableval=$enable_latex_docs; -else - enable_latex_docs=no -fi - -if test "x$enable_doxygen" = xno; then - enable_doc=no -else - # Extract the first word of "doxygen", so it can be a program name with args. -set dummy doxygen; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_DOXYGEN+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $DOXYGEN in - [\\/]* | ?:[\\/]*) - ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -DOXYGEN=$ac_cv_path_DOXYGEN -if test -n "$DOXYGEN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 -$as_echo "$DOXYGEN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test x$DOXYGEN = x; then - if test "x$enable_doxygen" = xyes; then - as_fn_error $? "could not find doxygen" "$LINENO" 5 - fi - enable_doc=no - else - enable_doc=yes - # Extract the first word of "dot", so it can be a program name with args. -set dummy dot; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_DOT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $DOT in - [\\/]* | ?:[\\/]*) - ac_cv_path_DOT="$DOT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -DOT=$ac_cv_path_DOT -if test -n "$DOT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOT" >&5 -$as_echo "$DOT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi - if test x$enable_doc = xyes; then - DOC_TRUE= - DOC_FALSE='#' -else - DOC_TRUE='#' - DOC_FALSE= -fi - - -if test x$DOT = x; then - if test "x$enable_dot" = xyes; then - as_fn_error $? "could not find dot" "$LINENO" 5 - fi - enable_dot=no -else - enable_dot=yes -fi - - - - - -# To build on MacOSX define __darwin__ -# ---------------------------------------------------------------------------- -case $build_os in - darwin*) - -$as_echo "#define __darwin__ 1" >>confdefs.h - - CXXFLAGS="$CXXFLAGS -D__darwin__" - ;; - freebsd*) - -$as_echo "#define __freebsd__ 1" >>confdefs.h - - CXXFLAGS="$CXXFLAGS -D__freebsd__" - ;; -esac - -# Create files -# ---------------------------------------------------------------------------- -# create a generic PACKAGE-config file -L=`echo $PACKAGE_TARNAME $LIBS` -P=`echo $L | sed -e 's/ -.*//'` -P=`echo $P` -V=`echo $VERSION` -F=`echo $P-config` -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: creating $F - generic $V of $L" >&5 -$as_echo "creating $F - generic $V of $L" >&6; } -test "x$prefix" = xNONE && prefix="$ac_default_prefix" -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -echo '#! /bin/sh' >$F -echo ' ' >>$F -echo 'package="'$P'"' >>$F -echo 'version="'$V'"' >>$F -echo 'libs="'$L'"' >>$F -echo ' ' >>$F -# in the order of occurence a standard automake Makefile -echo 'prefix="'$prefix'"' >>$F -echo 'exec_prefix="'$exec_prefix'"' >>$F -echo 'bindir="'$bindir'"' >>$F -echo 'sbindir="'$sbindir'"' >>$F -echo 'libexecdir="'$libexecdir'"' >>$F -echo 'datadir="'$datadir'"' >>$F -echo 'sysconfdir="'$sysconfdir'"' >>$F -echo 'sharedstatedir="'$sharedstatedir'"' >>$F -echo 'localstatedir="'$localstatedir'"' >>$F -echo 'libdir="'$libdir'"' >>$F -echo 'infodir="'$infodir'"' >>$F -echo 'mandir="'$mandir'"' >>$F -echo 'includedir="'$includedir'"' >>$F -echo 'target="'$target'"' >>$F -echo 'host="'$host'"' >>$F -echo 'build="'$build'"' >>$F -echo ' ' >>$F -echo 'if test "'"\$""#"'" -eq 0; then' >>$F -echo ' cat <>$F -echo 'Usage: $package-config OPTIONS' >>$F -echo 'Options:' >>$F -echo ' --prefix=DIR) : \$prefix' >>$F -echo ' --package) : \$package' >>$F -echo ' --version) : \$version' >>$F -echo ' --cflags) : -I\$includedir' >>$F -echo ' --libs) : -L\$libdir -l\$package' >>$F -echo ' --help) print all the options (not just these)' >>$F -echo 'EOF' >>$F -echo 'fi' >>$F -echo ' ' >>$F -echo 'o=""' >>$F -echo 'h=""' >>$F -echo 'for i in '"\$""*"' ; do' >>$F -echo ' case $i in' >>$F -echo ' --prefix=*) prefix=`echo $i | sed -e "s/--prefix=//"` ;;' >>$F -echo ' --prefix) o="$o $prefix" ;;' >>$F -echo ' --package) o="$o $package" ;;' >>$F -echo ' --version) o="$o $version" ;;' >>$F -echo ' --cflags) if test "_$includedir" != "_/usr/include"' >>$F -echo ' then o="$o -I$includedir" ; fi' >>$F -echo ' ;;' >>$F -echo ' --libs) o="$o -L$libdir -l$libs" ;;' >>$F -echo ' --exec_prefix|--eprefix) o="$o $exec_prefix" ;;' >>$F -echo ' --bindir) o="$o $bindir" ;;' >>$F -echo ' --sbindir) o="$o $sbindir" ;;' >>$F -echo ' --libexecdir) o="$o $libexecdir" ;;' >>$F -echo ' --datadir) o="$o $datadir" ;;' >>$F -echo ' --datainc) o="$o -I$datadir" ;;' >>$F -echo ' --datalib) o="$o -L$datadir" ;;' >>$F -echo ' --sysconfdir) o="$o $sysconfdir" ;;' >>$F -echo ' --sharedstatedir) o="$o $sharedstatedir" ;;' >>$F -echo ' --localstatedir) o="$o $localstatedir" ;;' >>$F -echo ' --libdir) o="$o $libdir" ;;' >>$F -echo ' --libadd) o="$o -L$libdir" ;;' >>$F -echo ' --infodir) o="$o $infodir" ;;' >>$F -echo ' --mandir) o="$o $mandir" ;;' >>$F -echo ' --target) o="$o $target" ;;' >>$F -echo ' --host) o="$o $host" ;;' >>$F -echo ' --build) o="$o $build" ;;' >>$F -echo ' --data) o="$o -I$datadir/$package" ;;' >>$F -echo ' --pkgdatadir) o="$o $datadir/$package" ;;' >>$F -echo ' --pkgdatainc) o="$o -I$datadir/$package" ;;' >>$F -echo ' --pkgdatalib) o="$o -L$datadir/$package" ;;' >>$F -echo ' --pkglibdir) o="$o $libdir/$package" ;;' >>$F -echo ' --pkglibinc) o="$o -I$libinc/$package" ;;' >>$F -echo ' --pkglibadd) o="$o -L$libadd/$package" ;;' >>$F -echo ' --pkgincludedir) o="$o $includedir/$package" ;;' >>$F -echo ' --help) h="1" ;;' >>$F -echo ' -?//*|-?/*//*|-?./*//*|//*|/*//*|./*//*) ' >>$F -echo ' v=`echo $i | sed -e s://:\$:g`' >>$F -echo ' v=`eval "echo $v"` ' >>$F -echo ' o="$o $v" ;; ' >>$F -echo ' esac' >>$F -echo 'done' >>$F -echo ' ' >>$F -echo 'o=`eval "echo $o"`' >>$F -echo 'o=`eval "echo $o"`' >>$F -echo 'eval "echo $o"' >>$F -echo ' ' >>$F -echo 'if test ! -z "$h" ; then ' >>$F -echo 'cat <>$F -echo ' --prefix=xxx) (what is that for anyway?)' >>$F -echo ' --prefix) \$prefix $prefix' >>$F -echo ' --package) \$package $package' >>$F -echo ' --version) \$version $version' >>$F -echo ' --cflags) -I\$includedir unless it is /usr/include' >>$F -echo ' --libs) -L\$libdir -l\$PACKAGE_TARNAME \$LIBS' >>$F -echo ' --exec_prefix) or... ' >>$F -echo ' --eprefix) \$exec_prefix $exec_prefix' >>$F -echo ' --bindir) \$bindir $bindir' >>$F -echo ' --sbindir) \$sbindir $sbindir' >>$F -echo ' --libexecdir) \$libexecdir $libexecdir' >>$F -echo ' --datadir) \$datadir $datadir' >>$F -echo ' --sysconfdir) \$sysconfdir $sysconfdir' >>$F -echo ' --sharedstatedir) \$sharedstatedir$sharedstatedir' >>$F -echo ' --localstatedir) \$localstatedir $localstatedir' >>$F -echo ' --libdir) \$libdir $libdir' >>$F -echo ' --infodir) \$infodir $infodir' >>$F -echo ' --mandir) \$mandir $mandir' >>$F -echo ' --target) \$target $target' >>$F -echo ' --host) \$host $host' >>$F -echo ' --build) \$build $build' >>$F -echo ' --data) -I\$datadir/\$package' >>$F -echo ' --pkgdatadir) \$datadir/\$package' >>$F -echo ' --pkglibdir) \$libdir/\$package' >>$F -echo ' --pkgincludedir) \$includedir/\$package' >>$F -echo ' --help) generated by ac_create_generic_config.m4' >>$F -echo ' -I//varname and other inc-targets like --pkgdatainc supported' >>$F -echo ' -L//varname and other lib-targets, e.g. --pkgdatalib or --libadd' >>$F -echo 'EOF' >>$F -echo 'fi' >>$F -GENERIC_CONFIG="$F" - - - -ac_config_files="$ac_config_files Makefile log4tango.pc config/Makefile src/Makefile include/Makefile include/log4tango/Makefile include/log4tango/threading/Makefile tests/Makefile" - - -if test "x$enable_doc" = xyes; then -ac_config_files="$ac_config_files doc/Makefile doc/Doxyfile doc/html/Makefile" - -fi - -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} - if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" - else - case $cache_file in #( - */* | ?:*) - mv -f confcache "$cache_file"$$ && - mv -f "$cache_file"$$ "$cache_file" ;; #( - *) - mv -f confcache "$cache_file" ;; - esac - fi - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -DEFS=-DHAVE_CONFIG_H - -ac_libobjs= -ac_ltlibobjs= -U= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" - as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - - if test -n "$EXEEXT"; then - am__EXEEXT_TRUE= - am__EXEEXT_FALSE='#' -else - am__EXEEXT_TRUE='#' - am__EXEEXT_FALSE= -fi - -if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error $? "conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${DOC_TRUE}" && test -z "${DOC_FALSE}"; then - as_fn_error $? "conditional \"DOC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi - -: "${CONFIG_STATUS=./config.status}" -ac_write_fail=0 -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -as_write_fail=0 -cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false - -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 6>&1 -## ----------------------------------- ## -## Main body of $CONFIG_STATUS script. ## -## ----------------------------------- ## -_ASEOF -test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# Save the log message, to keep $0 and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by log4tango $as_me 5.0.1, which was -generated by GNU Autoconf 2.68. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - -_ACEOF - -case $ac_config_files in *" -"*) set x $ac_config_files; shift; ac_config_files=$*;; -esac - -case $ac_config_headers in *" -"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -esac - - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions -from templates according to the current configuration. Unless the files -and actions are specified as TAGs, all are instantiated by default. - -Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - --config print configuration, then exit - -q, --quiet, --silent - do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Configuration commands: -$config_commands - -Report bugs to ." - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" -ac_cs_version="\\ -log4tango config.status 5.0.1 -configured by $0, generated by GNU Autoconf 2.68, - with options \\"\$ac_cs_config\\" - -Copyright (C) 2010 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -INSTALL='$INSTALL' -MKDIR_P='$MKDIR_P' -AWK='$AWK' -test -n "\$AWK" || AWK=awk -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# The default lists apply if the user does not specify any file. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=?*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - --*=) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg= - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; - --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - '') as_fn_error $? "missing file argument" ;; - esac - as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append CONFIG_HEADERS " '$ac_optarg'" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' -Try \`$0 --help' for more information.";; - --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; - - *) as_fn_append ac_config_targets " $1" - ac_need_defaults=false ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' - export CONFIG_SHELL - exec "\$@" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - $as_echo "$ac_log" -} >&5 - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# -# INIT-COMMANDS -# -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' -macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' -macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' -enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' -pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' -SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' -ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' -PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' -host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' -host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' -host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' -build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' -build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' -build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' -SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' -Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' -GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' -EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' -FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' -LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' -NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' -LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' -ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' -exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' -lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' -reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' -OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' -AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' -STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' -RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' -lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' -CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' -compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' -GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' -objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' -need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' -LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' -libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' -module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' -version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' -runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' -libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' -soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' -install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' -finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' -old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' -striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' -predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' -postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' -predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' -postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' -LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' -reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' -reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' -compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' -GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' -archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' -module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' -with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' -no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' -inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' -link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' -always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' -exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' -include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' -prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' -postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' -predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' -postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' - -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - -# Quote evaled strings. -for var in SHELL \ -ECHO \ -PATH_SEPARATOR \ -SED \ -GREP \ -EGREP \ -FGREP \ -LD \ -NM \ -LN_S \ -lt_SP2NL \ -lt_NL2SP \ -reload_flag \ -OBJDUMP \ -deplibs_check_method \ -file_magic_cmd \ -file_magic_glob \ -want_nocaseglob \ -DLLTOOL \ -sharedlib_from_linklib_cmd \ -AR \ -AR_FLAGS \ -archiver_list_spec \ -STRIP \ -RANLIB \ -CC \ -CFLAGS \ -compiler \ -lt_cv_sys_global_symbol_pipe \ -lt_cv_sys_global_symbol_to_cdecl \ -lt_cv_sys_global_symbol_to_c_name_address \ -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -nm_file_list_spec \ -lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_pic \ -lt_prog_compiler_wl \ -lt_prog_compiler_static \ -lt_cv_prog_compiler_c_o \ -need_locks \ -MANIFEST_TOOL \ -DSYMUTIL \ -NMEDIT \ -LIPO \ -OTOOL \ -OTOOL64 \ -shrext_cmds \ -export_dynamic_flag_spec \ -whole_archive_flag_spec \ -compiler_needs_object \ -with_gnu_ld \ -allow_undefined_flag \ -no_undefined_flag \ -hardcode_libdir_flag_spec \ -hardcode_libdir_separator \ -exclude_expsyms \ -include_expsyms \ -file_list_spec \ -variables_saved_for_relink \ -libname_spec \ -library_names_spec \ -soname_spec \ -install_override_mode \ -finish_eval \ -old_striplib \ -striplib \ -compiler_lib_search_dirs \ -predep_objects \ -postdep_objects \ -predeps \ -postdeps \ -compiler_lib_search_path \ -LD_CXX \ -reload_flag_CXX \ -compiler_CXX \ -lt_prog_compiler_no_builtin_flag_CXX \ -lt_prog_compiler_pic_CXX \ -lt_prog_compiler_wl_CXX \ -lt_prog_compiler_static_CXX \ -lt_cv_prog_compiler_c_o_CXX \ -export_dynamic_flag_spec_CXX \ -whole_archive_flag_spec_CXX \ -compiler_needs_object_CXX \ -with_gnu_ld_CXX \ -allow_undefined_flag_CXX \ -no_undefined_flag_CXX \ -hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_separator_CXX \ -exclude_expsyms_CXX \ -include_expsyms_CXX \ -file_list_spec_CXX \ -compiler_lib_search_dirs_CXX \ -predep_objects_CXX \ -postdep_objects_CXX \ -predeps_CXX \ -postdeps_CXX \ -compiler_lib_search_path_CXX; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in reload_cmds \ -old_postinstall_cmds \ -old_postuninstall_cmds \ -old_archive_cmds \ -extract_expsyms_cmds \ -old_archive_from_new_cmds \ -old_archive_from_expsyms_cmds \ -archive_cmds \ -archive_expsym_cmds \ -module_cmds \ -module_expsym_cmds \ -export_symbols_cmds \ -prelink_cmds \ -postlink_cmds \ -postinstall_cmds \ -postuninstall_cmds \ -finish_cmds \ -sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ -reload_cmds_CXX \ -old_archive_cmds_CXX \ -old_archive_from_new_cmds_CXX \ -old_archive_from_expsyms_cmds_CXX \ -archive_cmds_CXX \ -archive_expsym_cmds_CXX \ -module_cmds_CXX \ -module_expsym_cmds_CXX \ -export_symbols_cmds_CXX \ -prelink_cmds_CXX \ -postlink_cmds_CXX; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' - -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - - - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile' - - - - - - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "log4tango.pc") CONFIG_FILES="$CONFIG_FILES log4tango.pc" ;; - "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; - "include/log4tango/Makefile") CONFIG_FILES="$CONFIG_FILES include/log4tango/Makefile" ;; - "include/log4tango/threading/Makefile") CONFIG_FILES="$CONFIG_FILES include/log4tango/threading/Makefile" ;; - "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; - "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;; - "doc/html/Makefile") CONFIG_FILES="$CONFIG_FILES doc/html/Makefile" ;; - - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac -done - - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= ac_tmp= - trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status -' 0 - trap 'as_fn_exit 1' 1 2 13 15 -} -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp - -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. -if test -n "$CONFIG_FILES"; then - - -ac_cr=`echo X | tr X '\015'` -# On cygwin, bash can eat \r inside `` if the user requested igncr. -# But we know of no other shell where ac_cr would be empty at this -# point, so we can use a bashism as a fallback. -if test "x$ac_cr" = x; then - eval ac_cr=\$\'\\r\' -fi -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -else - ac_cs_awk_cr=$ac_cr -fi - -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && -_ACEOF - - -{ - echo "cat >conf$$subs.awk <<_ACEOF" && - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" -} >conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done -rm -f conf$$subs.sh - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && -_ACEOF -sed -n ' -h -s/^/S["/; s/!.*/"]=/ -p -g -s/^[^!]*!// -:repl -t repl -s/'"$ac_delim"'$// -t delim -:nl -h -s/\(.\{148\}\)..*/\1/ -t more1 -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -p -n -b repl -:more1 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t nl -:delim -h -s/\(.\{148\}\)..*/\1/ -t more2 -s/["\\]/\\&/g; s/^/"/; s/$/"/ -p -b -:more2 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t delim -' >$CONFIG_STATUS || ac_write_fail=1 -rm -f conf$$subs.awk -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACAWK -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" - -} -{ - line = $ 0 - nfields = split(line, field, "@") - substed = 0 - len = length(field[1]) - for (i = 2; i < nfields; i++) { - key = field[i] - keylen = length(key) - if (S_is_set[key]) { - value = S[key] - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) - len += length(value) + length(field[++i]) - substed = 1 - } else - len += 1 + keylen - } - - print line -} - -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -else - cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 -_ACEOF - -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -h -s/// -s/^/:/ -s/[ ]*$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:*// -s/:*$// -x -s/\(=[ ]*\).*/\1/ -G -s/\n// -s/^[^=]*=[ ]*$// -}' -fi - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -fi # test -n "$CONFIG_FILES" - -# Set up the scripts for CONFIG_HEADERS section. -# No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. -if test -n "$CONFIG_HEADERS"; then -cat >"$ac_tmp/defines.awk" <<\_ACAWK || -BEGIN { -_ACEOF - -# Transform confdefs.h into an awk script `defines.awk', embedded as -# here-document in config.status, that substitutes the proper values into -# config.h.in to produce config.h. - -# Create a delimiter string that does not exist in confdefs.h, to ease -# handling of long lines. -ac_delim='%!_!# ' -for ac_last_try in false false :; do - ac_tt=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_tt"; then - break - elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -# For the awk script, D is an array of macro values keyed by name, -# likewise P contains macro parameters if any. Preserve backslash -# newline sequences. - -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -sed -n ' -s/.\{148\}/&'"$ac_delim"'/g -t rset -:rset -s/^[ ]*#[ ]*define[ ][ ]*/ / -t def -d -:def -s/\\$// -t bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3"/p -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -d -:bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3\\\\\\n"\\/p -t cont -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -t cont -d -:cont -n -s/.\{148\}/&'"$ac_delim"'/g -t clear -:clear -s/\\$// -t bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/"/p -d -:bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -b cont -' >$CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - for (key in D) D_is_set[key] = 1 - FS = "" -} -/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { - line = \$ 0 - split(line, arg, " ") - if (arg[1] == "#") { - defundef = arg[2] - mac1 = arg[3] - } else { - defundef = substr(arg[1], 2) - mac1 = arg[2] - } - split(mac1, mac2, "(") #) - macro = mac2[1] - prefix = substr(line, 1, index(line, defundef) - 1) - if (D_is_set[macro]) { - # Preserve the white space surrounding the "#". - print prefix "define", macro P[macro] D[macro] - next - } else { - # Replace #undef with comments. This is necessary, for example, - # in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. - if (defundef == "undef") { - print "/*", prefix defundef, macro, "*/" - next - } - } -} -{ print } -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 -fi # test -n "$CONFIG_HEADERS" - - -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" -shift -for ac_tag -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$ac_tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - as_fn_append ac_file_inputs " '$ac_f'" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' - `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} - fi - # Neutralize special characters interpreted by sed in replacement strings. - case $configure_input in #( - *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | - sed 's/[\\\\&|]/\\\\&/g'`;; #( - *) ac_sed_conf_input=$configure_input;; - esac - - case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - esac - ;; - esac - - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - case $ac_mode in - :F) - # - # CONFIG_FILE - # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac - ac_MKDIR_P=$MKDIR_P - case $MKDIR_P in - [\\/$]* | ?:[\\/]* ) ;; - */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; - esac -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= -ac_sed_dataroot=' -/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p' -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_sed_extra="$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s|@configure_input@|$ac_sed_conf_input|;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@top_build_prefix@&$ac_top_build_prefix&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -s&@INSTALL@&$ac_INSTALL&;t t -s&@MKDIR_P@&$ac_MKDIR_P&;t t -$ac_datarootdir_hack -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} - - rm -f "$ac_tmp/stdin" - case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; - esac \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - ;; - :H) - # - # CONFIG_HEADER - # - if test x"$ac_file" != x-; then - { - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" - } >"$ac_tmp/config.h" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f "$ac_file" - mv "$ac_tmp/config.h" "$ac_file" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - fi - else - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error $? "could not create -" "$LINENO" 5 - fi -# Compute "$ac_file"'s index in $config_headers. -_am_arg="$ac_file" -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$_am_arg" : 'X\(//\)[^/]' \| \ - X"$_am_arg" : 'X\(//\)$' \| \ - X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$_am_arg" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'`/stamp-h$_am_stamp_count - ;; - - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} - ;; - esac - - - case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} - ;; - "libtool":C) - - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY 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 GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - -# The names of the tagged configurations supported by this script. -available_tags="CXX " - -# ### BEGIN LIBTOOL CONFIG - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Which release of libtool.m4 was used? -macro_version=$macro_version -macro_revision=$macro_revision - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# What type of objects to build. -pic_mode=$pic_mode - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# An echo program that protects backslashes. -ECHO=$lt_ECHO - -# The PATH separator for the build system. -PATH_SEPARATOR=$lt_PATH_SEPARATOR - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# A sed program that does not truncate output. -SED=$lt_SED - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="\$SED -e 1s/^X//" - -# A grep program that handles long lines. -GREP=$lt_GREP - -# An ERE matcher. -EGREP=$lt_EGREP - -# A literal string matcher. -FGREP=$lt_FGREP - -# A BSD- or MS-compatible name lister. -NM=$lt_NM - -# Whether we need soft or hard links. -LN_S=$lt_LN_S - -# What is the maximum length of a command? -max_cmd_len=$max_cmd_len - -# Object file suffix (normally "o"). -objext=$ac_objext - -# Executable file suffix (normally ""). -exeext=$exeext - -# whether the shell understands "unset". -lt_unset=$lt_unset - -# turn spaces into newlines. -SP2NL=$lt_lt_SP2NL - -# turn newlines into spaces. -NL2SP=$lt_lt_NL2SP - -# convert \$build file names to \$host format. -to_host_file_cmd=$lt_cv_to_host_file_cmd - -# convert \$build files to toolchain format. -to_tool_file_cmd=$lt_cv_to_tool_file_cmd - -# An object symbol dumper. -OBJDUMP=$lt_OBJDUMP - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method = "file_magic". -file_magic_cmd=$lt_file_magic_cmd - -# How to find potential files when deplibs_check_method = "file_magic". -file_magic_glob=$lt_file_magic_glob - -# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -want_nocaseglob=$lt_want_nocaseglob - -# DLL creation program. -DLLTOOL=$lt_DLLTOOL - -# Command to associate shared and link libraries. -sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd - -# The archiver. -AR=$lt_AR - -# Flags to create an archive. -AR_FLAGS=$lt_AR_FLAGS - -# How to feed a file listing to the archiver. -archiver_list_spec=$lt_archiver_list_spec - -# A symbol stripping program. -STRIP=$lt_STRIP - -# Commands used to install an old-style archive. -RANLIB=$lt_RANLIB -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Whether to use a lock for old archive extraction. -lock_old_archive_extraction=$lock_old_archive_extraction - -# A C compiler. -LTCC=$lt_CC - -# LTCC compiler flags. -LTCFLAGS=$lt_CFLAGS - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration. -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair. -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# Transform the output of nm in a C name address pair when lib prefix is needed. -global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -# Specify filename containing input files for \$NM. -nm_file_list_spec=$lt_nm_file_list_spec - -# The root where to search for dependent libraries,and in which our libraries should be installed. -lt_sysroot=$lt_sysroot - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# Used to examine libraries when file_magic_cmd begins with "file". -MAGIC_CMD=$MAGIC_CMD - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Manifest tool. -MANIFEST_TOOL=$lt_MANIFEST_TOOL - -# Tool to manipulate archived DWARF debug symbol files on Mac OS X. -DSYMUTIL=$lt_DSYMUTIL - -# Tool to change global to local symbols on Mac OS X. -NMEDIT=$lt_NMEDIT - -# Tool to manipulate fat objects and archives on Mac OS X. -LIPO=$lt_LIPO - -# ldd/readelf like tool for Mach-O binaries on Mac OS X. -OTOOL=$lt_OTOOL - -# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. -OTOOL64=$lt_OTOOL64 - -# Old archive suffix (normally "a"). -libext=$libext - -# Shared library suffix (normally ".so"). -shrext_cmds=$lt_shrext_cmds - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at link time. -variables_saved_for_relink=$lt_variables_saved_for_relink - -# Do we need the "lib" prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Library versioning type. -version_type=$version_type - -# Shared library runtime path variable. -runpath_var=$runpath_var - -# Shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Permission mode override for installation of shared libraries. -install_override_mode=$lt_install_override_mode - -# Command to use after installation of a shared archive. -postinstall_cmds=$lt_postinstall_cmds - -# Command to use after uninstallation of a shared archive. -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# As "finish_cmds", except a single script fragment to be evaled but -# not shown. -finish_eval=$lt_finish_eval - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Compile-time system search path for libraries. -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - - -# The linker used to build libraries. -LD=$lt_LD - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds - -# A language specific compiler. -CC=$lt_compiler - -# Is the compiler the GNU compiler? -with_gcc=$GCC - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds -archive_expsym_cmds=$lt_archive_expsym_cmds - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds -module_expsym_cmds=$lt_module_expsym_cmds - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds - -# Commands necessary for finishing linking programs. -postlink_cmds=$lt_postlink_cmds - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action - -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects -postdep_objects=$lt_postdep_objects -predeps=$lt_predeps -postdeps=$lt_postdeps - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path - -# ### END LIBTOOL CONFIG - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - -ltmain="$ac_aux_dir/ltmain.sh" - - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - - - cat <<_LT_EOF >> "$ofile" - -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# The linker used to build libraries. -LD=$lt_LD_CXX - -# How to create reloadable object files. -reload_flag=$lt_reload_flag_CXX -reload_cmds=$lt_reload_cmds_CXX - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds_CXX - -# A language specific compiler. -CC=$lt_compiler_CXX - -# Is the compiler the GNU compiler? -with_gcc=$GCC_CXX - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_CXX - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object_CXX - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld_CXX - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_CXX - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_CXX - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct_CXX - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute_CXX - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L_CXX - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic_CXX - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath_CXX - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_CXX - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols_CXX - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_CXX - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_CXX - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_CXX - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds_CXX - -# Commands necessary for finishing linking programs. -postlink_cmds=$lt_postlink_cmds_CXX - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec_CXX - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_CXX - -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects_CXX -postdep_objects=$lt_postdep_objects_CXX -predeps=$lt_predeps_CXX -postdeps=$lt_postdeps_CXX - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX - -# ### END LIBTOOL TAG CONFIG: CXX -_LT_EOF - - ;; - - esac -done # for ac_tag - - -as_fn_exit 0 -_ACEOF -ac_clean_files=$ac_clean_files_save - -test $ac_write_fail = 0 || - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit 1 -fi -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -fi - - -ac_prefix_conf_OUT=`echo include/log4tango/config.h` -ac_prefix_conf_DEF=`echo _$ac_prefix_conf_OUT | sed -e 'y:abcdefghijklmnopqrstuvwxyz./,-:ABCDEFGHIJKLMNOPQRSTUVWXYZ____:'` -ac_prefix_conf_PKG=`echo $PACKAGE_TARNAME` -ac_prefix_conf_LOW=`echo _$ac_prefix_conf_PKG | sed -e 'y:ABCDEFGHIJKLMNOPQRSTUVWXYZ-:abcdefghijklmnopqrstuvwxyz_:'` -ac_prefix_conf_UPP=`echo $ac_prefix_conf_PKG | sed -e 'y:abcdefghijklmnopqrstuvwxyz-:ABCDEFGHIJKLMNOPQRSTUVWXYZ_:' -e '/^[0-9]/s/^/_/'` -ac_prefix_conf_INP=`echo include/config.h` -if test "$ac_prefix_conf_INP" = "_"; then - case $ac_prefix_conf_OUT in - */*) ac_prefix_conf_INP=`basename $ac_prefix_conf_OUT` - ;; - *-*) ac_prefix_conf_INP=`echo $ac_prefix_conf_OUT | sed -e 's/[a-zA-Z0-9_]*-//'` - ;; - *) ac_prefix_conf_INP=config.h - ;; - esac -fi -if test -z "$ac_prefix_conf_PKG" ; then - as_fn_error $? "no prefix for _PREFIX_PKG_CONFIG_H" "$LINENO" 5 -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5 -$as_echo "creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6; } - if test -f $ac_prefix_conf_INP ; then - $as_dirname -- /* automatically generated */ || -$as_expr X/* automatically generated */ : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X/* automatically generated */ : 'X\(//\)[^/]' \| \ - X/* automatically generated */ : 'X\(//\)$' \| \ - X/* automatically generated */ : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/* automatically generated */ | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - echo '#ifndef '$ac_prefix_conf_DEF >$ac_prefix_conf_OUT - echo '#define '$ac_prefix_conf_DEF' 1' >>$ac_prefix_conf_OUT - echo ' ' >>$ac_prefix_conf_OUT - echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$ac_prefix_conf_OUT - - echo 's/#undef *\([A-Z_]\)/#undef '$ac_prefix_conf_UPP'_\1/' >conftest.sed - echo 's/#undef *\([a-z]\)/#undef '$ac_prefix_conf_LOW'_\1/' >>conftest.sed - echo 's/#define *\([A-Z_][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_UPP"_\\1 \\" >>conftest.sed - echo '#define '$ac_prefix_conf_UPP"_\\1 \\2 \\" >>conftest.sed - echo '#endif/' >>conftest.sed - echo 's/#define *\([a-z][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_LOW"_\\1 \\" >>conftest.sed - echo '#define '$ac_prefix_conf_LOW"_\\1 \\2 \\" >>conftest.sed - echo '#endif/' >>conftest.sed - sed -f conftest.sed $ac_prefix_conf_INP >>$ac_prefix_conf_OUT - echo ' ' >>$ac_prefix_conf_OUT - echo '/*' $ac_prefix_conf_DEF '*/' >>$ac_prefix_conf_OUT - echo '#endif' >>$ac_prefix_conf_OUT - else - as_fn_error $? "input file $ac_prefix_conf_IN does not exist, skip generating $ac_prefix_conf_OUT" "$LINENO" 5 - fi - rm -f conftest.* -fi diff --git a/log4tango/configure.in b/log4tango/configure.in deleted file mode 100644 index fe33114da..000000000 --- a/log4tango/configure.in +++ /dev/null @@ -1,112 +0,0 @@ -AC_INIT(log4tango, 5.0.1, nicolas.leclercq@synchrotron-soleil.fr) -AC_CONFIG_AUX_DIR(config) -AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE -AM_MAINTAINER_MODE() - -# autoconf 2.50 or higher to rebuild aclocal.m4, because the -# AC_CREATE_PREFIX_CONFIG_H macro needs the AS_DIRNAME macro. -AC_PREREQ(2.50) - -# -# +1 : ? : +1 == new interface that does not break old one -# +1 : ? : 0 == new interface that breaks old one -# ? : ? : 0 == no new interfaces, but breaks apps -# ? :+1 : ? == just some internal changes, nothing breaks but might work -# better -# CURRENT : REVISION : AGE -LT_VERSION=5:1:0 - -AC_SUBST(LT_VERSION) - -AM_CONFIG_HEADER(include/config.h) - -# Checks for programs -# ---------------------------------------------------------------------------- -AC_CANONICAL_HOST - -dnl Change ld and ar if we're using sunpro compiler -dnl Might as well disable static compiling on solaris -dnl since it doesn't work with sunpro at the moment. -RSSH_CHECK_SUNPRO_CC -if test "x$rssh_cv_check_sunpro_cc" = "xyes"; then - AR="$CXX -xar" - AR_FLAGS="-o" - LD="$CXX -pta -G" - AC_DISABLE_STATIC -fi - -AC_PROG_LIBTOOL -AC_PROG_INSTALL -AC_PROG_MAKE_SET - -AC_PROG_CXX([g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC QCC]) - -AC_PROG_CXXCPP -AC_LANG(C++) - -PETI_PEDANTIC_GCC - -# Checks header files -# ---------------------------------------------------------------------------- -AC_CHECK_HEADERS([unistd.h]) -AC_CHECK_HEADERS([io.h]) - -# Check for pthreads -# ---------------------------------------------------------------------------- -BB_CHECK_PTHREADS - -# Checks local idioms -# ---------------------------------------------------------------------------- -AC_C_INT64_T -AC_CXX_HAVE_SSTREAM -AC_FUNC_SNPRINTF - -# Misc. func tests -# ---------------------------------------------------------------------------- -AC_CHECK_FUNCS([gettimeofday]) -AC_CHECK_FUNCS([ftime]) - -# Check for doxygen -# ---------------------------------------------------------------------------- -BB_ENABLE_DOXYGEN - -# To build on MacOSX define __darwin__ -# ---------------------------------------------------------------------------- -case $build_os in - darwin*) - AC_DEFINE(__darwin__,1,If we're running on darwin/MacOsX) - CXXFLAGS="$CXXFLAGS -D__darwin__" - ;; - freebsd*) - AC_DEFINE(__freebsd__,1,If we're running on FreeBSD) - CXXFLAGS="$CXXFLAGS -D__freebsd__" - ;; -esac - -# Create files -# ---------------------------------------------------------------------------- -AC_CREATE_GENERIC_CONFIG - -AC_CONFIG_FILES([ -Makefile -log4tango.pc -config/Makefile -src/Makefile -include/Makefile -include/log4tango/Makefile -include/log4tango/threading/Makefile -tests/Makefile -]) - -if test "x$enable_doc" = xyes; then -AC_CONFIG_FILES([ -doc/Makefile -doc/Doxyfile -doc/html/Makefile -]) -fi - -AC_OUTPUT - -AC_CREATE_PREFIX_CONFIG_H(include/log4tango/config.h,$PACKAGE_TARNAME,include/config.h) diff --git a/log4tango/doc/Doxyfile.in b/log4tango/doc/Doxyfile.in deleted file mode 100644 index b27e5230f..000000000 --- a/log4tango/doc/Doxyfile.in +++ /dev/null @@ -1,1513 +0,0 @@ -# Doxyfile 1.5.8 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = @PACKAGE_NAME@ - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = @PACKAGE_VERSION@ - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = . - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, -# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, -# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, -# Spanish, Swedish, and Ukrainian. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = NO - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) - -JAVADOC_AUTOBRIEF = YES - -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it parses. -# With this tag you can assign which parser to use for a given extension. -# Doxygen has a built-in mapping, but you can override or extend it using this tag. -# The format is ext=language, where ext is a file extension, and language is one of -# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, -# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat -# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), -# use: inc=Fortran f=C - -EXTENSION_MAPPING = - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. - -TYPEDEF_HIDES_STRUCT = NO - -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols - -SYMBOL_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = YES - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = YES - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -#SHOW_DIRECTORIES = NO - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. -# This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by -# doxygen. The layout file controls the global structure of the generated output files -# in an output format independent way. The create the layout file that represents -# doxygen's defaults, run doxygen with the -l option. You can optionally specify a -# file name after the option, if omitted DoxygenLayout.xml will be used as the name -# of the layout file. - -LAYOUT_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = YES - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - -WARN_NO_PARAMDOC = NO - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = @top_srcdir@/include \ - @top_srcdir@/src \ - @top_srcdir@/doc/mainPage.txt - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 - -FILE_PATTERNS = *.cpp \ - *.hh - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded -# from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. -# If FILTER_PATTERNS is specified, this tag will be -# ignored. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. -# Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. -# The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = NO - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. -# Otherwise they will link to the documentation. - -REFERENCES_LINK_SOURCE = YES - -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = NO - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = @enable_html_docs@ - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html/api - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -#HTML_ALIGN_MEMBERS = YES - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). - -HTML_DYNAMIC_SECTIONS = NO - -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. - -GENERATE_DOCSET = NO - -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. - -CHM_INDEX_ENCODING = - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER -# are set, an additional index file will be generated that can be used as input for -# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated -# HTML documentation. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. -# The path specified is relative to the HTML output folder. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#namespace - -QHP_NAMESPACE = - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#virtual-folders - -QHP_VIRTUAL_FOLDER = doc - -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. -# For more information please see -# http://doc.trolltech.com/qthelpproject.html#custom-filters - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see -# Qt Help Project / Custom Filters. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's -# filter section matches. -# Qt Help Project / Filter Attributes. - -QHP_SECT_FILTER_ATTRS = - -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated -# .qhp file. - -QHG_LOCATION = - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to FRAME, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. Other possible values -# for this tag are: HIERARCHIES, which will generate the Groups, Directories, -# and Class Hierarchy pages using a tree view instead of an ordered list; -# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which -# disables this behavior completely. For backwards compatibility with previous -# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE -# respectively. - -GENERATE_TREEVIEW = NONE - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. - -FORMULA_FONTSIZE = 10 - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = @enable_latex_docs@ - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = YES - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = YES - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = YES - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. -# This is useful -# if you want to understand what is going on. -# On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = YES - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. - -CLASS_DIAGRAMS = YES - -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = @enable_dot@ - -# By default doxygen will write a font called FreeSans.ttf to the output -# directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need -# these (or just want a differently looking font) you can specify the font name -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, -# which can be done by putting it in a standard location or by setting the -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory -# containing the font. - -DOT_FONTNAME = FreeSans - -# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. -# The default size is 10pt. - -DOT_FONTSIZE = 10 - -# By default doxygen will tell dot to use the output directory to look for the -# FreeSans.ttf font (which doxygen will put there itself). If you specify a -# different font using DOT_FONTNAME you can set the path where dot -# can find it using this tag. - -DOT_FONTPATH = - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - -GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs -# for selected functions only using the \callgraph command. - -CALL_GRAPH = NO - -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller -# graphs for selected functions only using the \callergraph command. - -CALLER_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - -DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note -# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. - -DOT_GRAPH_MAX_NODES = 50 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by -# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. - -MAX_DOT_GRAPH_DEPTH = 0 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not -# seem to support this out of the box. Warning: Depending on the platform used, -# enabling this option may lead to badly anti-aliased labels on the edges of -# a graph (i.e. they become hard to read). - -DOT_TRANSPARENT = YES - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - -DOT_MULTI_TARGETS = NO - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES - -#--------------------------------------------------------------------------- -# Options related to the search engine -#--------------------------------------------------------------------------- - -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. - -SEARCHENGINE = NO diff --git a/log4tango/doc/Makefile.am b/log4tango/doc/Makefile.am deleted file mode 100644 index 2b5868117..000000000 --- a/log4tango/doc/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -SUBDIRS = html - -man3dir = $(mandir)/man3 -docdir_log = $(docdir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@ - -EXTRA_DIST = \ - mainPage.txt - -.PHONY: dox pdf - -all-local: dox - -dox: html html/api/index.html -html/api/index.html: Doxyfile - @DOXYGEN@ - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(man3dir) - @for i in ./man/man3/log4tango.3 ./man/man3/log4tango_*.3; do \ - inst=`basename $$i | sed 's/_/::/g'`; \ - echo "$(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$inst"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$inst; \ - done - $(mkinstalldirs) $(DESTDIR)$(docdir_log) - cp -r html/. $(DESTDIR)$(docdir_log) - $(RM) -r -f $(DESTDIR)$(docdir_log)/CVS \ - $(DESTDIR)$(docdir_log)/Makefile.am \ - $(DESTDIR)$(docdir_log)/Makefile.in \ - $(DESTDIR)$(docdir_log)/Makefile - -uninstall-local: - $(RM) $(DESTDIR)$(man3dir)/log4tango.3 - $(RM) $(DESTDIR)$(man3dir)/log4tango::*.3 - $(RM) -r -f $(DESTDIR)$(docdir_log) - -clean-local: - $(RM) -r latex - $(RM) -r html/api man @PACKAGE_TARNAME@.ps @PACKAGE_TARNAME@.pdf diff --git a/log4tango/doc/Makefile.in b/log4tango/doc/Makefile.in deleted file mode 100644 index c1935d02f..000000000 --- a/log4tango/doc/Makefile.in +++ /dev/null @@ -1,622 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = doc -DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/AC_CREATE_PREFIX_CONFIG_H.m4 \ - $(top_srcdir)/m4/AC_CXX_HAVE_SSTREAM.m4 \ - $(top_srcdir)/m4/AC_CXX_NAMESPACES.m4 \ - $(top_srcdir)/m4/AC_C_INT64_T.m4 \ - $(top_srcdir)/m4/AC_FUNC_SNPRINTF.m4 \ - $(top_srcdir)/m4/BB_CHECK_PTHREADS.m4 \ - $(top_srcdir)/m4/BB_ENABLE_DOXYGEN.m4 \ - $(top_srcdir)/m4/CREATE_GENERIC_CONFIG.m4 \ - $(top_srcdir)/m4/PETI_PEDANTIC_GCC.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_SUNPRO_CC.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/config.h -CONFIG_CLEAN_FILES = Doxyfile -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GENERIC_CONFIG = @GENERIC_CONFIG@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = html -man3dir = $(mandir)/man3 -docdir_log = $(docdir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@ -EXTRA_DIST = \ - mainPage.txt - -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile all-local -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool clean-local mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: install-data-local - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-local - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local ctags ctags-recursive distclean \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-local - - -.PHONY: dox pdf - -all-local: dox - -dox: html html/api/index.html -html/api/index.html: Doxyfile - @DOXYGEN@ - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(man3dir) - @for i in ./man/man3/log4tango.3 ./man/man3/log4tango_*.3; do \ - inst=`basename $$i | sed 's/_/::/g'`; \ - echo "$(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$inst"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$inst; \ - done - $(mkinstalldirs) $(DESTDIR)$(docdir_log) - cp -r html/. $(DESTDIR)$(docdir_log) - $(RM) -r -f $(DESTDIR)$(docdir_log)/CVS \ - $(DESTDIR)$(docdir_log)/Makefile.am \ - $(DESTDIR)$(docdir_log)/Makefile.in \ - $(DESTDIR)$(docdir_log)/Makefile - -uninstall-local: - $(RM) $(DESTDIR)$(man3dir)/log4tango.3 - $(RM) $(DESTDIR)$(man3dir)/log4tango::*.3 - $(RM) -r -f $(DESTDIR)$(docdir_log) - -clean-local: - $(RM) -r latex - $(RM) -r html/api man @PACKAGE_TARNAME@.ps @PACKAGE_TARNAME@.pdf - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/log4tango/doc/html/Makefile.am b/log4tango/doc/html/Makefile.am deleted file mode 100644 index f217b9618..000000000 --- a/log4tango/doc/html/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -EXTRA_DIST = \ - index.html \ - default.css \ - sflogo.png diff --git a/log4tango/doc/html/Makefile.in b/log4tango/doc/html/Makefile.in deleted file mode 100644 index 798342f83..000000000 --- a/log4tango/doc/html/Makefile.in +++ /dev/null @@ -1,384 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = doc/html -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/AC_CREATE_PREFIX_CONFIG_H.m4 \ - $(top_srcdir)/m4/AC_CXX_HAVE_SSTREAM.m4 \ - $(top_srcdir)/m4/AC_CXX_NAMESPACES.m4 \ - $(top_srcdir)/m4/AC_C_INT64_T.m4 \ - $(top_srcdir)/m4/AC_FUNC_SNPRINTF.m4 \ - $(top_srcdir)/m4/BB_CHECK_PTHREADS.m4 \ - $(top_srcdir)/m4/BB_ENABLE_DOXYGEN.m4 \ - $(top_srcdir)/m4/CREATE_GENERIC_CONFIG.m4 \ - $(top_srcdir)/m4/PETI_PEDANTIC_GCC.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_SUNPRO_CC.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GENERIC_CONFIG = @GENERIC_CONFIG@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = \ - index.html \ - default.css \ - sflogo.png - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/html/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/html/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/log4tango/doc/html/default.css b/log4tango/doc/html/default.css deleted file mode 100644 index d84edd4b2..000000000 --- a/log4tango/doc/html/default.css +++ /dev/null @@ -1,22 +0,0 @@ -BODY -{ - BACKGROUND-COLOR: white -} - -H2 -{ - color: white; - background-color: darkBlue; - font-family: arial,helvetica,sanserif; -} - -H3 -{ - text-decoration: underline; -} - -DT -{ - font-weight: bold; -} - diff --git a/log4tango/doc/html/index.html b/log4tango/doc/html/index.html deleted file mode 100644 index 89f01c1f4..000000000 --- a/log4tango/doc/html/index.html +++ /dev/null @@ -1,244 +0,0 @@ - - - - Log for Tango - - - - - -

Log4Tango

-

Introduction

-

-"Log4Tango" is a light and custom version of Log4cpp for Tango. -Log4cpp is library of C++ classes for flexible logging to miscelaneous destinations. -It is modeled after the Log4j Java library. -

- -

Download

-

-log4tango is part of the TANGO distribution. There is no way to obtain log4tango individually. -

- -

Building Log4Tango

-

-The pthread (i.e. POSIX thread) library is required to compile log4tango.

-log4tango can be build using autoconf on platforms that support it. Simply do: -

-./configure
-make
-make check
-make install
-
-

This will install log4tango under /usr/local. To install in another localation specify --prefix=<location> when running configure. -

- -

Options for ./configure

- -Besides the usual ./configure options like --prefix a few others are available: - -
-
--enable-doxyen
-
Enables generation of API documentation by Dimitri van Heeschs Doxygen tool -(http://www.doxygen.org/). Defaults to yes if doxygen can be found in the -search path.
-
- -
-
--enable-html-docs
-
If doxygen is enabled, have it generate HTML formatted documentation.
-
- -
-
--enable-latex-docs
-
If doxygen is enabled, have it generate LaTeX formatted documentation.
-
- -
-
--enable-dot
-
Let Doxygen use the 'dot' tool of GraphViz (http://www.graphviz.org) todraw its graphs.
-
- -

- -

Build notes for specific platforms

- -
-
*nix (including Linux) - g++ compiler
-
Log4cpp should build whitout modification on any decent *nix system with g++ and GNU make. The primary development platform is -RedHat Linux 7.3, which has g++ 2.96-rh, but the aim is to be compatible with from g++ 2.95 and up. When g++ 3.x has been widely -adopted we may drop support for older g++ versions.
-
-
-
Solaris - Sun CC compiler
-
Compilation with Suns CC compiler requires setting some enviroment variables. -Also static libraries appear not to work. In short do: -
-CC=CC CXX=CC LD="CC -KPIC" ./configure --disable-static
-
-
-
- -
-
Win32 - MSVC++ 6
-
Use the workspace and project files in subdirectory msvc6. -You may need to adjust include/log4cpp/config-win32.h and the project files to your particular needs.
-
- -

Releases

-

-

-
2.2.0 - based on log4cpp-0.3.4b (24 February 2003)
-
-
- -

Documentation

-

API Documentation generated by Doxygen can be found -here.
-

-

FAQ

- -

1. GENERAL

-

1.1. What is Log for C++?

-Log for C++ is a library of C++ classes for flexible logging to misc. destinations. It is modeled after the Log for Java -library (http://jakarta.apache.org/log4j/). - -

1.2. How is Log for C++ related to Log4j? Is it a straight port?

-Log for C++ strives to supply a similar interface for logging in C++ as Log4j provides in Java. However the implementation is not a -translation of the Java code. So in that sense it is not a 'port' of Log4j. Of course Log for C++ does owe many of its concepts to log4j. - -

1.3. What is the name of this project, 'Log for C++' or 'log4cpp'?

-The 'official' long name of the project is 'Log for C++', but in practice, the short name, 'log4cpp' has proven more convinient. - -

1.4. Under which license is Log for C++ available?

-As of version 0.2.1 Log for C++ is released under the GNU Lesser General Public License (LGPL). -Versions before that have been released under the GPL. See the license discussion on the forum at SourceForge -for the motivations behind switching from GPL to LGPL. - -

1.5. Our legal department doesn't like the LGPL, can you release Log for C++ under license XYZ?

-No.
-Long answer: Technically it may be possible if every contributor agrees, which due to their growing number has become increasingly -difficult. But even if that could be overcome it will not happen.
-Of course the LGPL does grant you the opportunity to choose the GPL instead of the LGPL, but I bet XYZ != GPL. - -

2. COMPILATION AND INSTALLATION

- -

3. USAGE

-

3.1. I've succesfully compiled log4cpp, now how do I use this stuff?

-For some small examples using log4cpp, see the 'tests' subdirectory. Also see the documentation section for a pointer for API documentation -and more usage information. - -

3.2. Is log4cpp thread-safe?

- -

4. PROBLEMS AND ERROR MESSAGES

-

4.1. I get 'Naming collision for 'ERROR' detected. Please read the FAQ for a workaround.'

-This is caused by the rudeness of some platforms, which mutilate the namespace with some blunt #defines. To be more precise, -the Win32 API includes #defines of 'ERROR' and 'DEBUG'. Since the preprocessor is unaware of C++ naming scopes this results in -reserving the words ERROR and DEBUG litterally everywhere. In particular this conflicts with log4cpp::Prioritiy::ERROR and -log4cpp::Priority::DEBUG. These latter two names come from log4j, so they are not something we made up ourselves.
-They Win32 authors should not have rudelessly claimed these generic names through the preprocessor. There are much better alternatives: -
    -
  1. If they use it as an integer constant, declare it using a language construct. -Either 'enum {ERROR=1};' or 'static const int ERROR=1;' would do fine.
    2. -
  2. Use a less generic name like WIN32API_ERROR to make naming conflicts less likely
    3. -
  3. In case they use it as a flag for conditional compilation, use '#define DEBUG DEBUG' and '#if defined(DEBUG)'. -In that case the preprocessor would simply replace all occurrences of 'DEBUG' in the source code with 'DEBUG', in effect leaving -everything intact.
    4. -
-

Of course the proper solution would be if the offending party would use one of the above methods, but we could have to wait -some time for this to actually happen. As an alternative log4cpp can workaround these #defines. The workaround code is enabled by -doing #define LOG4CPP_FIX_ERROR_COLLISION 1 before #including any log4cpp header files and after #including all -platform headers. For Win32 platforms this #define has already been included in log4cpp/config-win32.h. -

-

Once log4cpp has been updated to the log4j 1.2 API we can get rid of this problem by adopting the new names for log levels. -

- -

4.2. I am trying to compile/link the log4cpp package using the SunWorkshop compiler (CC) on a Solaris 7 machine. -The library builds, but the testmain code fails to link properly.

- -A proper solution for this problem has not been found yet (suggestions are welcome), -but James Emery reported success with the following workaround: -
    -
  • Disable building of the static library
    • -
  • Change the linker from /usr/ucb/ld to CC and enable 'place independent code' (pic).
    • -
-In short, configure with:
-
export LD="CC -Kpic" && ./configure --disable-static
- -

4.3. ./configure fails to detect 'snprintf()' on platform XYZ.

-./configure does not just check for the presence of a snprintf() function but for C99 compliancy as well. In particular, snprintf() -should strictly honour the 'string size' parameter to avoid potential buffer overflow problems. -log4cpp falls back to an alternative snprintf() implementation if the OS does not provide a correct one. - -

Status

-

As of version 0.3.0 log4cpp has a separate 'stable' and 'development' branches. -Releases x.y.z where y is even are considered stable and those where y is odd are experimental -(which means that some or all features may be broken).

-

The latest stable release 0.2.7. New releases of 0.2.x are for bug fixes only, new features will go into 0.3.x and eventually 0.4.x.

- -

People

-

Coding on Log4cpp was initiated by me (Bastiaan Bakker) late 2000. Since then other people have joined the project or contributed code: - - - - - - - - - - - - - - - - - -
Cedric Le Goater <cedric(at)legoater.com>autoconf setup, various improvements
Marc Welz <marc(at)jade.cs.uct.ac.za>IdsaAppender
Lynn Owen <opl(at)agoby.com>MSVC++ support
Steve Ostlind <s.ostlind(at)pentasafe.com>MSVC++ support, various fixes
Marcel Harkema <marcel(at)debian.org>Debian packaging
Uwe J�er <jaeger(at)varial.de>Borland C++ Builder support
Walter Stroebel <walter.stroebel(at)lifeline.nl>RemoteSyslogAppender
Glen Scott <glen_s(at)yahoo.com>PatternLayout, SimpleConfigurator
Tony Cheung <dragonman(at)asiayeah.com>OpenVMS support
Alex Tapaccos <ATapaccos(at)redfig.com>DailyRollingFileAppender
Brendan B. Boerner <bboerner(at)texas.net>Multiple Appender support for Categories
Paulo Pizarro <paulo.pizarro(at)digitro.com.br>RollingFileAppender
David Resnick <dresnick(at)mobilespear.com>NTEventAppender, integration work
Aaron Ingram <ai8(at)yahoo.com>MSThreads support
Alan Anderson <alan(at)rushmore.com>Win32DebugAppender, PropertyConfigurator
Emiliano Martin <emilianomc(at)terra.es>PThreads support
-

- -

Project Pages

-

- - - -
SourceForge LogoLog4cpp is hosted on SourceForge at http://sourceforge.net/projects/log4cpp/.
-

-

Related Projects

-

Log4cpp is but one of many ports/implementations of the Log4j API. Here's an incomplete list: - - - -
log4cAn implementation in C by Cedric Legoater
log4cplusAn indepent C++ implementation by Tad Smith. - Worth checking out if you don't like Log4cpp for some reason.

- - - -

License

-

As of version 0.2.1 this library is licensed under the Lesser General Public License instead of the General Public License. -No further license changes are planned :-).

- -
-Log for C++ (short name: log4cpp), a C++ library for flexible logging.
-Copyright (C) 2000-2002 LifeLine Networks bv
-Copyright (C) 2000-2002 Bastiaan Bakker
-Portions Copyright others, see file THANKS and source code.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
- - - diff --git a/log4tango/doc/html/sflogo.png b/log4tango/doc/html/sflogo.png deleted file mode 100644 index f5c0a256d..000000000 Binary files a/log4tango/doc/html/sflogo.png and /dev/null differ diff --git a/log4tango/doc/mainPage.txt b/log4tango/doc/mainPage.txt deleted file mode 100644 index 62d8eadd6..000000000 --- a/log4tango/doc/mainPage.txt +++ /dev/null @@ -1,4 +0,0 @@ -/** -@mainpage -This is the Doxygen generated API documentation of Log4Tango. -**/ diff --git a/log4tango/include/CMakeLists.txt b/log4tango/include/CMakeLists.txt deleted file mode 100644 index 1f661a3b0..000000000 --- a/log4tango/include/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(log4tango) \ No newline at end of file diff --git a/log4tango/include/Makefile.am b/log4tango/include/Makefile.am deleted file mode 100644 index 0b485b5bc..000000000 --- a/log4tango/include/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = log4tango diff --git a/log4tango/include/Makefile.in b/log4tango/include/Makefile.in deleted file mode 100644 index 7035b4d78..000000000 --- a/log4tango/include/Makefile.in +++ /dev/null @@ -1,599 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = include -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/AC_CREATE_PREFIX_CONFIG_H.m4 \ - $(top_srcdir)/m4/AC_CXX_HAVE_SSTREAM.m4 \ - $(top_srcdir)/m4/AC_CXX_NAMESPACES.m4 \ - $(top_srcdir)/m4/AC_C_INT64_T.m4 \ - $(top_srcdir)/m4/AC_FUNC_SNPRINTF.m4 \ - $(top_srcdir)/m4/BB_CHECK_PTHREADS.m4 \ - $(top_srcdir)/m4/BB_ENABLE_DOXYGEN.m4 \ - $(top_srcdir)/m4/CREATE_GENERIC_CONFIG.m4 \ - $(top_srcdir)/m4/PETI_PEDANTIC_GCC.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_SUNPRO_CC.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GENERIC_CONFIG = @GENERIC_CONFIG@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = log4tango -all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi - -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status include/config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f stamp-h1 - touch $@ - -distclean-hdr: - -rm -f config.h stamp-h1 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile config.h -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-hdr distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/log4tango/include/config.h.in b/log4tango/include/config.h.in deleted file mode 100644 index 267c3b8be..000000000 --- a/log4tango/include/config.h.in +++ /dev/null @@ -1,95 +0,0 @@ -/* include/config.h.in. Generated from configure.in by autoheader. */ - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the `ftime' function. */ -#undef HAVE_FTIME - -/* Define to 1 if you have the `gettimeofday' function. */ -#undef HAVE_GETTIMEOFDAY - -/* define if the compiler has int64_t */ -#undef HAVE_INT64_T - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_IO_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* define if the compiler implements namespaces */ -#undef HAVE_NAMESPACES - -/* define if the C library has snprintf */ -#undef HAVE_SNPRINTF - -/* define if the compiler has stringstream */ -#undef HAVE_SSTREAM - -/* define if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* define if threading is enabled */ -#undef HAVE_THREADING - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* define if pthread library is available */ -#undef USE_PTHREADS - -/* Version number of package */ -#undef VERSION - -/* If we're running on darwin/MacOsX */ -#undef __darwin__ - -/* If we're running on FreeBSD */ -#undef __freebsd__ diff --git a/log4tango/include/log4tango/CMakeLists.txt b/log4tango/include/log4tango/CMakeLists.txt deleted file mode 100644 index 3b32cf48e..000000000 --- a/log4tango/include/log4tango/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -set(HEADER_FILES - Appender.hh - AppenderAttachable.hh - LayoutAppender.hh - FileAppender.hh - RollingFileAppender.hh - OstreamAppender.hh - Layout.hh - PatternLayout.hh - XmlLayout.hh - Logger.hh - LogSeparator.hh - LoggerStream.hh - LogStream.hh - LogStreambuf.hh - LoggingEvent.hh - Level.hh - NDC.hh - TimeStamp.hh - Filter.hh - Export.hh - Portability.hh) - -add_subdirectory(threading) - -install(FILES ${HEADER_FILES} - DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/log4tango) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/log4tango) -#TODO if windows 32 install config-win32.h \ No newline at end of file diff --git a/log4tango/include/log4tango/Makefile.am b/log4tango/include/log4tango/Makefile.am deleted file mode 100644 index 33c1093a2..000000000 --- a/log4tango/include/log4tango/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -SUBDIRS = threading - -liblog4tangoincludedir = $(includedir)/tango/log4tango - -liblog4tangoinclude_HEADERS = \ - Appender.hh \ - AppenderAttachable.hh \ - LayoutAppender.hh \ - FileAppender.hh \ - RollingFileAppender.hh \ - OstreamAppender.hh \ - Layout.hh \ - PatternLayout.hh \ - XmlLayout.hh \ - Logger.hh \ - LogSeparator.hh \ - LoggerStream.hh \ - LogStream.hh \ - LogStreambuf.hh \ - LoggingEvent.hh \ - Level.hh \ - NDC.hh \ - TimeStamp.hh \ - Filter.hh \ - Export.hh \ - Portability.hh \ - config.h \ - config-win32.h - -dist-hook: - rm -f $(distdir)/config.h - -distclean-local: - rm config.h - - diff --git a/log4tango/include/log4tango/Makefile.in b/log4tango/include/log4tango/Makefile.in deleted file mode 100644 index d2533b9bf..000000000 --- a/log4tango/include/log4tango/Makefile.in +++ /dev/null @@ -1,672 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = include/log4tango -DIST_COMMON = $(liblog4tangoinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/AC_CREATE_PREFIX_CONFIG_H.m4 \ - $(top_srcdir)/m4/AC_CXX_HAVE_SSTREAM.m4 \ - $(top_srcdir)/m4/AC_CXX_NAMESPACES.m4 \ - $(top_srcdir)/m4/AC_C_INT64_T.m4 \ - $(top_srcdir)/m4/AC_FUNC_SNPRINTF.m4 \ - $(top_srcdir)/m4/BB_CHECK_PTHREADS.m4 \ - $(top_srcdir)/m4/BB_ENABLE_DOXYGEN.m4 \ - $(top_srcdir)/m4/CREATE_GENERIC_CONFIG.m4 \ - $(top_srcdir)/m4/PETI_PEDANTIC_GCC.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_SUNPRO_CC.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(liblog4tangoincludedir)" -HEADERS = $(liblog4tangoinclude_HEADERS) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GENERIC_CONFIG = @GENERIC_CONFIG@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = threading -liblog4tangoincludedir = $(includedir)/tango/log4tango -liblog4tangoinclude_HEADERS = \ - Appender.hh \ - AppenderAttachable.hh \ - LayoutAppender.hh \ - FileAppender.hh \ - RollingFileAppender.hh \ - OstreamAppender.hh \ - Layout.hh \ - PatternLayout.hh \ - XmlLayout.hh \ - Logger.hh \ - LogSeparator.hh \ - LoggerStream.hh \ - LogStream.hh \ - LogStreambuf.hh \ - LoggingEvent.hh \ - Level.hh \ - NDC.hh \ - TimeStamp.hh \ - Filter.hh \ - Export.hh \ - Portability.hh \ - config.h \ - config-win32.h - -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/log4tango/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/log4tango/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-liblog4tangoincludeHEADERS: $(liblog4tangoinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(liblog4tangoincludedir)" || $(MKDIR_P) "$(DESTDIR)$(liblog4tangoincludedir)" - @list='$(liblog4tangoinclude_HEADERS)'; test -n "$(liblog4tangoincludedir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(liblog4tangoincludedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(liblog4tangoincludedir)" || exit $$?; \ - done - -uninstall-liblog4tangoincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(liblog4tangoinclude_HEADERS)'; test -n "$(liblog4tangoincludedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(liblog4tangoincludedir)'; $(am__uninstall_files_from_dir) - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook -check-am: all-am -check: check-recursive -all-am: Makefile $(HEADERS) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(liblog4tangoincludedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-local \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: install-liblog4tangoincludeHEADERS - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-liblog4tangoincludeHEADERS - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive dist-hook distclean distclean-generic \ - distclean-libtool distclean-local distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am \ - install-liblog4tangoincludeHEADERS install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-liblog4tangoincludeHEADERS - - -dist-hook: - rm -f $(distdir)/config.h - -distclean-local: - rm config.h - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/log4tango/include/log4tango/threading/CMakeLists.txt b/log4tango/include/log4tango/threading/CMakeLists.txt deleted file mode 100644 index 71f3669f2..000000000 --- a/log4tango/include/log4tango/threading/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -set(HEADER_FILES - DummyThreads.hh - PThreads.hh - MSThreads.hh - Threading.hh) - -install(FILES ${HEADER_FILES} - DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/log4tango/threading) \ No newline at end of file diff --git a/log4tango/include/log4tango/threading/Makefile.am b/log4tango/include/log4tango/threading/Makefile.am deleted file mode 100644 index 5e3d850ce..000000000 --- a/log4tango/include/log4tango/threading/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -liblog4tangoincludedir = $(includedir)/tango/log4tango/threading - -liblog4tangoinclude_HEADERS = \ - DummyThreads.hh \ - PThreads.hh \ - MSThreads.hh \ - Threading.hh diff --git a/log4tango/include/log4tango/threading/Makefile.in b/log4tango/include/log4tango/threading/Makefile.in deleted file mode 100644 index 719c79e55..000000000 --- a/log4tango/include/log4tango/threading/Makefile.in +++ /dev/null @@ -1,489 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = include/log4tango/threading -DIST_COMMON = $(liblog4tangoinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/AC_CREATE_PREFIX_CONFIG_H.m4 \ - $(top_srcdir)/m4/AC_CXX_HAVE_SSTREAM.m4 \ - $(top_srcdir)/m4/AC_CXX_NAMESPACES.m4 \ - $(top_srcdir)/m4/AC_C_INT64_T.m4 \ - $(top_srcdir)/m4/AC_FUNC_SNPRINTF.m4 \ - $(top_srcdir)/m4/BB_CHECK_PTHREADS.m4 \ - $(top_srcdir)/m4/BB_ENABLE_DOXYGEN.m4 \ - $(top_srcdir)/m4/CREATE_GENERIC_CONFIG.m4 \ - $(top_srcdir)/m4/PETI_PEDANTIC_GCC.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_SUNPRO_CC.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(liblog4tangoincludedir)" -HEADERS = $(liblog4tangoinclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GENERIC_CONFIG = @GENERIC_CONFIG@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -liblog4tangoincludedir = $(includedir)/tango/log4tango/threading -liblog4tangoinclude_HEADERS = \ - DummyThreads.hh \ - PThreads.hh \ - MSThreads.hh \ - Threading.hh - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/log4tango/threading/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/log4tango/threading/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-liblog4tangoincludeHEADERS: $(liblog4tangoinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(liblog4tangoincludedir)" || $(MKDIR_P) "$(DESTDIR)$(liblog4tangoincludedir)" - @list='$(liblog4tangoinclude_HEADERS)'; test -n "$(liblog4tangoincludedir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(liblog4tangoincludedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(liblog4tangoincludedir)" || exit $$?; \ - done - -uninstall-liblog4tangoincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(liblog4tangoinclude_HEADERS)'; test -n "$(liblog4tangoincludedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(liblog4tangoincludedir)'; $(am__uninstall_files_from_dir) - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(liblog4tangoincludedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-liblog4tangoincludeHEADERS - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-liblog4tangoincludeHEADERS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-liblog4tangoincludeHEADERS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am \ - uninstall-liblog4tangoincludeHEADERS - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/log4tango/include/stamp-h.in b/log4tango/include/stamp-h.in deleted file mode 100644 index 9788f7023..000000000 --- a/log4tango/include/stamp-h.in +++ /dev/null @@ -1 +0,0 @@ -timestamp diff --git a/log4tango/log4tango.m4 b/log4tango/log4tango.m4 deleted file mode 100644 index 8313d7199..000000000 --- a/log4tango/log4tango.m4 +++ /dev/null @@ -1,165 +0,0 @@ -# Configure paths for LOG4TANGO -# Owen Taylor 97-11-3 - -dnl AM_PATH_LOG4TANGO([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for LOG4TANGO, and define LOG4TANGO_CFLAGS and LOG4TANGO_LIBS -dnl -AC_DEFUN(AM_PATH_LOG4TANGO, -[dnl -dnl Get the cflags and libraries from the log4tango-config script -dnl -AC_ARG_WITH(log4tango-prefix,[ --with-log4tango-prefix=PFX Prefix where LOG4TANGO is installed (optional)], - log4tango_config_prefix="$withval", log4tango_config_prefix="") -AC_ARG_WITH(log4tango-exec-prefix,[ --with-log4tango-exec-prefix=PFX Exec prefix where LOG4TANGO is installed (optional)], - log4tango_config_exec_prefix="$withval", log4tango_config_exec_prefix="") -AC_ARG_ENABLE(log4tangotest, [ --disable-log4tangotest Do not try to compile and run a test LOG4TANGO program], - , enable_log4tangotest=yes) - - if test x$log4tango_config_exec_prefix != x ; then - log4tango_config_args="$log4tango_config_args --exec-prefix=$log4tango_config_exec_prefix" - if test x${LOG4TANGO_CONFIG+set} != xset ; then - LOG4TANGO_CONFIG=$log4tango_config_exec_prefix/bin/log4tango-config - fi - fi - if test x$log4tango_config_prefix != x ; then - log4tango_config_args="$log4tango_config_args --prefix=$log4tango_config_prefix" - if test x${LOG4TANGO_CONFIG+set} != xset ; then - LOG4TANGO_CONFIG=$log4tango_config_prefix/bin/log4tango-config - fi - fi - - AC_PATH_PROG(LOG4TANGO_CONFIG, log4tango-config, no) - min_log4tango_version=ifelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for LOG4TANGO - version >= $min_log4tango_version) - no_log4tango="" - if test "$LOG4TANGO_CONFIG" = "no" ; then - no_log4tango=yes - else - LOG4TANGO_CFLAGS=`$LOG4TANGO_CONFIG $log4tango_config_args --cflags` - LOG4TANGO_LIBS=`$LOG4TANGO_CONFIG $log4tango_config_args --libs` - log4tango_config_major_version=`$LOG4TANGO_CONFIG $log4tango_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - log4tango_config_minor_version=`$LOG4TANGO_CONFIG $log4tango_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - log4tango_config_micro_version=`$LOG4TANGO_CONFIG $log4tango_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_log4tangotest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_CXXFLAGS="$CXXFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $LOG4TANGO_CFLAGS" - CXXFLAGS="$CXXFLAGS $LOG4TANGO_CFLAGS" - LIBS="$LOG4TANGO_LIBS $LIBS" -dnl -dnl Now check if the installed LOG4TANGO is sufficiently new. (Also sanity -dnl checks the results of log4tango-config to some extent -dnl - rm -f conf.log4tangotest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int log4tango_major, log4tango_minor, log4tango_micro; - int major, minor, micro; - char *tmp_version; - char *tmp_log4tango_version; - - system ("touch conf.log4tangotest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = strdup("$min_log4tango_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_log4tango_version"); - exit(1); - } - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_log4tango_version = strdup(LOG4TANGO_VERSION); - if (sscanf(tmp_log4tango_version, "%d.%d.%d", &log4tango_major, &log4tango_minor, &log4tango_micro) != 3) { - printf("%s, bad log4tango version string\n", LOG4TANGO_VERSION); - exit(1); - } - - if ((log4tango_major > major) || - ((log4tango_major == major) && (log4tango_minor > minor)) || - ((log4tango_major == major) && (log4tango_minor == minor) && (log4tango_micro >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of LOG4TANGO (%d.%d.%d) was found.\n", - log4tango_major, log4tango_minor, log4tango_micro); - printf("*** You need a version of LOG4TANGO newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the log4tango-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of LOG4TANGO, but you can also set the LOG4TANGO_CONFIG environment to point to the\n"); - printf("*** correct copy of log4tango-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - - log4tango::Category& log = log4tango::Category::getRoot(); - return 1; -} -],, no_log4tango=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_log4tango" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) -if test "$LOG4TANGO_CONFIG" = "no" ; then -echo "*** The log4tango-config script installed by LOG4TANGO could not be found" - echo "*** If LOG4TANGO was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the LOG4TANGO_CONFIG environment variable to the" - echo "*** full path to log4tango-config." - else - if test -f conf.log4tangotest ; then - : - else - echo "*** Could not run LOG4TANGO test program, checking why..." - CFLAGS="$CFLAGS $LOG4TANGO_CFLAGS" - CXXFLAGS="$CXXFLAGS $LOG4TANGO_CFLAGS" - LIBS="$LIBS $LOG4TANGO_LIBS" - AC_TRY_LINK([ -#include -], [ log4tango::Category cat("a_cat"); return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding LOG4TANGO or finding the wrong" - echo "*** version of LOG4TANGO. If it is not finding LOG4TANGO, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means LOG4TANGO was incorrectly installed" - echo "*** or that you have moved LOG4TANGO since it was installed. In the latter case, you" - echo "*** may want to edit the log4tango-config script: $LOG4TANGO_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - LOG4TANGO_CFLAGS="" - LOG4TANGO_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(LOG4TANGO_CFLAGS) - AC_SUBST(LOG4TANGO_LIBS) - rm -f conf.log4tangotest -]) diff --git a/log4tango/log4tango.pc.in b/log4tango/log4tango.pc.in deleted file mode 100644 index c4acacb5e..000000000 --- a/log4tango/log4tango.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: log4tango -Description: Logging library for the tango constrol system -Version: @VERSION@ -Libs: -L${libdir} -llog4tango -Cflags: -I${includedir}/tango diff --git a/log4tango/log4tango.spec.in b/log4tango/log4tango.spec.in deleted file mode 100644 index d25a635cd..000000000 --- a/log4tango/log4tango.spec.in +++ /dev/null @@ -1,90 +0,0 @@ -%define RELEASE 3 -%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE} - -%define lib_name log4tango - -Name: @PACKAGE_TARNAME@ -Version: @PACKAGE_VERSION@ -Release: %rel - -Summary: Log for C++ -Copyright: LGPL -Group: Development/Libraries -Vendor: Bastiaan Bakker -Packager: Cedric Le Goater -Url: http://log4tango.sourceforge.net/ - -Source: ftp://download.sourceforge.net/pub/sourceforge/log4tango/%name-%version.tar.gz - -Prefix: %_prefix -BuildRoot: %_tmppath/%name-%version-root - -%description -Log for C++ is a library of classes for flexible logging to files, syslog, -and other destinations. It is modeled after the Log for Java library and -stays as close to its API as is reasonable. - -%package devel -Summary: development tools for Log for C++ -Group: Development/Libraries -Requires: %name = %version - -%description devel -The %name-devel package contains the static libraries and header files -needed for development with %name. - -%package doc -Summary: HTML formatted API documention for Log for C++ -Group: Development/Libraries -#can't set doc package to noarch without setting the others as well. -#BuildArch: noarch - -%description doc -The %name-doc package contains HTML formatted API documention generated by -the popular doxygen documentation generation tool. - -%prep -rm -rf $RPM_BUILD_ROOT - -%setup -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --enable-doxygen - -%build -make - -%install -rm -rf $RPM_BUILD_ROOT - -make prefix=$RPM_BUILD_ROOT%{prefix} install - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -/sbin/ldconfig - -%post devel -if test "x$RPM_INSTALL_PREFIX0" != "x" ; then - perl -pi -e "s|^libdir='[^\']*'|libdir='$RPM_INSTALL_PREFIX0/lib'|" $RPM_INSTALL_PREFIX0/lib/liblog4tango.la - perl -pi -e "s|^prefix=\"[^\"]*\"|prefix=\"$RPM_INSTALL_PREFIX0\"|" $RPM_INSTALL_PREFIX0/bin/log4tango-config -fi - -%postun -/sbin/ldconfig - -%files -%defattr(-,root,root,755) -%attr(755,root,root) %prefix/lib/lib*.so.* -%doc AUTHORS COPYING INSTALL NEWS README THANKS ChangeLog - -%files devel -%defattr(-,root,root,755) -%prefix/include/* -%prefix/man/* -%attr(755,root,root) %prefix/bin/log4tango-config -%attr(755,root,root) %prefix/lib/lib*.so -%attr(644,root,root) %prefix/lib/*.*a - -%files doc -%doc %prefix/doc/* - diff --git a/log4tango/m4/AC_CREATE_PREFIX_CONFIG_H.m4 b/log4tango/m4/AC_CREATE_PREFIX_CONFIG_H.m4 deleted file mode 100755 index 55b8bcff3..000000000 --- a/log4tango/m4/AC_CREATE_PREFIX_CONFIG_H.m4 +++ /dev/null @@ -1,107 +0,0 @@ -dnl @synopsis AC_CREATE_PREFIX_CONFIG_H [(OUTPUT-HEADER [,PREFIX [,ORIG-HEADER]])] -dnl -dnl this is a new variant from ac_prefix_config_ -dnl this one will use a lowercase-prefix if -dnl the config-define was starting with a lowercase-char, e.g. -dnl #define const or #define restrict or #define off_t -dnl (and this one can live in another directory, e.g. testpkg/config.h -dnl therefore I decided to move the output-header to be the first arg) -dnl -dnl takes the usual config.h generated header file; looks for each of -dnl the generated "#define SOMEDEF" lines, and prefixes the defined name -dnl (ie. makes it "#define PREFIX_SOMEDEF". The result is written to -dnl the output config.header file. The PREFIX is converted to uppercase -dnl for the conversions. -dnl -dnl default OUTPUT-HEADER = $PACKAGE-config.h -dnl default PREFIX = $PACKAGE -dnl default ORIG-HEADER, derived from OUTPUT-HEADER -dnl if OUTPUT-HEADER has a "/", use the basename -dnl if OUTPUT-HEADER has a "-", use the section after it. -dnl otherwise, just config.h -dnl -dnl In most cases, the configure.in will contain a line saying -dnl AC_CONFIG_HEADER(config.h) -dnl somewhere *before* AC_OUTPUT and a simple line saying -dnl AC_PREFIX_CONFIG_HEADER -dnl somewhere *after* AC_OUTPUT. -dnl -dnl example: -dnl AC_INIT(config.h.in) # config.h.in as created by "autoheader" -dnl AM_INIT_AUTOMAKE(testpkg, 0.1.1) # "#undef VERSION" and "PACKAGE" -dnl AM_CONFIG_HEADER(config.h) # in config.h.in -dnl AC_MEMORY_H # "#undef NEED_MEMORY_H" -dnl AC_C_CONST_H # "#undef const" -dnl AC_OUTPUT(Makefile) # creates the "config.h" now -dnl AC_CREATE_PREFIX_CONFIG_H # creates "testpkg-config.h" -dnl and the resulting "testpkg-config.h" contains lines like -dnl #ifndef TESTPKG_VERSION -dnl #define TESTPKG_VERSION "0.1.1" -dnl #endif -dnl #ifndef TESTPKG_NEED_MEMORY_H -dnl #define TESTPKG_NEED_MEMORY_H 1 -dnl #endif -dnl #ifndef _testpkg_const -dnl #define _testpkg_const const -dnl #endif -dnl -dnl and this "testpkg-config.h" can be installed along with other -dnl header-files, which is most convenient when creating a shared -dnl library (that has some headers) where some functionality is -dnl dependent on the OS-features detected at compile-time. No -dnl need to invent some "testpkg-confdefs.h.in" manually. :-) -dnl -dnl @version $Id$ -dnl @author Guido Draheim - -AC_DEFUN([AC_CREATE_PREFIX_CONFIG_H], -[changequote({, })dnl -ac_prefix_conf_OUT=`echo ifelse($1, , ${PACKAGE_TARNAME}-config.h, $1)` -ac_prefix_conf_DEF=`echo _$ac_prefix_conf_OUT | sed -e 'y:abcdefghijklmnopqrstuvwxyz./,-:ABCDEFGHIJKLMNOPQRSTUVWXYZ____:'` -ac_prefix_conf_PKG=`echo ifelse($2, , ${PACKAGE_TARNAME}, $2)` -ac_prefix_conf_LOW=`echo _$ac_prefix_conf_PKG | sed -e 'y:ABCDEFGHIJKLMNOPQRSTUVWXYZ-:abcdefghijklmnopqrstuvwxyz_:'` -ac_prefix_conf_UPP=`echo $ac_prefix_conf_PKG | sed -e 'y:abcdefghijklmnopqrstuvwxyz-:ABCDEFGHIJKLMNOPQRSTUVWXYZ_:' -e '/^[0-9]/s/^/_/'` -ac_prefix_conf_INP=`echo ifelse($3, , _, $3)` -if test "$ac_prefix_conf_INP" = "_"; then - case $ac_prefix_conf_OUT in - */*) ac_prefix_conf_INP=`basename $ac_prefix_conf_OUT` - ;; - *-*) ac_prefix_conf_INP=`echo $ac_prefix_conf_OUT | sed -e 's/[a-zA-Z0-9_]*-//'` - ;; - *) ac_prefix_conf_INP=config.h - ;; - esac -fi -changequote([, ])dnl -if test -z "$ac_prefix_conf_PKG" ; then - AC_MSG_ERROR([no prefix for _PREFIX_PKG_CONFIG_H]) -else - AC_MSG_RESULT(creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines) - if test -f $ac_prefix_conf_INP ; then - AS_DIRNAME([/* automatically generated */], $ac_prefix_conf_OUT) -changequote({, })dnl - echo '#ifndef '$ac_prefix_conf_DEF >$ac_prefix_conf_OUT - echo '#define '$ac_prefix_conf_DEF' 1' >>$ac_prefix_conf_OUT - echo ' ' >>$ac_prefix_conf_OUT - echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$ac_prefix_conf_OUT - - echo 's/#undef *\([A-Z_]\)/#undef '$ac_prefix_conf_UPP'_\1/' >conftest.sed - echo 's/#undef *\([a-z]\)/#undef '$ac_prefix_conf_LOW'_\1/' >>conftest.sed - echo 's/#define *\([A-Z_][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_UPP"_\\1 \\" >>conftest.sed - echo '#define '$ac_prefix_conf_UPP"_\\1 \\2 \\" >>conftest.sed - echo '#endif/' >>conftest.sed - echo 's/#define *\([a-z][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_LOW"_\\1 \\" >>conftest.sed - echo '#define '$ac_prefix_conf_LOW"_\\1 \\2 \\" >>conftest.sed - echo '#endif/' >>conftest.sed - sed -f conftest.sed $ac_prefix_conf_INP >>$ac_prefix_conf_OUT - echo ' ' >>$ac_prefix_conf_OUT - echo '/*' $ac_prefix_conf_DEF '*/' >>$ac_prefix_conf_OUT - echo '#endif' >>$ac_prefix_conf_OUT -changequote([, ])dnl - else - AC_MSG_ERROR([input file $ac_prefix_conf_IN does not exist, dnl - skip generating $ac_prefix_conf_OUT]) - fi - rm -f conftest.* -fi]) - diff --git a/log4tango/m4/AC_CXX_HAVE_SSTREAM.m4 b/log4tango/m4/AC_CXX_HAVE_SSTREAM.m4 deleted file mode 100755 index 4bfe9e947..000000000 --- a/log4tango/m4/AC_CXX_HAVE_SSTREAM.m4 +++ /dev/null @@ -1,23 +0,0 @@ -dnl @synopsis AC_CXX_HAVE_SSTREAM -dnl -dnl If the C++ library has a working stringstream, define HAVE_SSTREAM. -dnl -dnl @author Ben Stanley -dnl @version $Id$ -dnl -AC_DEFUN([AC_CXX_HAVE_SSTREAM], -[AC_CACHE_CHECK(whether the compiler has stringstream, -ac_cv_cxx_have_sstream, -[AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_PUSH(C++) - AC_TRY_COMPILE([#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif],[stringstream message; message << "Hello"; return 0;], - ac_cv_cxx_have_sstream=yes, ac_cv_cxx_have_sstream=no) - AC_LANG_POP(C++) -]) -if test "$ac_cv_cxx_have_sstream" = yes; then - AC_DEFINE(HAVE_SSTREAM,,[define if the compiler has stringstream]) -fi -]) diff --git a/log4tango/m4/AC_CXX_NAMESPACES.m4 b/log4tango/m4/AC_CXX_NAMESPACES.m4 deleted file mode 100755 index f2f60be5c..000000000 --- a/log4tango/m4/AC_CXX_NAMESPACES.m4 +++ /dev/null @@ -1,21 +0,0 @@ -dnl @synopsis AC_CXX_NAMESPACES -dnl -dnl If the compiler can prevent names clashes using namespaces, define -dnl HAVE_NAMESPACES. -dnl -dnl @version $Id$ -dnl @author Luc Maisonobe -dnl -AC_DEFUN([AC_CXX_NAMESPACES], -[AC_CACHE_CHECK(whether the compiler implements namespaces, -ac_cv_cxx_namespaces, -[AC_LANG_PUSH(C++) - AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}], - [using namespace Outer::Inner; return i;], - ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no) - AC_LANG_POP(C++) -]) -if test "$ac_cv_cxx_namespaces" = yes; then - AC_DEFINE(HAVE_NAMESPACES,,[define if the compiler implements namespaces]) -fi -]) diff --git a/log4tango/m4/AC_C_INT64_T.m4 b/log4tango/m4/AC_C_INT64_T.m4 deleted file mode 100755 index ae4fbb07f..000000000 --- a/log4tango/m4/AC_C_INT64_T.m4 +++ /dev/null @@ -1,19 +0,0 @@ -dnl @synopsis AC_C_INT64_T -dnl -dnl Provides a test for the existance of the int64_t type and -dnl defines HAVE_INT64_T if it is found. Adapted from AC_C_LONG_LONG by -dnl Caolan McNamara -dnl -dnl @version $Id$ -dnl @author Bastiaan Bakker -dnl -AC_DEFUN([AC_C_INT64_T], -[AC_CACHE_CHECK(for int64_t, ac_cv_c_int64_t, -[AC_TRY_COMPILE([#include ],[int64_t i;], ac_cv_c_int64_t=yes, ac_cv_c_int64_t=no) -]) -if test $ac_cv_c_int64_t = yes; then - AC_DEFINE(HAVE_INT64_T,,[define if the compiler has int64_t]) - AC_DEFINE(HAVE_STDINT_H,,[define if you have the header file.]) -fi -]) - diff --git a/log4tango/m4/AC_FUNC_SNPRINTF.m4 b/log4tango/m4/AC_FUNC_SNPRINTF.m4 deleted file mode 100755 index 08af5218e..000000000 --- a/log4tango/m4/AC_FUNC_SNPRINTF.m4 +++ /dev/null @@ -1,22 +0,0 @@ -dnl @synopsis AC_FUNC_SNPRINTF -dnl -dnl Provides a test for a working snprintf function. -dnl unlike the original AC_FUNC_SNPRINTF test this one will also -dnl accept snprintf implementations which return -1 if the string does -dnl not fit in the buffer, e.g. snprintf on Solaris and glibc <= 2.0.6. -dnl defines HAVE_SNPRINTF if it is found, and -dnl sets ac_cv_func_snprintf to yes, otherwise to no. -dnl -dnl @version $Id$ -dnl @author Caolan McNamara -dnl -AC_DEFUN([AC_FUNC_SNPRINTF], -[AC_CACHE_CHECK(for working snprintf, ac_cv_func_snprintf, -[AC_TRY_RUN([#include -int main () { int l = snprintf(NULL,0,"%d",100); exit (!((3 <= l) || (-1 == l))); } -], ac_cv_func_snprintf=yes, ac_cv_func_snprintf=no, -ac_cv_func_snprintf=no)]) -if test $ac_cv_func_snprintf = yes; then - AC_DEFINE(HAVE_SNPRINTF,,[define if the C library has snprintf]) -fi -]) diff --git a/log4tango/m4/BB_CHECK_PTHREADS.m4 b/log4tango/m4/BB_CHECK_PTHREADS.m4 deleted file mode 100755 index 7babec737..000000000 --- a/log4tango/m4/BB_CHECK_PTHREADS.m4 +++ /dev/null @@ -1,26 +0,0 @@ -AC_DEFUN([BB_CHECK_PTHREADS], -[AC_SEARCH_LIBS(pthread_key_create,pthread, - [AC_DEFINE(HAVE_THREADING,,[define if threading is enabled]) - AC_DEFINE(USE_PTHREADS,,[define if pthread library is available]) - case $host_os in - linux*) - CFLAGS="$CFLAGS -D_REENTRANT" - CXXFLAGS="$CXXFLAGS -D_REENTRANT" - ;; - solaris*) - if test x$GCC = x ; - then - CFLAGS="$CFLAGS -mt -D_POSIX_PTHREAD_SEMANTICS" - CXXFLAGS="$CXXFLAGS -mt -D_POSIX_PTHREAD_SEMANTICS" - else - CFLAGS="$CFLAGS -D_REENTRANT" - CXXFLAGS="$CXXFLAGS -D_REENTRANT" - fi - ;; - hpux*) - CFLAGS="$CFLAGS -AA -mt +inst_close" - CXXFLAGS="$CXXFLAGS -AA -mt +inst_close" - ;; - esac], -AC_MSG_ERROR([pthreads not found])) -]) diff --git a/log4tango/m4/BB_ENABLE_DOXYGEN.m4 b/log4tango/m4/BB_ENABLE_DOXYGEN.m4 deleted file mode 100755 index 66856dcd7..000000000 --- a/log4tango/m4/BB_ENABLE_DOXYGEN.m4 +++ /dev/null @@ -1,34 +0,0 @@ -AC_DEFUN([BB_ENABLE_DOXYGEN], -[ -AC_ARG_ENABLE(doxygen, [ --enable-doxygen enable documentation generation with doxygen (auto)]) -AC_ARG_ENABLE(dot, [ --enable-dot use 'dot' to generate graphs in doxygen (auto)]) -AC_ARG_ENABLE(html-docs, [ --enable-html-docs enable HTML generation with doxygen (yes)], [], [ enable_html_docs=yes]) -AC_ARG_ENABLE(latex-docs, [ --enable-latex-docs enable LaTeX documentation generation with doxygen (no)], [], [ enable_latex_docs=no]) -if test "x$enable_doxygen" = xno; then - enable_doc=no -else - AC_PATH_PROG(DOXYGEN, doxygen, , $PATH) - if test x$DOXYGEN = x; then - if test "x$enable_doxygen" = xyes; then - AC_MSG_ERROR([could not find doxygen]) - fi - enable_doc=no - else - enable_doc=yes - AC_PATH_PROG(DOT, dot, , $PATH) - fi -fi -AM_CONDITIONAL(DOC, test x$enable_doc = xyes) - -if test x$DOT = x; then - if test "x$enable_dot" = xyes; then - AC_MSG_ERROR([could not find dot]) - fi - enable_dot=no -else - enable_dot=yes -fi -AC_SUBST(enable_dot) -AC_SUBST(enable_html_docs) -AC_SUBST(enable_latex_docs) -]) diff --git a/log4tango/m4/CREATE_GENERIC_CONFIG.m4 b/log4tango/m4/CREATE_GENERIC_CONFIG.m4 deleted file mode 100755 index 63455afb5..000000000 --- a/log4tango/m4/CREATE_GENERIC_CONFIG.m4 +++ /dev/null @@ -1,164 +0,0 @@ -dnl @synopsis AC_CREATE_GENERIC_CONFIG [(PACKAGEnlibs [, VERSION])] -dnl -dnl Creates a generic PACKAGE-config file that has all the -dnl things that you want, hmm, well, atleast it has -dnl --cflags, --version, --libs. Ahhm, did you see ac_path_generic -dnl in the autoconf-archive? ;-) -dnl -dnl this macros saves you all the typing for a pkg-config.in script, -dnl you don't even need to distribute one along. Place this macro -dnl in your configure.ac, et voila, you got one that you want to install. -dnl -dnl oh, btw, if the first arg looks like "mylib -lwhat' then it -dnl will go to be added to the --libs, and mylib is extracted. -dnl -dnl the defaults: $1 = $PACKAGE_TARNAME $LIBS $2 = $VERSION -dnl there is also an AC_SUBST(GENERIC_CONFIG) that will be set to -dnl the name of the file that we did output in this macro. Use as: -dnl -dnl install-exec-local: install-generic-config -dnl install-generic-config: -dnl $(mkinstalldirs) $(DESTDIR)$(bindir) -dnl $(INSTALL_SCRIPT) @GENERIC_CONFIG@ $(DESTDIR)$(bindir) -dnl -dnl @version $Id$ -dnl @author Guido Draheim - -AC_DEFUN([AC_CREATE_GENERIC_CONFIG],[# create a generic PACKAGE-config file -L=`echo ifelse($1, , $PACKAGE_TARNAME $LIBS, $1)` -P=`echo $L | sed -e 's/ -.*//'` -P=`echo $P` -V=`echo ifelse($1, , $VERSION, $1)` -F=`echo $P-config` -AC_MSG_RESULT(creating $F - generic $V of $L) -test "x$prefix" = xNONE && prefix="$ac_default_prefix" -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -echo '#! /bin/sh' >$F -echo ' ' >>$F -echo 'package="'$P'"' >>$F -echo 'version="'$V'"' >>$F -echo 'libs="'$L'"' >>$F -echo ' ' >>$F -# in the order of occurence a standard automake Makefile -echo 'prefix="'$prefix'"' >>$F -echo 'exec_prefix="'$exec_prefix'"' >>$F -echo 'bindir="'$bindir'"' >>$F -echo 'sbindir="'$sbindir'"' >>$F -echo 'libexecdir="'$libexecdir'"' >>$F -echo 'datadir="'$datadir'"' >>$F -echo 'sysconfdir="'$sysconfdir'"' >>$F -echo 'sharedstatedir="'$sharedstatedir'"' >>$F -echo 'localstatedir="'$localstatedir'"' >>$F -echo 'libdir="'$libdir'"' >>$F -echo 'infodir="'$infodir'"' >>$F -echo 'mandir="'$mandir'"' >>$F -echo 'includedir="'$includedir'"' >>$F -echo 'target="'$target'"' >>$F -echo 'host="'$host'"' >>$F -echo 'build="'$build'"' >>$F -echo ' ' >>$F -echo 'if test "'"\$""#"'" -eq 0; then' >>$F -echo ' cat <>$F -echo 'Usage: $package-config [OPTIONS]' >>$F -echo 'Options:' >>$F -echo ' --prefix[=DIR]) : \$prefix' >>$F -echo ' --package) : \$package' >>$F -echo ' --version) : \$version' >>$F -echo ' --cflags) : -I\$includedir' >>$F -echo ' --libs) : -L\$libdir -l\$package' >>$F -echo ' --help) print all the options (not just these)' >>$F -echo 'EOF' >>$F -echo 'fi' >>$F -echo ' ' >>$F -echo 'o=""' >>$F -echo 'h=""' >>$F -echo 'for i in '"\$""*"' ; do' >>$F -echo ' case $i in' >>$F -echo ' --prefix=*) prefix=`echo $i | sed -e "s/--prefix=//"` ;;' >>$F -echo ' --prefix) o="$o $prefix" ;;' >>$F -echo ' --package) o="$o $package" ;;' >>$F -echo ' --version) o="$o $version" ;;' >>$F -echo ' --cflags) if test "_$includedir" != "_/usr/include"' >>$F -echo ' then o="$o -I$includedir" ; fi' >>$F -echo ' ;;' >>$F -echo ' --libs) o="$o -L$libdir -l$libs" ;;' >>$F -echo ' --exec_prefix|--eprefix) o="$o $exec_prefix" ;;' >>$F -echo ' --bindir) o="$o $bindir" ;;' >>$F -echo ' --sbindir) o="$o $sbindir" ;;' >>$F -echo ' --libexecdir) o="$o $libexecdir" ;;' >>$F -echo ' --datadir) o="$o $datadir" ;;' >>$F -echo ' --datainc) o="$o -I$datadir" ;;' >>$F -echo ' --datalib) o="$o -L$datadir" ;;' >>$F -echo ' --sysconfdir) o="$o $sysconfdir" ;;' >>$F -echo ' --sharedstatedir) o="$o $sharedstatedir" ;;' >>$F -echo ' --localstatedir) o="$o $localstatedir" ;;' >>$F -echo ' --libdir) o="$o $libdir" ;;' >>$F -echo ' --libadd) o="$o -L$libdir" ;;' >>$F -echo ' --infodir) o="$o $infodir" ;;' >>$F -echo ' --mandir) o="$o $mandir" ;;' >>$F -echo ' --target) o="$o $target" ;;' >>$F -echo ' --host) o="$o $host" ;;' >>$F -echo ' --build) o="$o $build" ;;' >>$F -echo ' --data) o="$o -I$datadir/$package" ;;' >>$F -echo ' --pkgdatadir) o="$o $datadir/$package" ;;' >>$F -echo ' --pkgdatainc) o="$o -I$datadir/$package" ;;' >>$F -echo ' --pkgdatalib) o="$o -L$datadir/$package" ;;' >>$F -echo ' --pkglibdir) o="$o $libdir/$package" ;;' >>$F -echo ' --pkglibinc) o="$o -I$libinc/$package" ;;' >>$F -echo ' --pkglibadd) o="$o -L$libadd/$package" ;;' >>$F -echo ' --pkgincludedir) o="$o $includedir/$package" ;;' >>$F -echo ' --help) h="1" ;;' >>$F -echo ' -?//*|-?/*//*|-?./*//*|//*|/*//*|./*//*) ' >>$F -echo ' v=`echo $i | sed -e s://:\$:g`' >>$F -echo ' v=`eval "echo $v"` ' >>$F -echo ' o="$o $v" ;; ' >>$F -echo ' esac' >>$F -echo 'done' >>$F -echo ' ' >>$F -echo 'o=`eval "echo $o"`' >>$F -echo 'o=`eval "echo $o"`' >>$F -echo 'eval "echo $o"' >>$F -echo ' ' >>$F -echo 'if test ! -z "$h" ; then ' >>$F -echo 'cat <>$F -echo ' --prefix=xxx) (what is that for anyway?)' >>$F -echo ' --prefix) \$prefix $prefix' >>$F -echo ' --package) \$package $package' >>$F -echo ' --version) \$version $version' >>$F -echo ' --cflags) -I\$includedir unless it is /usr/include' >>$F -echo ' --libs) -L\$libdir -l\$PACKAGE_TARNAME \$LIBS' >>$F -echo ' --exec_prefix) or... ' >>$F -echo ' --eprefix) \$exec_prefix $exec_prefix' >>$F -echo ' --bindir) \$bindir $bindir' >>$F -echo ' --sbindir) \$sbindir $sbindir' >>$F -echo ' --libexecdir) \$libexecdir $libexecdir' >>$F -echo ' --datadir) \$datadir $datadir' >>$F -echo ' --sysconfdir) \$sysconfdir $sysconfdir' >>$F -echo ' --sharedstatedir) \$sharedstatedir$sharedstatedir' >>$F -echo ' --localstatedir) \$localstatedir $localstatedir' >>$F -echo ' --libdir) \$libdir $libdir' >>$F -echo ' --infodir) \$infodir $infodir' >>$F -echo ' --mandir) \$mandir $mandir' >>$F -echo ' --target) \$target $target' >>$F -echo ' --host) \$host $host' >>$F -echo ' --build) \$build $build' >>$F -echo ' --data) -I\$datadir/\$package' >>$F -echo ' --pkgdatadir) \$datadir/\$package' >>$F -echo ' --pkglibdir) \$libdir/\$package' >>$F -echo ' --pkgincludedir) \$includedir/\$package' >>$F -echo ' --help) generated by ac_create_generic_config.m4' >>$F -echo ' -I//varname and other inc-targets like --pkgdatainc supported' >>$F -echo ' -L//varname and other lib-targets, e.g. --pkgdatalib or --libadd' >>$F -echo 'EOF' >>$F -echo 'fi' >>$F -GENERIC_CONFIG="$F" -AC_SUBST(GENERIC_CONFIG) -]) - - - - - - - - diff --git a/log4tango/m4/PETI_PEDANTIC_GCC.m4 b/log4tango/m4/PETI_PEDANTIC_GCC.m4 deleted file mode 100755 index 39f65648e..000000000 --- a/log4tango/m4/PETI_PEDANTIC_GCC.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl @synopsis PETI_PEDANTIC_GCC -dnl -dnl For development purposes, it is desirable to have autoconf -dnl automatically enable warnings when compiling C or C++ sources. In -dnl case the underlying compiler is a gcc, the appropriate flags are -dnl "-Wall -pedantic". This macro will add them to $CFLAGS and -dnl $CXXFLAGS if $CC is found to be a gcc. -dnl -dnl @author Peter Simons -dnl original version: peti_pedantic_gcc.m4,v 1.4 2000/12/31 10:18:09 simons -dnl @version $Id$ - -AC_DEFUN([PETI_PEDANTIC_GCC], - [ - if test "$GCC" = yes; then - if test "$host" = x86-pc-nto-qnx; then - CFLAGS="$CXXFLAGS -Wno-unused -O0" - CXXFLAGS="$CXXFLAGS -Wno-unused -DLOG4TANGO_MISSING_INT64_OSTREAM_OP -O0" - else - case `$CXX --version` in - *2.97*) CFLAGS="$CFLAGS -Wall -Wno-unused -pedantic -D_ISOC99_SOURCE" - CXXFLAGS="$CXXFLAGS -Wall -Wno-unused -pedantic -D_ISOC99_SOURCE" - ;; - *2.96*) CFLAGS="$CFLAGS -Wall -Wno-unused" - CXXFLAGS="$CXXFLAGS -Wall -Wno-unused" - ;; - *) CFLAGS="$CFLAGS -Wall -Wno-unused -pedantic" - CXXFLAGS="$CXXFLAGS -Wall -Wno-unused -pedantic" - ;; - esac - fi - fi - ]) diff --git a/log4tango/m4/RSSH_CHECK_SUNPRO_CC.m4 b/log4tango/m4/RSSH_CHECK_SUNPRO_CC.m4 deleted file mode 100755 index d98ff9c6f..000000000 --- a/log4tango/m4/RSSH_CHECK_SUNPRO_CC.m4 +++ /dev/null @@ -1,33 +0,0 @@ -# RSSH_CHECK_SUNPROC_CC([ACTION-IF-YES], [ACTION-IF-NOT]) -# ------------------------------------------------------ -# check : are we using SUN workshop C++ compiler. -# Corresponding cache value: rssh_cv_check_sunpro_cc is set to yes or no -# -#@author Ruslan Shevchenko , 1998, 2000 -#@version $Id$ -# -# RSSH_CHECK_SUNPRO_CC([ACTION-IF-YES],[ACTION-IF-NOT]) -# -AC_DEFUN([RSSH_CHECK_SUNPRO_CC], -[AC_CACHE_CHECK([whether using Sun Worckshop C++ compiler], - [rssh_cv_check_sunpro_cc], - -[AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([], -[#ifndef __SUNPRO_CC -# include "error: this is not Sun Workshop." -#endif -], - rssh_cv_check_sunpro_cc=yes, - rssh_cv_check_sunpro_cc=no) -AC_LANG_RESTORE]) -if test ${rssh_cv_check_sunpro_cc} = yes -then - $2 - : -else - $3 - : -fi -])# RSSH_CHECK_SUNPROC_CC diff --git a/log4tango/m4/libtool.m4 b/log4tango/m4/libtool.m4 deleted file mode 100644 index 828104cfd..000000000 --- a/log4tango/m4/libtool.m4 +++ /dev/null @@ -1,8001 +0,0 @@ -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY 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 GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -]) - -# serial 57 LT_INIT - - -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun([LT_PREREQ], -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, - [m4_default([$3], - [m4_fatal([Libtool version $1 or higher is required], - 63)])], - [$2])]) - - -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun([_LT_CHECK_BUILDDIR], -[case `pwd` in - *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -esac -]) - - -# LT_INIT([OPTIONS]) -# ------------------ -AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -AC_BEFORE([$0], [LT_LANG])dnl -AC_BEFORE([$0], [LT_OUTPUT])dnl -AC_BEFORE([$0], [LTDL_INIT])dnl -m4_require([_LT_CHECK_BUILDDIR])dnl - -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE([LTOPTIONS_VERSION])dnl -AC_REQUIRE([LTSUGAR_VERSION])dnl -AC_REQUIRE([LTVERSION_VERSION])dnl -AC_REQUIRE([LTOBSOLETE_VERSION])dnl -m4_require([_LT_PROG_LTMAIN])dnl - -_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) - -dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -_LT_SETUP - -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT - -# Old names: -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -]) - - -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -m4_defun([_LT_FILEUTILS_DEFAULTS], -[: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -])# _LT_FILEUTILS_DEFAULTS - - -# _LT_SETUP -# --------- -m4_defun([_LT_SETUP], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl - -_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl -dnl -_LT_DECL([], [host_alias], [0], [The host system])dnl -_LT_DECL([], [host], [0])dnl -_LT_DECL([], [host_os], [0])dnl -dnl -_LT_DECL([], [build_alias], [0], [The build system])dnl -_LT_DECL([], [build], [0])dnl -_LT_DECL([], [build_os], [0])dnl -dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -dnl -AC_REQUIRE([LT_CMD_MAX_LEN])dnl -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl -m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl -m4_require([_LT_CMD_OLD_ARCHIVE])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_WITH_SYSROOT])dnl - -_LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi -]) -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -_LT_CHECK_OBJDIR - -m4_require([_LT_TAG_COMPILER])dnl - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -_LT_CC_BASENAME([$compiler]) - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - _LT_PATH_MAGIC - fi - ;; -esac - -# Use C for the default configuration in the libtool script -LT_SUPPORTED_TAG([CC]) -_LT_LANG_C_CONFIG -_LT_LANG_DEFAULT_CONFIG -_LT_CONFIG_COMMANDS -])# _LT_SETUP - - -# _LT_PREPARE_SED_QUOTE_VARS -# -------------------------- -# Define a few sed substitution that help us do robust quoting. -m4_defun([_LT_PREPARE_SED_QUOTE_VARS], -[# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' -]) - -# _LT_PROG_LTMAIN -# --------------- -# Note that this code is called both from `configure', and `config.status' -# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, -# so we pass a copy along to make sure it has a sensible value anyway. -m4_defun([_LT_PROG_LTMAIN], -[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" -])# _LT_PROG_LTMAIN - - -## ------------------------------------- ## -## Accumulate code for creating libtool. ## -## ------------------------------------- ## - -# So that we can recreate a full libtool script including additional -# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' -# label. - - -# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -# ---------------------------------------- -# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL_INIT], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_INIT], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) - - -# _LT_CONFIG_LIBTOOL([COMMANDS]) -# ------------------------------ -# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) - - -# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -# ----------------------------------------------------- -m4_defun([_LT_CONFIG_SAVE_COMMANDS], -[_LT_CONFIG_LIBTOOL([$1]) -_LT_CONFIG_LIBTOOL_INIT([$2]) -]) - - -# _LT_FORMAT_COMMENT([COMMENT]) -# ----------------------------- -# Add leading comment marks to the start of each line, and a trailing -# full-stop to the whole comment if one is not present already. -m4_define([_LT_FORMAT_COMMENT], -[m4_ifval([$1], [ -m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], - [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -)]) - - - -## ------------------------ ## -## FIXME: Eliminate VARNAME ## -## ------------------------ ## - - -# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -# ------------------------------------------------------------------- -# CONFIGNAME is the name given to the value in the libtool script. -# VARNAME is the (base) name used in the configure script. -# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -# VARNAME. Any other value will be used directly. -m4_define([_LT_DECL], -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], - [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], - [m4_ifval([$1], [$1], [$2])]) - lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) - m4_ifval([$4], - [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) - lt_dict_add_subkey([lt_decl_dict], [$2], - [tagged?], [m4_ifval([$5], [yes], [no])])]) -]) - - -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -# -------------------------------------------------------- -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - - -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_tag_varnames], -[_lt_decl_filter([tagged?], [yes], $@)]) - - -# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -# --------------------------------------------------------- -m4_define([_lt_decl_filter], -[m4_case([$#], - [0], [m4_fatal([$0: too few arguments: $#])], - [1], [m4_fatal([$0: too few arguments: $#: $1])], - [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], - [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], - [lt_dict_filter([lt_decl_dict], $@)])[]dnl -]) - - -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -# -------------------------------------------------- -m4_define([lt_decl_quote_varnames], -[_lt_decl_filter([value], [1], $@)]) - - -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_dquote_varnames], -[_lt_decl_filter([value], [2], $@)]) - - -# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_varnames_tagged], -[m4_assert([$# <= 2])dnl -_$0(m4_quote(m4_default([$1], [[, ]])), - m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), - m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -m4_define([_lt_decl_varnames_tagged], -[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) - - -# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_all_varnames], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_if([$2], [], - m4_quote(lt_decl_varnames), - m4_quote(m4_shift($@))))[]dnl -]) -m4_define([_lt_decl_all_varnames], -[lt_join($@, lt_decl_varnames_tagged([$1], - lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -]) - - -# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -# ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME -# must have a single quote delimited value for this to work. -m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) - - -# _LT_CONFIG_STATUS_DECLARATIONS -# ------------------------------ -# We delimit libtool config variables with single quotes, so when -# we write them to config.status, we have to be sure to quote all -# embedded single quotes properly. In configure, this macro expands -# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -# -# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' -m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAGS -# ---------------- -# Output comment and list of tags supported by the script -m4_defun([_LT_LIBTOOL_TAGS], -[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl -]) - - -# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -# ----------------------------------- -# Extract the dictionary values for VARNAME (optionally with TAG) and -# expand to a commented shell variable setting: -# -# # Some comment about what VAR is for. -# visible_name=$lt_internal_name -m4_define([_LT_LIBTOOL_DECLARE], -[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], - [description])))[]dnl -m4_pushdef([_libtool_name], - m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), - [0], [_libtool_name=[$]$1], - [1], [_libtool_name=$lt_[]$1], - [2], [_libtool_name=$lt_[]$1], - [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -]) - - -# _LT_LIBTOOL_CONFIG_VARS -# ----------------------- -# Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -# section) are produced by _LT_LIBTOOL_TAG_VARS. -m4_defun([_LT_LIBTOOL_CONFIG_VARS], -[m4_foreach([_lt_var], - m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAG_VARS(TAG) -# ------------------------- -m4_define([_LT_LIBTOOL_TAG_VARS], -[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) - - -# _LT_TAGVAR(VARNAME, [TAGNAME]) -# ------------------------------ -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) - - -# _LT_CONFIG_COMMANDS -# ------------------- -# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -# variables for single and double quote escaping we saved from calls -# to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated -# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -m4_defun([_LT_CONFIG_COMMANDS], -[AC_PROVIDE_IFELSE([LT_OUTPUT], - dnl If the libtool generation code has been placed in $CONFIG_LT, - dnl instead of duplicating it all over again into config.status, - dnl then we will have config.status run $CONFIG_LT later, so it - dnl needs to know what name is stored there: - [AC_CONFIG_COMMANDS([libtool], - [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], - dnl If the libtool generation code is destined for config.status, - dnl expand the accumulated commands and init code now: - [AC_CONFIG_COMMANDS([libtool], - [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -])#_LT_CONFIG_COMMANDS - - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -[ - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -_LT_CONFIG_STATUS_DECLARATIONS -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$[]1 -_LTECHO_EOF' -} - -# Quote evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -_LT_OUTPUT_LIBTOOL_INIT -]) - -# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) -# ------------------------------------ -# Generate a child script FILE with all initialization necessary to -# reuse the environment learned by the parent script, and make the -# file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this -# macro, additional text can be appended to FILE to form the body of -# the child script. The macro ends with non-zero status if the -# file could not be fully written (such as if the disk is full). -m4_ifdef([AS_INIT_GENERATED], -[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], -[m4_defun([_LT_GENERATED_FILE_INIT], -[m4_require([AS_PREPARE])]dnl -[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl -[lt_write_fail=0 -cat >$1 <<_ASEOF || lt_write_fail=1 -#! $SHELL -# Generated by $as_me. -$2 -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$1 <<\_ASEOF || lt_write_fail=1 -AS_SHELL_SANITIZE -_AS_PREPARE -exec AS_MESSAGE_FD>&1 -_ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl -m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT - -# LT_OUTPUT -# --------- -# This macro allows early generation of the libtool script (before -# AC_OUTPUT is called), incase it is used in configure for compilation -# tests. -AC_DEFUN([LT_OUTPUT], -[: ${CONFIG_LT=./config.lt} -AC_MSG_NOTICE([creating $CONFIG_LT]) -_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], -[# Run this file to recreate a libtool stub with the current configuration.]) - -cat >>"$CONFIG_LT" <<\_LTEOF -lt_cl_silent=false -exec AS_MESSAGE_LOG_FD>>config.log -{ - echo - AS_BOX([Running $as_me.]) -} >&AS_MESSAGE_LOG_FD - -lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, -for use in further configure time tests before the real libtool is -generated. - -Usage: $[0] [[OPTIONS]] - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - -Report bugs to ." - -lt_cl_version="\ -m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -configured by $[0], generated by m4_PACKAGE_STRING. - -Copyright (C) 2011 Free Software Foundation, Inc. -This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." - -while test $[#] != 0 -do - case $[1] in - --version | --v* | -V ) - echo "$lt_cl_version"; exit 0 ;; - --help | --h* | -h ) - echo "$lt_cl_help"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --quiet | --q* | --silent | --s* | -q ) - lt_cl_silent=: ;; - - -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; - - *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; - esac - shift -done - -if $lt_cl_silent; then - exec AS_MESSAGE_FD>/dev/null -fi -_LTEOF - -cat >>"$CONFIG_LT" <<_LTEOF -_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AC_MSG_NOTICE([creating $ofile]) -_LT_OUTPUT_LIBTOOL_COMMANDS -AS_EXIT(0) -_LTEOF -chmod +x "$CONFIG_LT" - -# configure is writing to config.log, but config.lt does its own redirection, -# appending to config.log, which fails on DOS, as config.log is still kept -# open by configure. Here we exec the FD to /dev/null, effectively closing -# config.log, so it can be properly (re)opened and appended to by config.lt. -lt_cl_success=: -test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" -exec AS_MESSAGE_LOG_FD>/dev/null -$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -exec AS_MESSAGE_LOG_FD>>config.log -$lt_cl_success || AS_EXIT(1) -])# LT_OUTPUT - - -# _LT_CONFIG(TAG) -# --------------- -# If TAG is the built-in tag, create an initial libtool script with a -# default configuration from the untagged config vars. Otherwise add code -# to config.status for appending the configuration named by TAG from the -# matching tagged config vars. -m4_defun([_LT_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_CONFIG_SAVE_COMMANDS([ - m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl - m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -_LT_COPYING -_LT_LIBTOOL_TAGS - -# ### BEGIN LIBTOOL CONFIG -_LT_LIBTOOL_CONFIG_VARS -_LT_LIBTOOL_TAG_VARS -# ### END LIBTOOL CONFIG - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - _LT_PROG_LTMAIN - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_REPLACE_SHELLFNS - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -], -[cat <<_LT_EOF >> "$ofile" - -dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -dnl in a comment (ie after a #). -# ### BEGIN LIBTOOL TAG CONFIG: $1 -_LT_LIBTOOL_TAG_VARS(_LT_TAG) -# ### END LIBTOOL TAG CONFIG: $1 -_LT_EOF -])dnl /m4_if -], -[m4_if([$1], [], [ - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile'], []) -])dnl /_LT_CONFIG_SAVE_COMMANDS -])# _LT_CONFIG - - -# LT_SUPPORTED_TAG(TAG) -# --------------------- -# Trace this macro to discover what tags are supported by the libtool -# --tag option, using: -# autoconf --trace 'LT_SUPPORTED_TAG:$1' -AC_DEFUN([LT_SUPPORTED_TAG], []) - - -# C support is built-in for now -m4_define([_LT_LANG_C_enabled], []) -m4_define([_LT_TAGS], []) - - -# LT_LANG(LANG) -# ------------- -# Enable libtool support for the given language if not already enabled. -AC_DEFUN([LT_LANG], -[AC_BEFORE([$0], [LT_OUTPUT])dnl -m4_case([$1], - [C], [_LT_LANG(C)], - [C++], [_LT_LANG(CXX)], - [Go], [_LT_LANG(GO)], - [Java], [_LT_LANG(GCJ)], - [Fortran 77], [_LT_LANG(F77)], - [Fortran], [_LT_LANG(FC)], - [Windows Resource], [_LT_LANG(RC)], - [m4_ifdef([_LT_LANG_]$1[_CONFIG], - [_LT_LANG($1)], - [m4_fatal([$0: unsupported language: "$1"])])])dnl -])# LT_LANG - - -# _LT_LANG(LANGNAME) -# ------------------ -m4_defun([_LT_LANG], -[m4_ifdef([_LT_LANG_]$1[_enabled], [], - [LT_SUPPORTED_TAG([$1])dnl - m4_append([_LT_TAGS], [$1 ])dnl - m4_define([_LT_LANG_]$1[_enabled], [])dnl - _LT_LANG_$1_CONFIG($1)])dnl -])# _LT_LANG - - -m4_ifndef([AC_PROG_GO], [ -############################################################ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_GO. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -############################################################ -m4_defun([AC_PROG_GO], -[AC_LANG_PUSH(Go)dnl -AC_ARG_VAR([GOC], [Go compiler command])dnl -AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl -_AC_ARG_VAR_LDFLAGS()dnl -AC_CHECK_TOOL(GOC, gccgo) -if test -z "$GOC"; then - if test -n "$ac_tool_prefix"; then - AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) - fi -fi -if test -z "$GOC"; then - AC_CHECK_PROG(GOC, gccgo, gccgo, false) -fi -])#m4_defun -])#m4_ifndef - - -# _LT_LANG_DEFAULT_CONFIG -# ----------------------- -m4_defun([_LT_LANG_DEFAULT_CONFIG], -[AC_PROVIDE_IFELSE([AC_PROG_CXX], - [LT_LANG(CXX)], - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) - -AC_PROVIDE_IFELSE([AC_PROG_F77], - [LT_LANG(F77)], - [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) - -AC_PROVIDE_IFELSE([AC_PROG_FC], - [LT_LANG(FC)], - [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) - -dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -dnl pulling things in needlessly. -AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([LT_PROG_GCJ], - [LT_LANG(GCJ)], - [m4_ifdef([AC_PROG_GCJ], - [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([A][M_PROG_GCJ], - [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([LT_PROG_GCJ], - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) - -AC_PROVIDE_IFELSE([AC_PROG_GO], - [LT_LANG(GO)], - [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) - -AC_PROVIDE_IFELSE([LT_PROG_RC], - [LT_LANG(RC)], - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -])# _LT_LANG_DEFAULT_CONFIG - -# Obsolete macros: -AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -dnl AC_DEFUN([AC_LIBTOOL_F77], []) -dnl AC_DEFUN([AC_LIBTOOL_FC], []) -dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) -dnl AC_DEFUN([AC_LIBTOOL_RC], []) - - -# _LT_TAG_COMPILER -# ---------------- -m4_defun([_LT_TAG_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_TAG_COMPILER - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -m4_defun([_LT_COMPILER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -m4_defun([_LT_LINKER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* -])# _LT_LINKER_BOILERPLATE - -# _LT_REQUIRED_DARWIN_CHECKS -# ------------------------- -m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) - AC_CHECK_TOOL([LIPO], [lipo], [:]) - AC_CHECK_TOOL([OTOOL], [otool], [:]) - AC_CHECK_TOOL([OTOOL64], [otool64], [:]) - _LT_DECL([], [DSYMUTIL], [1], - [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) - _LT_DECL([], [NMEDIT], [1], - [Tool to change global to local symbols on Mac OS X]) - _LT_DECL([], [LIPO], [1], - [Tool to manipulate fat objects and archives on Mac OS X]) - _LT_DECL([], [OTOOL], [1], - [ldd/readelf like tool for Mach-O binaries on Mac OS X]) - _LT_DECL([], [OTOOL64], [1], - [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) - - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], - [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi]) - - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], - [lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" - ]) - - AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], - [lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD - echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD - $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - ]) - case $host_os in - rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac -]) - - -# _LT_DARWIN_LINKER_FEATURES([TAG]) -# --------------------------------- -# Checks for linker and compiler features on darwin -m4_defun([_LT_DARWIN_LINKER_FEATURES], -[ - m4_require([_LT_REQUIRED_DARWIN_CHECKS]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], - [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='' - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -],[]) - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -]) - -# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -# ---------------------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -# Store the results from the different compilers for each TAGNAME. -# Allow to override them for all tags through lt_cv_aix_libpath. -m4_defun([_LT_SYS_MODULE_PATH_AIX], -[m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], - [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ - lt_aix_libpath_sed='[ - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }]' - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi],[]) - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" - fi - ]) - aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -fi -])# _LT_SYS_MODULE_PATH_AIX - - -# _LT_SHELL_INIT(ARG) -# ------------------- -m4_define([_LT_SHELL_INIT], -[m4_divert_text([M4SH-INIT], [$1 -])])# _LT_SHELL_INIT - - - -# _LT_PROG_ECHO_BACKSLASH -# ----------------------- -# Find how we can fake an echo command that does not interpret backslash. -# In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). -m4_defun([_LT_PROG_ECHO_BACKSLASH], -[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -AC_MSG_CHECKING([how to print strings]) -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$[]1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - -case "$ECHO" in - printf*) AC_MSG_RESULT([printf]) ;; - print*) AC_MSG_RESULT([print -r]) ;; - *) AC_MSG_RESULT([cat]) ;; -esac - -m4_ifdef([_AS_DETECT_SUGGESTED], -[_AS_DETECT_SUGGESTED([ - test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test "X`printf %s $ECHO`" = "X$ECHO" \ - || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) - -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) -])# _LT_PROG_ECHO_BACKSLASH - - -# _LT_WITH_SYSROOT -# ---------------- -AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) -AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], -[], [with_sysroot=no]) - -dnl lt_sysroot will always be passed unquoted. We quote it here -dnl in case the user passed a directory name. -lt_sysroot= -case ${with_sysroot} in #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - AC_MSG_RESULT([${with_sysroot}]) - AC_MSG_ERROR([The sysroot must be an absolute path.]) - ;; -esac - - AC_MSG_RESULT([${lt_sysroot:-no}]) -_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) - -# _LT_ENABLE_LOCK -# --------------- -m4_defun([_LT_ENABLE_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AS_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -need_locks="$enable_libtool_lock" -])# _LT_ENABLE_LOCK - - -# _LT_PROG_AR -# ----------- -m4_defun([_LT_PROG_AR], -[AC_CHECK_TOOLS(AR, [ar], false) -: ${AR=ar} -: ${AR_FLAGS=cru} -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) - -AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], - [lt_cv_ar_at_file=no - AC_COMPILE_IFELSE([AC_LANG_PROGRAM], - [echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' - AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - ]) - ]) - -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= -else - archiver_list_spec=$lt_cv_ar_at_file -fi -_LT_DECL([], [archiver_list_spec], [1], - [How to feed a file listing to the archiver]) -])# _LT_PROG_AR - - -# _LT_CMD_OLD_ARCHIVE -# ------------------- -m4_defun([_LT_CMD_OLD_ARCHIVE], -[_LT_PROG_AR - -AC_CHECK_TOOL(STRIP, strip, :) -test -z "$STRIP" && STRIP=: -_LT_DECL([], [STRIP], [1], [A symbol stripping program]) - -AC_CHECK_TOOL(RANLIB, ranlib, :) -test -z "$RANLIB" && RANLIB=: -_LT_DECL([], [RANLIB], [1], - [Commands used to install an old-style archive]) - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" -fi - -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac -_LT_DECL([], [old_postinstall_cmds], [2]) -_LT_DECL([], [old_postuninstall_cmds], [2]) -_LT_TAGDECL([], [old_archive_cmds], [2], - [Commands used to build an old-style archive]) -_LT_DECL([], [lock_old_archive_extraction], [0], - [Whether to use a lock for old archive extraction]) -])# _LT_CMD_OLD_ARCHIVE - - -# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([_LT_COMPILER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - fi - $RM conftest* -]) - -if test x"[$]$2" = xyes; then - m4_if([$5], , :, [$5]) -else - m4_if([$6], , :, [$6]) -fi -])# _LT_COMPILER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) - - -# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------- -# Check whether the given linker option works -AC_DEFUN([_LT_LINKER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - else - $2=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" -]) - -if test x"[$]$2" = xyes; then - m4_if([$4], , :, [$4]) -else - m4_if([$5], , :, [$5]) -fi -])# _LT_LINKER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) - - -# LT_CMD_MAX_LEN -#--------------- -AC_DEFUN([LT_CMD_MAX_LEN], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac -]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -max_cmd_len=$lt_cv_sys_max_cmd_len -_LT_DECL([], [max_cmd_len], [0], - [What is the maximum length of a command?]) -])# LT_CMD_MAX_LEN - -# Old name: -AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) - - -# _LT_HEADER_DLFCN -# ---------------- -m4_defun([_LT_HEADER_DLFCN], -[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -])# _LT_HEADER_DLFCN - - -# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ---------------------------------------------------------------- -m4_defun([_LT_TRY_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -[#line $LINENO "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -}] -_LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_TRY_DLOPEN_SELF - - -# LT_SYS_DLOPEN_SELF -# ------------------ -AC_DEFUN([LT_SYS_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -_LT_DECL([dlopen_support], [enable_dlopen], [0], - [Whether dlopen is supported]) -_LT_DECL([dlopen_self], [enable_dlopen_self], [0], - [Whether dlopen of programs is supported]) -_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], - [Whether dlopen of statically linked programs is supported]) -])# LT_SYS_DLOPEN_SELF - -# Old name: -AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) - - -# _LT_COMPILER_C_O([TAGNAME]) -# --------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler. -# This macro does not hard code the compiler like AC_PROG_CC_C_O. -m4_defun([_LT_COMPILER_C_O], -[m4_require([_LT_DECL_SED])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* -]) -_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], - [Does compiler simultaneously support -c and -o options?]) -])# _LT_COMPILER_C_O - - -# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -# ---------------------------------- -# Check to see if we can do hard links to lock some files if needed -m4_defun([_LT_COMPILER_FILE_LOCKS], -[m4_require([_LT_ENABLE_LOCK])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_COMPILER_C_O([$1]) - -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -])# _LT_COMPILER_FILE_LOCKS - - -# _LT_CHECK_OBJDIR -# ---------------- -m4_defun([_LT_CHECK_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -_LT_DECL([], [objdir], [0], - [The name of the directory that contains temporary libtool files])dnl -m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) -])# _LT_CHECK_OBJDIR - - -# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -# -------------------------------------- -# Check hardcoding attributes. -m4_defun([_LT_LINKER_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || - test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) - -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -_LT_TAGDECL([], [hardcode_action], [0], - [How to hardcode a shared library path into an executable]) -])# _LT_LINKER_HARDCODE_LIBPATH - - -# _LT_CMD_STRIPLIB -# ---------------- -m4_defun([_LT_CMD_STRIPLIB], -[m4_require([_LT_DECL_EGREP]) -striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -_LT_DECL([], [striplib], [1]) -])# _LT_CMD_STRIPLIB - - -# _LT_SYS_DYNAMIC_LINKER([TAG]) -# ----------------------------- -# PORTME Fill in your ld.so characteristics -m4_defun([_LT_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_OBJDUMP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -m4_if([$1], - [], [ -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in - *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` - ;; - esac - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[[4-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[[45]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$cc_basename in - yes,*) - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") - ;; - esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' - ;; - - *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[23]].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 - ;; - -interix[[3-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - - # Some binutils ld are patched to set DT_RUNPATH - AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], - [lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [lt_cv_shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - ]) - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - -_LT_DECL([], [variables_saved_for_relink], [1], - [Variables whose values should be saved in libtool wrapper scripts and - restored at link time]) -_LT_DECL([], [need_lib_prefix], [0], - [Do we need the "lib" prefix for modules?]) -_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) -_LT_DECL([], [version_type], [0], [Library versioning type]) -_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) -_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) -_LT_DECL([], [shlibpath_overrides_runpath], [0], - [Is shlibpath searched before the hard-coded library search path?]) -_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) -_LT_DECL([], [library_names_spec], [1], - [[List of archive names. First name is the real one, the rest are links. - The last name is the one that the linker finds with -lNAME]]) -_LT_DECL([], [soname_spec], [1], - [[The coded name of the library, if different from the real name]]) -_LT_DECL([], [install_override_mode], [1], - [Permission mode override for installation of shared libraries]) -_LT_DECL([], [postinstall_cmds], [2], - [Command to use after installation of a shared archive]) -_LT_DECL([], [postuninstall_cmds], [2], - [Command to use after uninstallation of a shared archive]) -_LT_DECL([], [finish_cmds], [2], - [Commands used to finish a libtool library installation in a directory]) -_LT_DECL([], [finish_eval], [1], - [[As "finish_cmds", except a single script fragment to be evaled but - not shown]]) -_LT_DECL([], [hardcode_into_libs], [0], - [Whether we should hardcode library paths into libraries]) -_LT_DECL([], [sys_lib_search_path_spec], [2], - [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) -])# _LT_SYS_DYNAMIC_LINKER - - -# _LT_PATH_TOOL_PREFIX(TOOL) -# -------------------------- -# find a file program which can recognize shared library -AC_DEFUN([_LT_PATH_TOOL_PREFIX], -[m4_require([_LT_DECL_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="m4_if([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -_LT_DECL([], [MAGIC_CMD], [0], - [Used to examine libraries when file_magic_cmd begins with "file"])dnl -])# _LT_PATH_TOOL_PREFIX - -# Old name: -AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) - - -# _LT_PATH_MAGIC -# -------------- -# find a file program which can recognize a shared library -m4_defun([_LT_PATH_MAGIC], -[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# _LT_PATH_MAGIC - - -# LT_PATH_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([LT_PATH_LD], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PROG_ECHO_BACKSLASH])dnl - -AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no])dnl - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) - -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` - fi - ;; - esac -fi - -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - -_LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) -_LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method = "file_magic"]) -_LT_DECL([], [file_magic_glob], [1], - [How to find potential files when deplibs_check_method = "file_magic"]) -_LT_DECL([], [want_nocaseglob], [1], - [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) -])# _LT_CHECK_MAGIC_METHOD - - -# LT_PATH_NM -# ---------- -# find the pathname to a BSD- or MS-compatible name lister -AC_DEFUN([LT_PATH_NM], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi - AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm -AC_SUBST([NM]) -_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - -AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], - [lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) - cat conftest.out >&AS_MESSAGE_LOG_FD - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest*]) -])# LT_PATH_NM - -# Old names: -AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) -AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_PROG_NM], []) -dnl AC_DEFUN([AC_PROG_NM], []) - -# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -# -------------------------------- -# how to determine the name of the shared library -# associated with a specific link library. -# -- PORTME fill in with the dynamic library characteristics -m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -[m4_require([_LT_DECL_EGREP]) -m4_require([_LT_DECL_OBJDUMP]) -m4_require([_LT_DECL_DLLTOOL]) -AC_CACHE_CHECK([how to associate runtime and link libraries], -lt_cv_sharedlib_from_linklib_cmd, -[lt_cv_sharedlib_from_linklib_cmd='unknown' - -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac -]) -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO - -_LT_DECL([], [sharedlib_from_linklib_cmd], [1], - [Command to associate shared and link libraries]) -])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB - - -# _LT_PATH_MANIFEST_TOOL -# ---------------------- -# locate the manifest tool -m4_defun([_LT_PATH_MANIFEST_TOOL], -[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], - [lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&AS_MESSAGE_LOG_FD - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: -fi -_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -])# _LT_PATH_MANIFEST_TOOL - - -# LT_LIB_M -# -------- -# check for math library -AC_DEFUN([LT_LIB_M], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -AC_SUBST([LIBM]) -])# LT_LIB_M - -# Old name: -AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_CHECK_LIBM], []) - - -# _LT_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------- -m4_defun([_LT_COMPILER_NO_RTTI], -[m4_require([_LT_TAG_COMPILER])dnl - -_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; - *) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; - esac - - _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], - [Compiler flag to turn off builtin functions]) -])# _LT_COMPILER_NO_RTTI - - -# _LT_CMD_GLOBAL_SYMBOLS -# ---------------------- -m4_defun([_LT_CMD_GLOBAL_SYMBOLS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([LT_PATH_NM])dnl -AC_REQUIRE([LT_PATH_LD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_TAG_COMPILER])dnl - -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK ['"\ -" {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx]" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT@&t@_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT@&t@_DLSYM_CONST -#else -# define LT@&t@_DLSYM_CONST const -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -LT@&t@_DLSYM_CONST struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[[]] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi - -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then - nm_file_list_spec='@' -fi - -_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) -_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], - [Transform the output of nm in a proper C declaration]) -_LT_DECL([global_symbol_to_c_name_address], - [lt_cv_sys_global_symbol_to_c_name_address], [1], - [Transform the output of nm in a C name address pair]) -_LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -_LT_DECL([], [nm_file_list_spec], [1], - [Specify filename containing input files for $NM]) -]) # _LT_CMD_GLOBAL_SYMBOLS - - -# _LT_COMPILER_PIC([TAGNAME]) -# --------------------------- -m4_defun([_LT_COMPILER_PIC], -[m4_require([_LT_TAG_COMPILER])dnl -_LT_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_TAGVAR(lt_prog_compiler_static, $1)= - -m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) - # IBM XL 8.0, 9.0 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; - - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" - fi - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - hpux9* | hpux10* | hpux11*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; - nagfor*) - # NAG Fortran compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - *Sun\ F* | *Sun*Fortran*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - *Sun\ C*) - # Sun C 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Intel*\ [[CF]]*Compiler*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - *Portland\ Group*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - esac - ;; - - newsos6) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - rdos*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - solaris*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; - - sunos4*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - unicos*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - - uts4*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; -esac - -AC_CACHE_CHECK([for $compiler option to produce PIC], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], - [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], - [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) -# -# Check to make sure the static flag actually works. -# -wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" -_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) -_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], - [Compiler flag to prevent dynamic linking]) -])# _LT_COMPILER_PIC - - -# _LT_LINKER_SHLIBS([TAGNAME]) -# ---------------------------- -# See if the linker supports building shared libraries. -m4_defun([_LT_LINKER_SHLIBS], -[AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw* | cegcc*) - case $cc_basename in - cl*) - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - ;; - esac - ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(archive_cmds, $1)= - _LT_TAGVAR(archive_expsym_cmds, $1)= - _LT_TAGVAR(compiler_needs_object, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(hardcode_automatic, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(inherit_rpath, $1)=no - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(old_archive_from_new_cmds, $1)= - _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_TAGVAR(thread_safe_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. -dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes - - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; - *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi - - if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.19, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - _LT_TAGVAR(whole_archive_flag_spec, $1)= - tmp_sharedflag='--shared' ;; - xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - sunos4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - _LT_TAGVAR(link_all_deplibs, $1)=no - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - bsdi[[45]]*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - esac - ;; - - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - m4_if($1, [], [ - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - _LT_LINKER_OPTION([if $CC understands -b], - _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], - [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) - ;; - esac - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], - [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE( - [AC_LANG_SOURCE( - [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], - [C++], [[int foo (void) { return 0; }]], - [Fortran 77], [[ - subroutine foo - end]], - [Fortran], [[ - subroutine foo - end]])])], - [lt_cv_irix_exported_symbol=yes], - [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - fi - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - solaris*) - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' - ;; - esac - fi - fi -]) -AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld - -_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl -_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl -_LT_DECL([], [extract_expsyms_cmds], [2], - [The commands to extract the exported symbol list from a shared archive]) - -# -# Do we need to explicitly link libc? -# -case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_CACHE_CHECK([whether -lc should be explicitly linked in], - [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), - [$RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - ]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) - ;; - esac - fi - ;; -esac - -_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], - [Whether or not to add -lc for building shared libraries]) -_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], - [enable_shared_with_static_runtimes], [0], - [Whether or not to disallow shared libs when runtime libs are static]) -_LT_TAGDECL([], [export_dynamic_flag_spec], [1], - [Compiler flag to allow reflexive dlopens]) -_LT_TAGDECL([], [whole_archive_flag_spec], [1], - [Compiler flag to generate shared objects directly from archives]) -_LT_TAGDECL([], [compiler_needs_object], [1], - [Whether the compiler copes with passing no objects directly]) -_LT_TAGDECL([], [old_archive_from_new_cmds], [2], - [Create an old-style archive from a shared archive]) -_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], - [Create a temporary old-style archive to link instead of a shared archive]) -_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) -_LT_TAGDECL([], [archive_expsym_cmds], [2]) -_LT_TAGDECL([], [module_cmds], [2], - [Commands used to build a loadable module if different from building - a shared archive.]) -_LT_TAGDECL([], [module_expsym_cmds], [2]) -_LT_TAGDECL([], [with_gnu_ld], [1], - [Whether we are building with GNU ld or not]) -_LT_TAGDECL([], [allow_undefined_flag], [1], - [Flag that allows shared libraries with undefined symbols to be built]) -_LT_TAGDECL([], [no_undefined_flag], [1], - [Flag that enforces no undefined symbols]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], - [Flag to hardcode $libdir into a binary during linking. - This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_separator], [1], - [Whether we need a single "-rpath" flag with a separated argument]) -_LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary]) -_LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the - library is relocated]) -_LT_TAGDECL([], [hardcode_minus_L], [0], - [Set to "yes" if using the -LDIR flag during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_shlibpath_var], [0], - [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_automatic], [0], - [Set to "yes" if building a shared library automatically hardcodes DIR - into the library and all subsequent libraries and executables linked - against it]) -_LT_TAGDECL([], [inherit_rpath], [0], - [Set to yes if linker adds runtime paths of dependent libraries - to runtime path list]) -_LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) -_LT_TAGDECL([], [export_symbols_cmds], [2], - [The commands to list exported symbols]) -_LT_TAGDECL([], [exclude_expsyms], [1], - [Symbols that should not be listed in the preloaded symbols]) -_LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) -_LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -_LT_TAGDECL([], [postlink_cmds], [2], - [Commands necessary for finishing linking programs]) -_LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) -dnl FIXME: Not yet implemented -dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], -dnl [Compiler flag to generate thread safe objects]) -])# _LT_LINKER_SHLIBS - - -# _LT_LANG_C_CONFIG([TAG]) -# ------------------------ -# Ensure that the configuration variables for a C compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_C_CONFIG], -[m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - -_LT_TAG_COMPILER -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - LT_SYS_DLOPEN_SELF - _LT_CMD_STRIPLIB - - # Report which library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_CONFIG($1) -fi -AC_LANG_POP -CC="$lt_save_CC" -])# _LT_LANG_C_CONFIG - - -# _LT_LANG_CXX_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a C++ compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_CXX_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi - -AC_LANG_PUSH(C++) -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(compiler_needs_object, $1)=no -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - CFLAGS=$CXXFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - else - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - LT_PATH_LD - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - _LT_TAGVAR(ld_shlibs, $1)=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # g++ - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - freebsd2.*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - freebsd-elf*) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - gnu*) - ;; - - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' - ;; - xl* | mpixl* | bgxl*) - # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=func_echo_all - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - case $host in - osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - ;; - *) - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - fi - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" - _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes - -AC_LANG_POP -])# _LT_LANG_CXX_CONFIG - - -# _LT_FUNC_STRIPNAME_CNF -# ---------------------- -# func_stripname_cnf prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# -# This function is identical to the (non-XSI) version of func_stripname, -# except this one can be used by m4 code that may be executed by configure, -# rather than the libtool script. -m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -AC_REQUIRE([_LT_DECL_SED]) -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -func_stripname_cnf () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname_cnf -])# _LT_FUNC_STRIPNAME_CNF - -# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) -# --------------------------------- -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -m4_defun([_LT_SYS_HIDDEN_LIBDEPS], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl -# Dependencies to place before and after the object being linked: -_LT_TAGVAR(predep_objects, $1)= -_LT_TAGVAR(postdep_objects, $1)= -_LT_TAGVAR(predeps, $1)= -_LT_TAGVAR(postdeps, $1)= -_LT_TAGVAR(compiler_lib_search_path, $1)= - -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF -int a; -void foo (void) { a = 0; } -_LT_EOF -], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF -], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer*4 a - a=0 - return - end -_LT_EOF -], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer a - a=0 - return - end -_LT_EOF -], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF -public class foo { - private int a; - public void bar (void) { - a = 0; - } -}; -_LT_EOF -], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF -package foo -func foo() { -} -_LT_EOF -]) - -_lt_libdeps_save_CFLAGS=$CFLAGS -case "$CC $CFLAGS " in #( -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -esac - -dnl Parse the compiler output and extract the necessary -dnl objects, libraries and library flags. -if AC_TRY_EVAL(ac_compile); then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - fi - - # Expand the sysroot to ease extracting the directories later. - if test -z "$prev"; then - case $p in - -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; - -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; - -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; - esac - fi - case $p in - =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; - esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in - -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" - else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" - else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi - prev= - ;; - - *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" - else - _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" - fi - else - if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" - else - _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling $1 test program" -fi - -$RM -f confest.$objext -CFLAGS=$_lt_libdeps_save_CFLAGS - -# PORTME: override above test on systems where it is broken -m4_if([$1], [CXX], -[case $host_os in -interix[[3-9]]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_TAGVAR(predep_objects,$1)= - _LT_TAGVAR(postdep_objects,$1)= - _LT_TAGVAR(postdeps,$1)= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) - -case " $_LT_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac - _LT_TAGVAR(compiler_lib_search_dirs, $1)= -if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi -_LT_TAGDECL([], [compiler_lib_search_dirs], [1], - [The directories searched by this compiler when creating a shared library]) -_LT_TAGDECL([], [predep_objects], [1], - [Dependencies to place before and after the objects being linked to - create a shared library]) -_LT_TAGDECL([], [postdep_objects], [1]) -_LT_TAGDECL([], [predeps], [1]) -_LT_TAGDECL([], [postdeps], [1]) -_LT_TAGDECL([], [compiler_lib_search_path], [1], - [The library search path used internally by the compiler when linking - a shared library]) -])# _LT_SYS_HIDDEN_LIBDEPS - - -# _LT_LANG_F77_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a Fortran 77 compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_F77_CONFIG], -[AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the F77 compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} - CFLAGS=$FFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - GCC=$G77 - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes - -AC_LANG_POP -])# _LT_LANG_F77_CONFIG - - -# _LT_LANG_FC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for a Fortran compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_FC_CONFIG], -[AC_LANG_PUSH(Fortran) - -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for fc test sources. -ac_ext=${ac_fc_srcext-f} - -# Object file extension for compiled fc test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the FC compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} - CFLAGS=$FCFLAGS - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes - -AC_LANG_POP -])# _LT_LANG_FC_CONFIG - - -# _LT_LANG_GCJ_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Java Compiler compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GCJ_CONFIG], -[AC_REQUIRE([LT_PROG_GCJ])dnl -AC_LANG_SAVE - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" - -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GCJ-"gcj"} -CFLAGS=$GCJFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GCJ_CONFIG - - -# _LT_LANG_GO_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Go compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GO_CONFIG], -[AC_REQUIRE([LT_PROG_GO])dnl -AC_LANG_SAVE - -# Source file extension for Go test sources. -ac_ext=go - -# Object file extension for compiled Go test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="package main; func main() { }" - -# Code to be used in simple link tests -lt_simple_link_test_code='package main; func main() { }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GOC-"gccgo"} -CFLAGS=$GOFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# Go did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GO_CONFIG - - -# _LT_LANG_RC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for the Windows resource compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_RC_CONFIG], -[AC_REQUIRE([LT_PROG_RC])dnl -AC_LANG_SAVE - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC= -CC=${RC-"windres"} -CFLAGS= -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -if test -n "$compiler"; then - : - _LT_CONFIG($1) -fi - -GCC=$lt_save_GCC -AC_LANG_RESTORE -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_RC_CONFIG - - -# LT_PROG_GCJ -# ----------- -AC_DEFUN([LT_PROG_GCJ], -[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], - [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], - [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS)])])[]dnl -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_GCJ], []) - - -# LT_PROG_GO -# ---------- -AC_DEFUN([LT_PROG_GO], -[AC_CHECK_TOOL(GOC, gccgo,) -]) - - -# LT_PROG_RC -# ---------- -AC_DEFUN([LT_PROG_RC], -[AC_CHECK_TOOL(RC, windres,) -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_RC], []) - - -# _LT_DECL_EGREP -# -------------- -# If we don't have a new enough Autoconf to choose the best grep -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_EGREP], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_REQUIRE([AC_PROG_FGREP])dnl -test -z "$GREP" && GREP=grep -_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -_LT_DECL([], [EGREP], [1], [An ERE matcher]) -_LT_DECL([], [FGREP], [1], [A literal string matcher]) -dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too -AC_SUBST([GREP]) -]) - - -# _LT_DECL_OBJDUMP -# -------------- -# If we don't have a new enough Autoconf to choose the best objdump -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_OBJDUMP], -[AC_CHECK_TOOL(OBJDUMP, objdump, false) -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) -AC_SUBST([OBJDUMP]) -]) - -# _LT_DECL_DLLTOOL -# ---------------- -# Ensure DLLTOOL variable is set. -m4_defun([_LT_DECL_DLLTOOL], -[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -AC_SUBST([DLLTOOL]) -]) - -# _LT_DECL_SED -# ------------ -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -m4_defun([_LT_DECL_SED], -[AC_PROG_SED -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" -_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], - [Sed that helps us avoid accidentally triggering echo(1) options like -n]) -])# _LT_DECL_SED - -m4_ifndef([AC_PROG_SED], [ -############################################################ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -############################################################ - -m4_defun([AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -])#AC_PROG_SED -])#m4_ifndef - -# Old name: -AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_SED], []) - - -# _LT_CHECK_SHELL_FEATURES -# ------------------------ -# Find out whether the shell is Bourne or XSI compatible, -# or has some other useful features. -m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi -_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac -_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl -_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl -])# _LT_CHECK_SHELL_FEATURES - - -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - -# _LT_PATH_CONVERSION_FUNCTIONS -# ----------------------------- -# Determine which file name conversion functions should be used by -# func_to_host_file (and, implicitly, by func_to_host_path). These are needed -# for certain cross-compile configurations and native mingw. -m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_MSG_CHECKING([how to convert $build file names to $host format]) -AC_CACHE_VAL(lt_cv_to_host_file_cmd, -[case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; -esac -]) -to_host_file_cmd=$lt_cv_to_host_file_cmd -AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], - [0], [convert $build file names to $host format])dnl - -AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -[#assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 - ;; - esac - ;; -esac -]) -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], - [0], [convert $build files to toolchain format])dnl -])# _LT_PATH_CONVERSION_FUNCTIONS diff --git a/log4tango/m4/ltoptions.m4 b/log4tango/m4/ltoptions.m4 deleted file mode 100644 index 5d9acd8e2..000000000 --- a/log4tango/m4/ltoptions.m4 +++ /dev/null @@ -1,384 +0,0 @@ -# Helper functions for option handling. -*- Autoconf -*- -# -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 7 ltoptions.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) - - -# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -# ------------------------------------------ -m4_define([_LT_MANGLE_OPTION], -[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) - - -# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) -# --------------------------------------- -# Set option OPTION-NAME for macro MACRO-NAME, and if there is a -# matching handler defined, dispatch to it. Other OPTION-NAMEs are -# saved as a flag. -m4_define([_LT_SET_OPTION], -[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl -m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), - _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl -]) - - -# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) -# ------------------------------------------------------------ -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -m4_define([_LT_IF_OPTION], -[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) - - -# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) -# ------------------------------------------------------- -# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME -# are set. -m4_define([_LT_UNLESS_OPTIONS], -[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), - [m4_define([$0_found])])])[]dnl -m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 -])[]dnl -]) - - -# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) -# ---------------------------------------- -# OPTION-LIST is a space-separated list of Libtool options associated -# with MACRO-NAME. If any OPTION has a matching handler declared with -# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about -# the unknown option and exit. -m4_defun([_LT_SET_OPTIONS], -[# Set options -m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [_LT_SET_OPTION([$1], _LT_Option)]) - -m4_if([$1],[LT_INIT],[ - dnl - dnl Simply set some default values (i.e off) if boolean options were not - dnl specified: - _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no - ]) - _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no - ]) - dnl - dnl If no reference was made to various pairs of opposing options, then - dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared - dnl archives by default: - _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) - _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) - ]) -])# _LT_SET_OPTIONS - - -## --------------------------------- ## -## Macros to handle LT_INIT options. ## -## --------------------------------- ## - -# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -# ----------------------------------------- -m4_define([_LT_MANGLE_DEFUN], -[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) - - -# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -# ----------------------------------------------- -m4_define([LT_OPTION_DEFINE], -[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -])# LT_OPTION_DEFINE - - -# dlopen -# ------ -LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes -]) - -AU_DEFUN([AC_LIBTOOL_DLOPEN], -[_LT_SET_OPTION([LT_INIT], [dlopen]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) - - -# win32-dll -# --------- -# Declare package support for building win32 dll's. -LT_OPTION_DEFINE([LT_INIT], [win32-dll], -[enable_win32_dll=yes - -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; -esac - -test -z "$AS" && AS=as -_LT_DECL([], [AS], [1], [Assembler program])dnl - -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl - -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl -])# win32-dll - -AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -_LT_SET_OPTION([LT_INIT], [win32-dll]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) - - -# _LT_ENABLE_SHARED([DEFAULT]) -# ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_SHARED], -[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([shared], - [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) - - _LT_DECL([build_libtool_libs], [enable_shared], [0], - [Whether or not to build shared libraries]) -])# _LT_ENABLE_SHARED - -LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -]) - -AC_DEFUN([AC_DISABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], [disable-shared]) -]) - -AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_SHARED], []) -dnl AC_DEFUN([AM_DISABLE_SHARED], []) - - - -# _LT_ENABLE_STATIC([DEFAULT]) -# ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_STATIC], -[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([static], - [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]_LT_ENABLE_STATIC_DEFAULT) - - _LT_DECL([build_old_libs], [enable_static], [0], - [Whether or not to build static libraries]) -])# _LT_ENABLE_STATIC - -LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -]) - -AC_DEFUN([AC_DISABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], [disable-static]) -]) - -AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_STATIC], []) -dnl AC_DEFUN([AM_DISABLE_STATIC], []) - - - -# _LT_ENABLE_FAST_INSTALL([DEFAULT]) -# ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_FAST_INSTALL], -[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([fast-install], - [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) - -_LT_DECL([fast_install], [enable_fast_install], [0], - [Whether or not to optimize for fast installation])dnl -])# _LT_ENABLE_FAST_INSTALL - -LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) - -# Old names: -AU_DEFUN([AC_ENABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) -]) - -AU_DEFUN([AC_DISABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - - -# _LT_WITH_PIC([MODE]) -# -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' -# LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -m4_define([_LT_WITH_PIC], -[AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) - -_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -])# _LT_WITH_PIC - -LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) - -# Old name: -AU_DEFUN([AC_LIBTOOL_PICMODE], -[_LT_SET_OPTION([LT_INIT], [pic-only]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) - -## ----------------- ## -## LTDL_INIT Options ## -## ----------------- ## - -m4_define([_LTDL_MODE], []) -LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], - [m4_define([_LTDL_MODE], [nonrecursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [recursive], - [m4_define([_LTDL_MODE], [recursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [subproject], - [m4_define([_LTDL_MODE], [subproject])]) - -m4_define([_LTDL_TYPE], []) -LT_OPTION_DEFINE([LTDL_INIT], [installable], - [m4_define([_LTDL_TYPE], [installable])]) -LT_OPTION_DEFINE([LTDL_INIT], [convenience], - [m4_define([_LTDL_TYPE], [convenience])]) diff --git a/log4tango/m4/ltsugar.m4 b/log4tango/m4/ltsugar.m4 deleted file mode 100644 index 9000a057d..000000000 --- a/log4tango/m4/ltsugar.m4 +++ /dev/null @@ -1,123 +0,0 @@ -# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 6 ltsugar.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) - - -# lt_join(SEP, ARG1, [ARG2...]) -# ----------------------------- -# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -# associated separator. -# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -# versions in m4sugar had bugs. -m4_define([lt_join], -[m4_if([$#], [1], [], - [$#], [2], [[$2]], - [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -m4_define([_lt_join], -[m4_if([$#$2], [2], [], - [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) - - -# lt_car(LIST) -# lt_cdr(LIST) -# ------------ -# Manipulate m4 lists. -# These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. -m4_define([lt_car], [[$1]]) -m4_define([lt_cdr], -[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], - [$#], 1, [], - [m4_dquote(m4_shift($@))])]) -m4_define([lt_unquote], $1) - - -# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -# ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. -# Note that neither SEPARATOR nor STRING are expanded; they are appended -# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). -# No SEPARATOR is output if MACRO-NAME was previously undefined (different -# than defined and empty). -# -# This macro is needed until we can rely on Autoconf 2.62, since earlier -# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -m4_define([lt_append], -[m4_define([$1], - m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) - - - -# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -# ---------------------------------------------------------- -# Produce a SEP delimited list of all paired combinations of elements of -# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -# has the form PREFIXmINFIXSUFFIXn. -# Needed until we can rely on m4_combine added in Autoconf 2.62. -m4_define([lt_combine], -[m4_if(m4_eval([$# > 3]), [1], - [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl -[[m4_foreach([_Lt_prefix], [$2], - [m4_foreach([_Lt_suffix], - ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, - [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) - - -# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -# ----------------------------------------------------------------------- -# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -m4_define([lt_if_append_uniq], -[m4_ifdef([$1], - [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], - [lt_append([$1], [$2], [$3])$4], - [$5])], - [lt_append([$1], [$2], [$3])$4])]) - - -# lt_dict_add(DICT, KEY, VALUE) -# ----------------------------- -m4_define([lt_dict_add], -[m4_define([$1($2)], [$3])]) - - -# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -# -------------------------------------------- -m4_define([lt_dict_add_subkey], -[m4_define([$1($2:$3)], [$4])]) - - -# lt_dict_fetch(DICT, KEY, [SUBKEY]) -# ---------------------------------- -m4_define([lt_dict_fetch], -[m4_ifval([$3], - m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), - m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) - - -# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -# ----------------------------------------------------------------- -m4_define([lt_if_dict_fetch], -[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], - [$5], - [$6])]) - - -# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -# -------------------------------------------------------------- -m4_define([lt_dict_filter], -[m4_if([$5], [], [], - [lt_join(m4_quote(m4_default([$4], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), - [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -]) diff --git a/log4tango/m4/ltversion.m4 b/log4tango/m4/ltversion.m4 deleted file mode 100644 index 07a8602d4..000000000 --- a/log4tango/m4/ltversion.m4 +++ /dev/null @@ -1,23 +0,0 @@ -# ltversion.m4 -- version numbers -*- Autoconf -*- -# -# Copyright (C) 2004 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# @configure_input@ - -# serial 3337 ltversion.m4 -# This file is part of GNU Libtool - -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) - -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) diff --git a/log4tango/m4/lt~obsolete.m4 b/log4tango/m4/lt~obsolete.m4 deleted file mode 100644 index c573da90c..000000000 --- a/log4tango/m4/lt~obsolete.m4 +++ /dev/null @@ -1,98 +0,0 @@ -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004. -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 5 lt~obsolete.m4 - -# These exist entirely to fool aclocal when bootstrapping libtool. -# -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -# which have later been changed to m4_define as they aren't part of the -# exported API, or moved to Autoconf or Automake where they belong. -# -# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -# using a macro with the same name in our local m4/libtool.m4 it'll -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -# and doesn't know about Autoconf macros at all.) -# -# So we provide this file, which has a silly filename so it's always -# included after everything else. This provides aclocal with the -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -# because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -# -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -# Yes, that means every name once taken will need to remain here until -# we give up compatibility with versions before 1.7, at which point -# we need to keep only those names which we still refer to. - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) - -m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) -m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) -m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) -m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) -m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) -m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff --git a/log4tango/make-install.sh b/log4tango/make-install.sh deleted file mode 100755 index c5931a26c..000000000 --- a/log4tango/make-install.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -./configure --prefix=`pwd`/build -make -j 2 install - - diff --git a/log4tango/ms32vc10/log4tango.sln b/log4tango/ms32vc10/log4tango.sln deleted file mode 100644 index 23ffbe07e..000000000 --- a/log4tango/ms32vc10/log4tango.sln +++ /dev/null @@ -1,32 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4tango_static", "log4tango_static\log4tango_static.vcxproj", "{BB01FB63-D101-4CE7-80DB-3AF353016DF9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4tango_dll", "log4tango_dll\log4tango_dll.vcxproj", "{987913D3-D3EA-4282-AF9D-00A6C3EC756B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_static", "test_static\test_static.vcxproj", "{DD879332-D3D9-4C64-9C0B-D2D778A1A71B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testDLL", "test_dll\test_dll.vcxproj", "{B999B948-35C2-4C87-A64A-40B54F91FDFC}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Debug|Win32.ActiveCfg = Debug|Win32 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|Win32.ActiveCfg = Release|Win32 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|Win32.Build.0 = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Debug|Win32.ActiveCfg = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|Win32.ActiveCfg = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|Win32.Build.0 = Release|Win32 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|Win32.ActiveCfg = Debug|Win32 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|Win32.Build.0 = Debug|Win32 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Release|Win32.ActiveCfg = Release|Win32 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Debug|Win32.ActiveCfg = Debug|Win32 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Release|Win32.ActiveCfg = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/log4tango/ms32vc10/log4tango_dll/log4tango_dll.rc b/log4tango/ms32vc10/log4tango_dll/log4tango_dll.rc deleted file mode 100644 index e46f8dfe9..000000000 --- a/log4tango/ms32vc10/log4tango_dll/log4tango_dll.rc +++ /dev/null @@ -1,54 +0,0 @@ -#ifdef APSTUDIO_INVOKED - #error This file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - -#include "Winver.h" - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,3,2,1 - PRODUCTVERSION 0,0,0,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "Distributed under the terms of the GNU Lesser General Public License (LGPL) version 2.1. See COPYING for details.\0" - VALUE "CompanyName", "initiate by Bastiaan Bakker - Tango custom version by NL-SOLEIL\0" - VALUE "ContributingAuthors", "See documentation\0" - VALUE "FileDescription", "Log library for Tango DLL\0" - VALUE "FileVersion", "2.2.1\0" - VALUE "InternalName", "log4tango\0" - VALUE "LegalCopyright", "Copyright © 2000-2002 the Log4cpp Project, others\0" - VALUE "LegalTrademarks", "\0" -#ifdef _DEBUG - VALUE "OriginalFilename", "log4tango_d.dll\0" -#else - VALUE "OriginalFilename", "log4tango.dll\0" -#endif - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Log library for Tango\0" - VALUE "ProductVersion", "2.2.1\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -// End of version info resource diff --git a/log4tango/ms32vc10/log4tango_dll/log4tango_dll.vcxproj b/log4tango/ms32vc10/log4tango_dll/log4tango_dll.vcxproj deleted file mode 100644 index 8cb7f7f8d..000000000 --- a/log4tango/ms32vc10/log4tango_dll/log4tango_dll.vcxproj +++ /dev/null @@ -1,202 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {987913D3-D3EA-4282-AF9D-00A6C3EC756B} - log4tango_dll - - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - lib\ - .\Debug\ - true - lib\ - .\Release\ - false - log4tango - log4tangod - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/log4tango_dll.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;LOG4TANGO_BUILD_DLL;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - .\Debug/log4tango_dll.pch - .\Debug/ - .\Debug/ - lib/log4tangod.pdb - true - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - NotSet - lib\log4tangod.dll - true - false - true - .\Debug/log4tangod.pdb - false - - - lib\log4tangod.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/log4tango_dll.tlb - - - AnySuitable - Speed - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;LOG4TANGO_BUILD_DLL;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/log4tango_dll.pch - .\Release/ - .\Release/ - .\Release/ - true - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - lib\log4tango.dll - true - false - .\Release/log4tango.pdb - false - - - lib\log4tango.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/log4tango/ms32vc10/log4tango_static/log4tango_static.vcxproj b/log4tango/ms32vc10/log4tango_static/log4tango_static.vcxproj deleted file mode 100644 index 9ca66a272..000000000 --- a/log4tango/ms32vc10/log4tango_static/log4tango_static.vcxproj +++ /dev/null @@ -1,171 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {BB01FB63-D101-4CE7-80DB-3AF353016DF9} - log4tango_static - - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\Release\ - .\Release\ - .\Debug\ - .\Debug\ - - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_LIB;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - - - .\Release/log4tango_static.pch - .\Release/ - .\Release/ - .\Release/ - true - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - lib\log4tango.lib - true - true - - - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_LIB;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - - - ./Debug/log4tango_static.pch - .\Debug/ - .\Debug/ - lib/log4tangod.pdb - true - Level3 - true - ProgramDatabase - CompileAsCpp - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - lib\log4tangod.lib - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/log4tango/ms32vc10/test_dll/test_dll.vcxproj b/log4tango/ms32vc10/test_dll/test_dll.vcxproj deleted file mode 100644 index 04090c124..000000000 --- a/log4tango/ms32vc10/test_dll/test_dll.vcxproj +++ /dev/null @@ -1,141 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - testDLL - {B999B948-35C2-4C87-A64A-40B54F91FDFC} - - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\Release\ - .\Release\ - false - .\Debug\ - .\Debug\ - true - - - - .\Release/test_dll.tlb - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/test_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;log4tango.lib;%(AdditionalDependencies) - .\Release/test_dll.exe - true - ../log4tango_dll/Release;%(AdditionalLibraryDirectories) - .\Release/test_dll.pdb - Console - false - - - - - - - .\Debug/test_dll.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - .\Debug/test_dll.pch - .\Debug/ - .\Debug/ - .\Debug/ - true - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;log4tangod.lib;%(AdditionalDependencies) - .\Debug/test_dll.exe - true - ../log4tango_dll/lib;%(AdditionalLibraryDirectories) - true - .\Debug/test_dll.pdb - Console - false - - - - - - - MultiThreadedDLL - - - - - {987913d3-d3ea-4282-af9d-00a6c3ec756b} - false - - - - - - \ No newline at end of file diff --git a/log4tango/ms32vc10/test_static/test_static.vcxproj b/log4tango/ms32vc10/test_static/test_static.vcxproj deleted file mode 100644 index e1b196efd..000000000 --- a/log4tango/ms32vc10/test_static/test_static.vcxproj +++ /dev/null @@ -1,140 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B} - - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\Debug\ - .\Debug\ - true - .\Release\ - .\Release\ - false - - - - .\Debug/test_static.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - .\Debug/_static.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - log4tangod.lib;%(AdditionalDependencies) - .\Debug/test_static.exe - true - ../log4tango_static/lib;%(AdditionalLibraryDirectories) - true - .\Debug/test_static.pdb - Console - false - - - - - - - .\Release/test_static.tlb - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/test_static.pch - .\Release/ - .\Release/ - .\Release/ - true - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - log4tango.lib;%(AdditionalDependencies) - .\Release/test_static.exe - true - ../log4tango_static/Release;%(AdditionalLibraryDirectories) - .\Release/test_static.pdb - Console - false - - - - - - - MultiThreadedDLL - - - - - {bb01fb63-d101-4ce7-80db-3af353016df9} - false - - - - - - \ No newline at end of file diff --git a/log4tango/ms64vc10/log4tango.sln b/log4tango/ms64vc10/log4tango.sln deleted file mode 100644 index 9bdf698af..000000000 --- a/log4tango/ms64vc10/log4tango.sln +++ /dev/null @@ -1,44 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4tango_static", "log4tango_static\log4tango_static.vcxproj", "{BB01FB63-D101-4CE7-80DB-3AF353016DF9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4tango_dll", "log4tango_dll\log4tango_dll.vcxproj", "{987913D3-D3EA-4282-AF9D-00A6C3EC756B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_static", "test_static\test_static.vcxproj", "{DD879332-D3D9-4C64-9C0B-D2D778A1A71B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testDLL", "test_dll\test_dll.vcxproj", "{B999B948-35C2-4C87-A64A-40B54F91FDFC}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Debug|Win32.ActiveCfg = Debug|x64 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Debug|x64.ActiveCfg = Release|x64 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|Win32.ActiveCfg = Release|Win32 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|Win32.Build.0 = Release|Win32 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|x64.ActiveCfg = Release|x64 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Debug|Win32.ActiveCfg = Release|x64 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Debug|x64.ActiveCfg = Release|x64 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|Win32.ActiveCfg = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|Win32.Build.0 = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|x64.ActiveCfg = Release|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|Win32.ActiveCfg = Debug|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|Win32.Build.0 = Debug|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|x64.ActiveCfg = Release|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|x64.Build.0 = Release|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Release|Win32.ActiveCfg = Release|Win32 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Release|x64.ActiveCfg = Release|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Release|x64.Build.0 = Release|x64 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Debug|Win32.ActiveCfg = Debug|x64 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Debug|x64.ActiveCfg = Release|x64 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Release|Win32.ActiveCfg = Release|Win32 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Release|x64.ActiveCfg = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/log4tango/ms64vc10/log4tango_dll/log4tango_dll.rc b/log4tango/ms64vc10/log4tango_dll/log4tango_dll.rc deleted file mode 100644 index be679392d..000000000 --- a/log4tango/ms64vc10/log4tango_dll/log4tango_dll.rc +++ /dev/null @@ -1,54 +0,0 @@ -#ifdef APSTUDIO_INVOKED - #error This file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - -#include "Winver.h" - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,3,2,1 - PRODUCTVERSION 0,0,0,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "Distributed under the terms of the GNU Lesser General Public License (LGPL) version 2.1. See COPYING for details.\0" - VALUE "CompanyName", "initiate by Bastiaan Bakker - Tango custom version by NL-SOLEIL\0" - VALUE "ContributingAuthors", "See documentation\0" - VALUE "FileDescription", "Log library for Tango DLL\0" - VALUE "FileVersion", "2.2.1\0" - VALUE "InternalName", "log4tango\0" - VALUE "LegalCopyright", "Copyright © 2000-2002 the Log4cpp Project, others\0" - VALUE "LegalTrademarks", "\0" -#ifdef _DEBUG - VALUE "OriginalFilename", "log4tango_d.dll\0" -#else - VALUE "OriginalFilename", "log4tango.dll\0" -#endif - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Log library for Tango\0" - VALUE "ProductVersion", "2.2.1\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -// End of version info resource diff --git a/log4tango/ms64vc10/log4tango_dll/log4tango_dll.vcxproj b/log4tango/ms64vc10/log4tango_dll/log4tango_dll.vcxproj deleted file mode 100644 index 311ed01d4..000000000 --- a/log4tango/ms64vc10/log4tango_dll/log4tango_dll.vcxproj +++ /dev/null @@ -1,325 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {987913D3-D3EA-4282-AF9D-00A6C3EC756B} - log4tango_dll - - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - Windows7.1SDK - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Debug\ - .\lib\ - .\Debug\ - .\Debug\ - true - true - .\Release\ - .\lib\ - .\Release\ - .\Release\ - false - false - log4tangod - log4tango - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/log4tango_dll.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;LOG4TANGO_BUILD_DLL;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - .\Debug/log4tango_dll.pch - .\Debug/ - .\Debug/ - lib/log4tangod.pdb - true - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - NotSet - lib\log4tangod.dll - true - false - true - .\Debug/log4tangod.pdb - false - - - lib\log4tangod.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/log4tango_dll.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;LOG4TANGO_BUILD_DLL;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - .\Debug/log4tango_dll.pch - .\Debug/ - .\Debug/ - lib/log4tangod.pdb - false - Level2 - true - ProgramDatabase - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - NotSet - lib\log4tangod.dll - true - false - true - .\Debug/log4tangod.pdb - false - - - lib\log4tangod.lib - - - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/log4tango_dll.tlb - - - AnySuitable - Speed - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;LOG4TANGO_BUILD_DLL;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/log4tango_dll.pch - .\Release/ - .\Release/ - .\Release/ - true - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - lib\log4tango.dll - true - false - .\Release/log4tango.pdb - false - - - lib\log4tango.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/log4tango_dll.tlb - - - AnySuitable - Speed - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;LOG4TANGO_BUILD_DLL;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/log4tango_dll.pch - .\Release/ - .\Release/ - .\Release/ - false - Level2 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - lib\log4tango.dll - true - false - .\Release/log4tango.pdb - false - - - lib\log4tango.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/log4tango/ms64vc10/log4tango_static/log4tango_static.vcxproj b/log4tango/ms64vc10/log4tango_static/log4tango_static.vcxproj deleted file mode 100644 index 2c00bb5cc..000000000 --- a/log4tango/ms64vc10/log4tango_static/log4tango_static.vcxproj +++ /dev/null @@ -1,266 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {BB01FB63-D101-4CE7-80DB-3AF353016DF9} - log4tango_static - - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - Windows7.1SDK - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Release\ - .\lib\ - .\Release\ - .\Release\ - .\Debug\ - .\lib\ - .\Debug\ - .\Debug\ - log4tangod - log4tango - - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_LIB;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - - - .\Release/log4tango_static.pch - .\Release/ - .\Release/ - .\Release/ - true - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - lib\log4tango.lib - true - true - - - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_LIB;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - - - .\Release/log4tango_static.pch - .\Release/ - .\Release/ - .\Release/ - false - Level2 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - lib\log4tango.lib - true - true - - - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_LIB;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - - - ./Debug/log4tango_static.pch - .\Debug/ - .\Debug/ - lib/log4tangod.pdb - true - Level3 - true - ProgramDatabase - CompileAsCpp - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - lib\log4tangod.lib - true - true - - - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_LIB;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - - - ./Debug/log4tango_static.pch - .\Debug/ - .\Debug/ - lib/log4tangod.pdb - false - Level2 - true - ProgramDatabase - CompileAsCpp - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - lib\log4tangod.lib - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/log4tango/ms64vc10/test_dll/test_dll.vcxproj b/log4tango/ms64vc10/test_dll/test_dll.vcxproj deleted file mode 100644 index 482f80c03..000000000 --- a/log4tango/ms64vc10/test_dll/test_dll.vcxproj +++ /dev/null @@ -1,258 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - testDLL - {B999B948-35C2-4C87-A64A-40B54F91FDFC} - - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Release\ - .\Release\ - .\Release\ - .\Release\ - false - false - .\Debug\ - .\Debug\ - .\Debug\ - .\Debug\ - true - true - test_dll - test_dll - - - - .\Release/test_dll.tlb - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/test_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;log4tango.lib;%(AdditionalDependencies) - .\Release/test_dll.exe - true - ../log4tango_dll/Release;%(AdditionalLibraryDirectories) - .\Release/test_dll.pdb - Console - false - - - - - - - .\Release/test_dll.tlb - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/test_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - odbc32.lib;odbccp32.lib;log4tango.lib;%(AdditionalDependencies) - .\Release/test_dll.exe - true - ../log4tango_dll/lib;%(AdditionalLibraryDirectories) - .\Release/test_dll.pdb - Console - false - - - - - - - .\Debug/test_dll.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - .\Debug/test_dll.pch - .\Debug/ - .\Debug/ - .\Debug/ - true - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;log4tangod.lib;%(AdditionalDependencies) - .\Debug/test_dll.exe - true - ../log4tango_dll/lib;%(AdditionalLibraryDirectories) - true - .\Debug/test_dll.pdb - Console - false - - - - - - - .\Debug/test_dll.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - .\Debug/test_dll.pch - .\Debug/ - .\Debug/ - .\Debug/ - false - Level3 - true - ProgramDatabase - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - log4tangod.lib - .\Debug/test_dll.exe - true - ../log4tango_dll/lib;%(AdditionalLibraryDirectories) - true - .\Debug/test_dll.pdb - Console - false - - - - - - - MultiThreadedDLL - MultiThreadedDLL - - - - - {987913d3-d3ea-4282-af9d-00a6c3ec756b} - false - - - - - - \ No newline at end of file diff --git a/log4tango/ms64vc10/test_static/test_static.vcxproj b/log4tango/ms64vc10/test_static/test_static.vcxproj deleted file mode 100644 index 12a22a5eb..000000000 --- a/log4tango/ms64vc10/test_static/test_static.vcxproj +++ /dev/null @@ -1,255 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B} - - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Debug\ - .\Debug\ - .\Debug\ - .\Debug\ - true - true - .\Release\ - .\Release\ - .\Release\ - .\Release\ - false - false - - - - .\Debug/test_static.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - .\Debug/_static.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - log4tangod.lib;%(AdditionalDependencies) - .\Debug/test_static.exe - true - ../log4tango_static/lib;%(AdditionalLibraryDirectories) - true - .\Debug/test_static.pdb - Console - false - - - - - - - .\Debug/test_static.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - .\Debug/_static.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - ProgramDatabase - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - log4tangod.lib;%(AdditionalDependencies) - .\Debug/test_static.exe - true - ../log4tango_static/lib;%(AdditionalLibraryDirectories) - true - .\Debug/test_static.pdb - Console - false - - - - - - - .\Release/test_static.tlb - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/test_static.pch - .\Release/ - .\Release/ - .\Release/ - true - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - log4tango.lib;%(AdditionalDependencies) - .\Release/test_static.exe - true - ../log4tango_static/Release;%(AdditionalLibraryDirectories) - .\Release/test_static.pdb - Console - false - - - - - - - .\Release/test_static.tlb - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - true - MultiThreaded - true - - - .\Release/test_static.pch - .\Release/ - .\Release/ - .\Release/ - false - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - log4tango.lib;%(AdditionalDependencies) - .\Release/test_static.exe - true - ../log4tango_static/lib;%(AdditionalLibraryDirectories) - .\Release/test_static.pdb - Console - false - - - - - - - MultiThreadedDLL - MultiThreaded - - - - - {bb01fb63-d101-4ce7-80db-3af353016df9} - false - - - - - - \ No newline at end of file diff --git a/log4tango/ms64vc11/log4tango.sln b/log4tango/ms64vc11/log4tango.sln deleted file mode 100755 index 9298b4a90..000000000 --- a/log4tango/ms64vc11/log4tango.sln +++ /dev/null @@ -1,44 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2012 for Windows Desktop -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4tango_static", "log4tango_static\log4tango_static.vcxproj", "{BB01FB63-D101-4CE7-80DB-3AF353016DF9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4tango_dll", "log4tango_dll\log4tango_dll.vcxproj", "{987913D3-D3EA-4282-AF9D-00A6C3EC756B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_static", "test_static\test_static.vcxproj", "{DD879332-D3D9-4C64-9C0B-D2D778A1A71B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testDLL", "test_dll\test_dll.vcxproj", "{B999B948-35C2-4C87-A64A-40B54F91FDFC}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Debug|Win32.ActiveCfg = Release|x64 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Debug|x64.ActiveCfg = Release|x64 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|Win32.ActiveCfg = Release|Win32 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|Win32.Build.0 = Release|Win32 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|x64.ActiveCfg = Release|x64 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Debug|Win32.ActiveCfg = Release|x64 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Debug|x64.ActiveCfg = Release|x64 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|Win32.ActiveCfg = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|Win32.Build.0 = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|x64.ActiveCfg = Release|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|Win32.ActiveCfg = Debug|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|Win32.Build.0 = Debug|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|x64.ActiveCfg = Release|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|x64.Build.0 = Release|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Release|Win32.ActiveCfg = Release|Win32 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Release|x64.ActiveCfg = Release|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Release|x64.Build.0 = Release|x64 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Debug|Win32.ActiveCfg = Debug|x64 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Debug|x64.ActiveCfg = Release|x64 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Release|Win32.ActiveCfg = Release|Win32 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Release|x64.ActiveCfg = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/log4tango/ms64vc11/log4tango_dll/log4tango_dll.rc b/log4tango/ms64vc11/log4tango_dll/log4tango_dll.rc deleted file mode 100644 index be679392d..000000000 --- a/log4tango/ms64vc11/log4tango_dll/log4tango_dll.rc +++ /dev/null @@ -1,54 +0,0 @@ -#ifdef APSTUDIO_INVOKED - #error This file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - -#include "Winver.h" - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,3,2,1 - PRODUCTVERSION 0,0,0,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "Distributed under the terms of the GNU Lesser General Public License (LGPL) version 2.1. See COPYING for details.\0" - VALUE "CompanyName", "initiate by Bastiaan Bakker - Tango custom version by NL-SOLEIL\0" - VALUE "ContributingAuthors", "See documentation\0" - VALUE "FileDescription", "Log library for Tango DLL\0" - VALUE "FileVersion", "2.2.1\0" - VALUE "InternalName", "log4tango\0" - VALUE "LegalCopyright", "Copyright © 2000-2002 the Log4cpp Project, others\0" - VALUE "LegalTrademarks", "\0" -#ifdef _DEBUG - VALUE "OriginalFilename", "log4tango_d.dll\0" -#else - VALUE "OriginalFilename", "log4tango.dll\0" -#endif - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Log library for Tango\0" - VALUE "ProductVersion", "2.2.1\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -// End of version info resource diff --git a/log4tango/ms64vc11/log4tango_dll/log4tango_dll.vcxproj b/log4tango/ms64vc11/log4tango_dll/log4tango_dll.vcxproj deleted file mode 100644 index 11afaddad..000000000 --- a/log4tango/ms64vc11/log4tango_dll/log4tango_dll.vcxproj +++ /dev/null @@ -1,325 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {987913D3-D3EA-4282-AF9D-00A6C3EC756B} - log4tango_dll - - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - v110 - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Debug\ - .\lib\ - .\Debug\ - .\Debug\ - true - true - .\Release\ - .\lib\ - .\Release\ - .\Release\ - false - false - log4tangod - log4tango - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/log4tango_dll.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;LOG4TANGO_BUILD_DLL;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - .\Debug/log4tango_dll.pch - .\Debug/ - .\Debug/ - lib/log4tangod.pdb - true - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - NotSet - lib\log4tangod.dll - true - false - true - .\Debug/log4tangod.pdb - false - - - lib\log4tangod.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/log4tango_dll.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;LOG4TANGO_BUILD_DLL;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - .\Debug/log4tango_dll.pch - .\Debug/ - .\Debug/ - lib/log4tangod.pdb - false - Level2 - true - ProgramDatabase - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - NotSet - lib\log4tangod.dll - true - false - true - .\Debug/log4tangod.pdb - false - - - lib\log4tangod.lib - - - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/log4tango_dll.tlb - - - AnySuitable - Speed - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;LOG4TANGO_BUILD_DLL;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/log4tango_dll.pch - .\Release/ - .\Release/ - .\Release/ - true - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - lib\log4tango.dll - true - false - .\Release/log4tango.pdb - false - - - lib\log4tango.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/log4tango_dll.tlb - - - AnySuitable - Speed - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;LOG4TANGO_BUILD_DLL;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/log4tango_dll.pch - .\Release/ - .\Release/ - .\Release/ - false - Level2 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - lib\log4tango.dll - true - false - .\Release/log4tango.pdb - false - - - lib\log4tango.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/log4tango/ms64vc11/log4tango_static/log4tango_static.vcxproj b/log4tango/ms64vc11/log4tango_static/log4tango_static.vcxproj deleted file mode 100644 index 986213f14..000000000 --- a/log4tango/ms64vc11/log4tango_static/log4tango_static.vcxproj +++ /dev/null @@ -1,266 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {BB01FB63-D101-4CE7-80DB-3AF353016DF9} - log4tango_static - - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - v110 - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Release\ - .\lib\ - .\Release\ - .\Release\ - .\Debug\ - .\lib\ - .\Debug\ - .\Debug\ - log4tangod - log4tango - - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_LIB;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - - - .\Release/log4tango_static.pch - .\Release/ - .\Release/ - .\Release/ - true - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - lib\log4tango.lib - true - true - - - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_LIB;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - - - .\Release/log4tango_static.pch - .\Release/ - .\Release/ - .\Release/ - false - Level2 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - lib\log4tango.lib - true - true - - - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_LIB;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - - - ./Debug/log4tango_static.pch - .\Debug/ - .\Debug/ - lib/log4tangod.pdb - true - Level3 - true - ProgramDatabase - CompileAsCpp - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - lib\log4tangod.lib - true - true - - - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_LIB;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - - - ./Debug/log4tango_static.pch - .\Debug/ - .\Debug/ - lib/log4tangod.pdb - false - Level2 - true - ProgramDatabase - CompileAsCpp - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - lib\log4tangod.lib - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/log4tango/ms64vc11/test_dll/test_dll.vcxproj b/log4tango/ms64vc11/test_dll/test_dll.vcxproj deleted file mode 100644 index 482f80c03..000000000 --- a/log4tango/ms64vc11/test_dll/test_dll.vcxproj +++ /dev/null @@ -1,258 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - testDLL - {B999B948-35C2-4C87-A64A-40B54F91FDFC} - - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Release\ - .\Release\ - .\Release\ - .\Release\ - false - false - .\Debug\ - .\Debug\ - .\Debug\ - .\Debug\ - true - true - test_dll - test_dll - - - - .\Release/test_dll.tlb - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/test_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;log4tango.lib;%(AdditionalDependencies) - .\Release/test_dll.exe - true - ../log4tango_dll/Release;%(AdditionalLibraryDirectories) - .\Release/test_dll.pdb - Console - false - - - - - - - .\Release/test_dll.tlb - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/test_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - odbc32.lib;odbccp32.lib;log4tango.lib;%(AdditionalDependencies) - .\Release/test_dll.exe - true - ../log4tango_dll/lib;%(AdditionalLibraryDirectories) - .\Release/test_dll.pdb - Console - false - - - - - - - .\Debug/test_dll.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - .\Debug/test_dll.pch - .\Debug/ - .\Debug/ - .\Debug/ - true - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;log4tangod.lib;%(AdditionalDependencies) - .\Debug/test_dll.exe - true - ../log4tango_dll/lib;%(AdditionalLibraryDirectories) - true - .\Debug/test_dll.pdb - Console - false - - - - - - - .\Debug/test_dll.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - .\Debug/test_dll.pch - .\Debug/ - .\Debug/ - .\Debug/ - false - Level3 - true - ProgramDatabase - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - log4tangod.lib - .\Debug/test_dll.exe - true - ../log4tango_dll/lib;%(AdditionalLibraryDirectories) - true - .\Debug/test_dll.pdb - Console - false - - - - - - - MultiThreadedDLL - MultiThreadedDLL - - - - - {987913d3-d3ea-4282-af9d-00a6c3ec756b} - false - - - - - - \ No newline at end of file diff --git a/log4tango/ms64vc11/test_static/test_static.vcxproj b/log4tango/ms64vc11/test_static/test_static.vcxproj deleted file mode 100644 index 12a22a5eb..000000000 --- a/log4tango/ms64vc11/test_static/test_static.vcxproj +++ /dev/null @@ -1,255 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B} - - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Debug\ - .\Debug\ - .\Debug\ - .\Debug\ - true - true - .\Release\ - .\Release\ - .\Release\ - .\Release\ - false - false - - - - .\Debug/test_static.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - .\Debug/_static.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - log4tangod.lib;%(AdditionalDependencies) - .\Debug/test_static.exe - true - ../log4tango_static/lib;%(AdditionalLibraryDirectories) - true - .\Debug/test_static.pdb - Console - false - - - - - - - .\Debug/test_static.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - .\Debug/_static.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - ProgramDatabase - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - log4tangod.lib;%(AdditionalDependencies) - .\Debug/test_static.exe - true - ../log4tango_static/lib;%(AdditionalLibraryDirectories) - true - .\Debug/test_static.pdb - Console - false - - - - - - - .\Release/test_static.tlb - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/test_static.pch - .\Release/ - .\Release/ - .\Release/ - true - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - log4tango.lib;%(AdditionalDependencies) - .\Release/test_static.exe - true - ../log4tango_static/Release;%(AdditionalLibraryDirectories) - .\Release/test_static.pdb - Console - false - - - - - - - .\Release/test_static.tlb - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - true - MultiThreaded - true - - - .\Release/test_static.pch - .\Release/ - .\Release/ - .\Release/ - false - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - log4tango.lib;%(AdditionalDependencies) - .\Release/test_static.exe - true - ../log4tango_static/lib;%(AdditionalLibraryDirectories) - .\Release/test_static.pdb - Console - false - - - - - - - MultiThreadedDLL - MultiThreaded - - - - - {bb01fb63-d101-4ce7-80db-3af353016df9} - false - - - - - - \ No newline at end of file diff --git a/log4tango/ms64vc12/log4tango.sln b/log4tango/ms64vc12/log4tango.sln deleted file mode 100755 index 510c4d594..000000000 --- a/log4tango/ms64vc12/log4tango.sln +++ /dev/null @@ -1,47 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4tango_static", "log4tango_static\log4tango_static.vcxproj", "{BB01FB63-D101-4CE7-80DB-3AF353016DF9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4tango_dll", "log4tango_dll\log4tango_dll.vcxproj", "{987913D3-D3EA-4282-AF9D-00A6C3EC756B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_static", "test_static\test_static.vcxproj", "{DD879332-D3D9-4C64-9C0B-D2D778A1A71B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testDLL", "test_dll\test_dll.vcxproj", "{B999B948-35C2-4C87-A64A-40B54F91FDFC}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Debug|Win32.ActiveCfg = Debug|x64 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Debug|Win32.Build.0 = Debug|x64 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Debug|x64.ActiveCfg = Release|x64 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|Win32.ActiveCfg = Release|Win32 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|Win32.Build.0 = Release|Win32 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|x64.ActiveCfg = Release|x64 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Debug|Win32.ActiveCfg = Debug|x64 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Debug|Win32.Build.0 = Debug|x64 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Debug|x64.ActiveCfg = Release|x64 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|Win32.ActiveCfg = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|Win32.Build.0 = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|x64.ActiveCfg = Release|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|Win32.ActiveCfg = Debug|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|x64.ActiveCfg = Release|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|x64.Build.0 = Release|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Release|Win32.ActiveCfg = Release|Win32 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Release|x64.ActiveCfg = Release|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Release|x64.Build.0 = Release|x64 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Debug|Win32.ActiveCfg = Debug|x64 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Debug|x64.ActiveCfg = Release|x64 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Release|Win32.ActiveCfg = Release|Win32 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Release|x64.ActiveCfg = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/log4tango/ms64vc12/log4tango_dll/log4tango_dll.vcxproj b/log4tango/ms64vc12/log4tango_dll/log4tango_dll.vcxproj deleted file mode 100755 index 0d323319d..000000000 --- a/log4tango/ms64vc12/log4tango_dll/log4tango_dll.vcxproj +++ /dev/null @@ -1,327 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {987913D3-D3EA-4282-AF9D-00A6C3EC756B} - log4tango_dll - - - - DynamicLibrary - false - MultiByte - v120 - - - DynamicLibrary - false - MultiByte - v120 - - - DynamicLibrary - false - MultiByte - v120 - - - DynamicLibrary - false - MultiByte - v120 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Debug\ - .\lib\ - .\Debug\ - .\Debug\ - true - true - .\Release\ - .\lib\ - .\Release\ - .\Release\ - false - false - log4tangod - log4tango - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/log4tango_dll.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;LOG4TANGO_BUILD_DLL;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - .\Debug/log4tango_dll.pch - .\Debug/ - .\Debug/ - lib/log4tangod.pdb - true - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - NotSet - lib\log4tangod.dll - true - false - true - .\Debug/log4tangod.pdb - false - - - lib\log4tangod.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/log4tango_dll.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;LOG4TANGO_BUILD_DLL;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - .\Debug/log4tango_dll.pch - .\Debug/ - .\Debug/ - lib/log4tangod.pdb - false - Level2 - true - ProgramDatabase - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - NotSet - lib\log4tangod.dll - true - false - true - .\Debug/log4tangod.pdb - false - - - lib\log4tangod.lib - - - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/log4tango_dll.tlb - - - AnySuitable - Speed - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;LOG4TANGO_BUILD_DLL;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/log4tango_dll.pch - .\Release/ - .\Release/ - .\Release/ - true - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - lib\log4tango.dll - true - false - .\Release/log4tango.pdb - false - - - lib\log4tango.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/log4tango_dll.tlb - - - AnySuitable - Speed - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;LOG4TANGO_HAS_DLL;LOG4TANGO_BUILD_DLL;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/log4tango_dll.pch - .\Release/ - .\Release/ - .\Release/ - false - Level2 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - lib\log4tango.dll - true - false - .\Release/log4tango.pdb - false - - - lib\log4tango.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/log4tango/ms64vc12/log4tango_static/log4tango_static.vcxproj b/log4tango/ms64vc12/log4tango_static/log4tango_static.vcxproj deleted file mode 100755 index 494299eb7..000000000 --- a/log4tango/ms64vc12/log4tango_static/log4tango_static.vcxproj +++ /dev/null @@ -1,268 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {BB01FB63-D101-4CE7-80DB-3AF353016DF9} - log4tango_static - - - - StaticLibrary - false - MultiByte - v120 - - - StaticLibrary - false - MultiByte - v120 - - - StaticLibrary - false - MultiByte - v120 - - - StaticLibrary - false - MultiByte - v120 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Release\ - .\lib\ - .\Release\ - .\Release\ - .\Debug\ - .\lib\ - .\Debug\ - .\Debug\ - log4tangod - log4tango - - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_LIB;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - - - .\Release/log4tango_static.pch - .\Release/ - .\Release/ - .\Release/ - true - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - lib\log4tango.lib - true - true - - - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_LIB;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - - - .\Release/log4tango_static.pch - .\Release/ - .\Release/ - .\Release/ - false - Level2 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - lib\log4tango.lib - true - true - - - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_LIB;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - - - ./Debug/log4tango_static.pch - .\Debug/ - .\Debug/ - lib/log4tangod.pdb - true - Level3 - true - ProgramDatabase - CompileAsCpp - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - lib\log4tangod.lib - true - true - - - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_LIB;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - - - ./Debug/log4tango_static.pch - .\Debug/ - .\Debug/ - lib/log4tangod.pdb - false - Level2 - true - ProgramDatabase - CompileAsCpp - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - lib\log4tangod.lib - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/log4tango/ms64vc12/test_dll/test_dll.vcxproj b/log4tango/ms64vc12/test_dll/test_dll.vcxproj deleted file mode 100755 index 482f80c03..000000000 --- a/log4tango/ms64vc12/test_dll/test_dll.vcxproj +++ /dev/null @@ -1,258 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - testDLL - {B999B948-35C2-4C87-A64A-40B54F91FDFC} - - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Release\ - .\Release\ - .\Release\ - .\Release\ - false - false - .\Debug\ - .\Debug\ - .\Debug\ - .\Debug\ - true - true - test_dll - test_dll - - - - .\Release/test_dll.tlb - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/test_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;log4tango.lib;%(AdditionalDependencies) - .\Release/test_dll.exe - true - ../log4tango_dll/Release;%(AdditionalLibraryDirectories) - .\Release/test_dll.pdb - Console - false - - - - - - - .\Release/test_dll.tlb - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/test_dll.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - odbc32.lib;odbccp32.lib;log4tango.lib;%(AdditionalDependencies) - .\Release/test_dll.exe - true - ../log4tango_dll/lib;%(AdditionalLibraryDirectories) - .\Release/test_dll.pdb - Console - false - - - - - - - .\Debug/test_dll.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - .\Debug/test_dll.pch - .\Debug/ - .\Debug/ - .\Debug/ - true - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;log4tangod.lib;%(AdditionalDependencies) - .\Debug/test_dll.exe - true - ../log4tango_dll/lib;%(AdditionalLibraryDirectories) - true - .\Debug/test_dll.pdb - Console - false - - - - - - - .\Debug/test_dll.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - .\Debug/test_dll.pch - .\Debug/ - .\Debug/ - .\Debug/ - false - Level3 - true - ProgramDatabase - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - log4tangod.lib - .\Debug/test_dll.exe - true - ../log4tango_dll/lib;%(AdditionalLibraryDirectories) - true - .\Debug/test_dll.pdb - Console - false - - - - - - - MultiThreadedDLL - MultiThreadedDLL - - - - - {987913d3-d3ea-4282-af9d-00a6c3ec756b} - false - - - - - - \ No newline at end of file diff --git a/log4tango/ms64vc12/test_static/test_static.vcxproj b/log4tango/ms64vc12/test_static/test_static.vcxproj deleted file mode 100755 index 12a22a5eb..000000000 --- a/log4tango/ms64vc12/test_static/test_static.vcxproj +++ /dev/null @@ -1,255 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B} - - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - Application - false - MultiByte - - - Application - false - MultiByte - Windows7.1SDK - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - .\Debug\ - .\Debug\ - .\Debug\ - .\Debug\ - true - true - .\Release\ - .\Release\ - .\Release\ - .\Release\ - false - false - - - - .\Debug/test_static.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - .\Debug/_static.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - log4tangod.lib;%(AdditionalDependencies) - .\Debug/test_static.exe - true - ../log4tango_static/lib;%(AdditionalLibraryDirectories) - true - .\Debug/test_static.pdb - Console - false - - - - - - - .\Debug/test_static.tlb - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - .\Debug/_static.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - ProgramDatabase - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - log4tangod.lib;%(AdditionalDependencies) - .\Debug/test_static.exe - true - ../log4tango_static/lib;%(AdditionalLibraryDirectories) - true - .\Debug/test_static.pdb - Console - false - - - - - - - .\Release/test_static.tlb - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\Release/test_static.pch - .\Release/ - .\Release/ - .\Release/ - true - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - log4tango.lib;%(AdditionalDependencies) - .\Release/test_static.exe - true - ../log4tango_static/Release;%(AdditionalLibraryDirectories) - .\Release/test_static.pdb - Console - false - - - - - - - .\Release/test_static.tlb - - - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;%(PreprocessorDefinitions) - true - MultiThreaded - true - - - .\Release/test_static.pch - .\Release/ - .\Release/ - .\Release/ - false - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - log4tango.lib;%(AdditionalDependencies) - .\Release/test_static.exe - true - ../log4tango_static/lib;%(AdditionalLibraryDirectories) - .\Release/test_static.pdb - Console - false - - - - - - - MultiThreadedDLL - MultiThreaded - - - - - {bb01fb63-d101-4ce7-80db-3af353016df9} - false - - - - - - \ No newline at end of file diff --git a/log4tango/ms64vc9/log4tango.sln b/log4tango/ms64vc9/log4tango.sln deleted file mode 100644 index d4820da31..000000000 --- a/log4tango/ms64vc9/log4tango.sln +++ /dev/null @@ -1,50 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4tango_static", "log4tango_static\log4tango_static.vcproj", "{BB01FB63-D101-4CE7-80DB-3AF353016DF9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4tango_dll", "log4tango_dll\log4tango_dll.vcproj", "{987913D3-D3EA-4282-AF9D-00A6C3EC756B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_static", "test_static\test_static.vcproj", "{DD879332-D3D9-4C64-9C0B-D2D778A1A71B}" - ProjectSection(ProjectDependencies) = postProject - {BB01FB63-D101-4CE7-80DB-3AF353016DF9} = {BB01FB63-D101-4CE7-80DB-3AF353016DF9} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testDLL", "test_dll\test_dll.vcproj", "{B999B948-35C2-4C87-A64A-40B54F91FDFC}" - ProjectSection(ProjectDependencies) = postProject - {987913D3-D3EA-4282-AF9D-00A6C3EC756B} = {987913D3-D3EA-4282-AF9D-00A6C3EC756B} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Debug|Win32.ActiveCfg = Debug|Win32 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Debug|x64.ActiveCfg = Release|x64 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|Win32.ActiveCfg = Release|Win32 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|Win32.Build.0 = Release|Win32 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|x64.ActiveCfg = Release|x64 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Debug|Win32.ActiveCfg = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Debug|x64.ActiveCfg = Release|x64 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Debug|x64.Build.0 = Release|x64 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|Win32.ActiveCfg = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|Win32.Build.0 = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|x64.ActiveCfg = Release|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|Win32.ActiveCfg = Debug|Win32 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|Win32.Build.0 = Debug|Win32 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|x64.ActiveCfg = Debug|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Release|Win32.ActiveCfg = Release|Win32 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Release|x64.ActiveCfg = Release|x64 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Release|x64.Build.0 = Release|x64 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Debug|Win32.ActiveCfg = Debug|Win32 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Debug|x64.ActiveCfg = Debug|x64 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Release|Win32.ActiveCfg = Release|Win32 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Release|x64.ActiveCfg = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/log4tango/ms64vc9/log4tango_dll/log4tango_dll.rc b/log4tango/ms64vc9/log4tango_dll/log4tango_dll.rc deleted file mode 100644 index e46f8dfe9..000000000 --- a/log4tango/ms64vc9/log4tango_dll/log4tango_dll.rc +++ /dev/null @@ -1,54 +0,0 @@ -#ifdef APSTUDIO_INVOKED - #error This file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - -#include "Winver.h" - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,3,2,1 - PRODUCTVERSION 0,0,0,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "Distributed under the terms of the GNU Lesser General Public License (LGPL) version 2.1. See COPYING for details.\0" - VALUE "CompanyName", "initiate by Bastiaan Bakker - Tango custom version by NL-SOLEIL\0" - VALUE "ContributingAuthors", "See documentation\0" - VALUE "FileDescription", "Log library for Tango DLL\0" - VALUE "FileVersion", "2.2.1\0" - VALUE "InternalName", "log4tango\0" - VALUE "LegalCopyright", "Copyright © 2000-2002 the Log4cpp Project, others\0" - VALUE "LegalTrademarks", "\0" -#ifdef _DEBUG - VALUE "OriginalFilename", "log4tango_d.dll\0" -#else - VALUE "OriginalFilename", "log4tango.dll\0" -#endif - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Log library for Tango\0" - VALUE "ProductVersion", "2.2.1\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -// End of version info resource diff --git a/log4tango/ms64vc9/log4tango_dll/log4tango_dll.vcproj b/log4tango/ms64vc9/log4tango_dll/log4tango_dll.vcproj deleted file mode 100644 index 98e0e0206..000000000 --- a/log4tango/ms64vc9/log4tango_dll/log4tango_dll.vcproj +++ /dev/null @@ -1,626 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/log4tango/ms64vc9/log4tango_static/log4tango_static.vcproj b/log4tango/ms64vc9/log4tango_static/log4tango_static.vcproj deleted file mode 100644 index 354fdb8eb..000000000 --- a/log4tango/ms64vc9/log4tango_static/log4tango_static.vcproj +++ /dev/null @@ -1,556 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/log4tango/ms64vc9/test_dll/test_dll.vcproj b/log4tango/ms64vc9/test_dll/test_dll.vcproj deleted file mode 100644 index a355c8387..000000000 --- a/log4tango/ms64vc9/test_dll/test_dll.vcproj +++ /dev/null @@ -1,411 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/log4tango/ms64vc9/test_static/test_static.vcproj b/log4tango/ms64vc9/test_static/test_static.vcproj deleted file mode 100644 index d74ff7f0b..000000000 --- a/log4tango/ms64vc9/test_static/test_static.vcproj +++ /dev/null @@ -1,411 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/log4tango/msvc8/log4tango.sln b/log4tango/msvc8/log4tango.sln deleted file mode 100755 index 06eca9e87..000000000 --- a/log4tango/msvc8/log4tango.sln +++ /dev/null @@ -1,39 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4tango_static", "log4tango_static\log4tango_static.vcproj", "{BB01FB63-D101-4CE7-80DB-3AF353016DF9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4tango_dll", "log4tango_dll\log4tango_dll.vcproj", "{987913D3-D3EA-4282-AF9D-00A6C3EC756B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_static", "test_static\test_static.vcproj", "{DD879332-D3D9-4C64-9C0B-D2D778A1A71B}" - ProjectSection(ProjectDependencies) = postProject - {BB01FB63-D101-4CE7-80DB-3AF353016DF9} = {BB01FB63-D101-4CE7-80DB-3AF353016DF9} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testDLL", "test_dll\test_dll.vcproj", "{B999B948-35C2-4C87-A64A-40B54F91FDFC}" - ProjectSection(ProjectDependencies) = postProject - {987913D3-D3EA-4282-AF9D-00A6C3EC756B} = {987913D3-D3EA-4282-AF9D-00A6C3EC756B} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Debug|Win32.ActiveCfg = Debug|Win32 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Debug|Win32.Build.0 = Debug|Win32 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|Win32.ActiveCfg = Release|Win32 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|Win32.Build.0 = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Debug|Win32.ActiveCfg = Debug|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Debug|Win32.Build.0 = Debug|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|Win32.ActiveCfg = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|Win32.Build.0 = Release|Win32 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|Win32.ActiveCfg = Debug|Win32 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Release|Win32.ActiveCfg = Release|Win32 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Debug|Win32.ActiveCfg = Debug|Win32 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Release|Win32.ActiveCfg = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/log4tango/msvc8/log4tango.suo b/log4tango/msvc8/log4tango.suo deleted file mode 100755 index e7fd09ac2..000000000 Binary files a/log4tango/msvc8/log4tango.suo and /dev/null differ diff --git a/log4tango/msvc8/log4tango_dll/log4tango_dll.rc b/log4tango/msvc8/log4tango_dll/log4tango_dll.rc deleted file mode 100755 index be679392d..000000000 --- a/log4tango/msvc8/log4tango_dll/log4tango_dll.rc +++ /dev/null @@ -1,54 +0,0 @@ -#ifdef APSTUDIO_INVOKED - #error This file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - -#include "Winver.h" - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,3,2,1 - PRODUCTVERSION 0,0,0,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "Distributed under the terms of the GNU Lesser General Public License (LGPL) version 2.1. See COPYING for details.\0" - VALUE "CompanyName", "initiate by Bastiaan Bakker - Tango custom version by NL-SOLEIL\0" - VALUE "ContributingAuthors", "See documentation\0" - VALUE "FileDescription", "Log library for Tango DLL\0" - VALUE "FileVersion", "2.2.1\0" - VALUE "InternalName", "log4tango\0" - VALUE "LegalCopyright", "Copyright © 2000-2002 the Log4cpp Project, others\0" - VALUE "LegalTrademarks", "\0" -#ifdef _DEBUG - VALUE "OriginalFilename", "log4tango_d.dll\0" -#else - VALUE "OriginalFilename", "log4tango.dll\0" -#endif - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Log library for Tango\0" - VALUE "ProductVersion", "2.2.1\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -// End of version info resource diff --git a/log4tango/msvc8/log4tango_dll/log4tango_dll.vcproj b/log4tango/msvc8/log4tango_dll/log4tango_dll.vcproj deleted file mode 100755 index 11c4755d7..000000000 --- a/log4tango/msvc8/log4tango_dll/log4tango_dll.vcproj +++ /dev/null @@ -1,435 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/log4tango/msvc8/log4tango_static/log4tango_static.vcproj b/log4tango/msvc8/log4tango_static/log4tango_static.vcproj deleted file mode 100755 index c0fae3015..000000000 --- a/log4tango/msvc8/log4tango_static/log4tango_static.vcproj +++ /dev/null @@ -1,394 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/log4tango/msvc9/log4tango.sln b/log4tango/msvc9/log4tango.sln deleted file mode 100644 index fd7b58a65..000000000 --- a/log4tango/msvc9/log4tango.sln +++ /dev/null @@ -1,38 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4tango_static", "log4tango_static\log4tango_static.vcproj", "{BB01FB63-D101-4CE7-80DB-3AF353016DF9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4tango_dll", "log4tango_dll\log4tango_dll.vcproj", "{987913D3-D3EA-4282-AF9D-00A6C3EC756B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_static", "test_static\test_static.vcproj", "{DD879332-D3D9-4C64-9C0B-D2D778A1A71B}" - ProjectSection(ProjectDependencies) = postProject - {BB01FB63-D101-4CE7-80DB-3AF353016DF9} = {BB01FB63-D101-4CE7-80DB-3AF353016DF9} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testDLL", "test_dll\test_dll.vcproj", "{B999B948-35C2-4C87-A64A-40B54F91FDFC}" - ProjectSection(ProjectDependencies) = postProject - {987913D3-D3EA-4282-AF9D-00A6C3EC756B} = {987913D3-D3EA-4282-AF9D-00A6C3EC756B} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Debug|Win32.ActiveCfg = Debug|Win32 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|Win32.ActiveCfg = Release|Win32 - {BB01FB63-D101-4CE7-80DB-3AF353016DF9}.Release|Win32.Build.0 = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Debug|Win32.ActiveCfg = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|Win32.ActiveCfg = Release|Win32 - {987913D3-D3EA-4282-AF9D-00A6C3EC756B}.Release|Win32.Build.0 = Release|Win32 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|Win32.ActiveCfg = Debug|Win32 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Debug|Win32.Build.0 = Debug|Win32 - {DD879332-D3D9-4C64-9C0B-D2D778A1A71B}.Release|Win32.ActiveCfg = Release|Win32 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Debug|Win32.ActiveCfg = Debug|Win32 - {B999B948-35C2-4C87-A64A-40B54F91FDFC}.Release|Win32.ActiveCfg = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/log4tango/msvc9/log4tango_dll/log4tango_dll.rc b/log4tango/msvc9/log4tango_dll/log4tango_dll.rc deleted file mode 100644 index be679392d..000000000 --- a/log4tango/msvc9/log4tango_dll/log4tango_dll.rc +++ /dev/null @@ -1,54 +0,0 @@ -#ifdef APSTUDIO_INVOKED - #error This file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - -#include "Winver.h" - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,3,2,1 - PRODUCTVERSION 0,0,0,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "Distributed under the terms of the GNU Lesser General Public License (LGPL) version 2.1. See COPYING for details.\0" - VALUE "CompanyName", "initiate by Bastiaan Bakker - Tango custom version by NL-SOLEIL\0" - VALUE "ContributingAuthors", "See documentation\0" - VALUE "FileDescription", "Log library for Tango DLL\0" - VALUE "FileVersion", "2.2.1\0" - VALUE "InternalName", "log4tango\0" - VALUE "LegalCopyright", "Copyright © 2000-2002 the Log4cpp Project, others\0" - VALUE "LegalTrademarks", "\0" -#ifdef _DEBUG - VALUE "OriginalFilename", "log4tango_d.dll\0" -#else - VALUE "OriginalFilename", "log4tango.dll\0" -#endif - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Log library for Tango\0" - VALUE "ProductVersion", "2.2.1\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -// End of version info resource diff --git a/log4tango/msvc9/log4tango_dll/log4tango_dll.vcproj b/log4tango/msvc9/log4tango_dll/log4tango_dll.vcproj deleted file mode 100644 index 999ded003..000000000 --- a/log4tango/msvc9/log4tango_dll/log4tango_dll.vcproj +++ /dev/null @@ -1,434 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/log4tango/msvc9/log4tango_static/log4tango_static.vcproj b/log4tango/msvc9/log4tango_static/log4tango_static.vcproj deleted file mode 100644 index d7bde69a6..000000000 --- a/log4tango/msvc9/log4tango_static/log4tango_static.vcproj +++ /dev/null @@ -1,396 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/log4tango/msvc9/test_dll/test_dll.vcproj b/log4tango/msvc9/test_dll/test_dll.vcproj deleted file mode 100755 index 58c3bf28b..000000000 --- a/log4tango/msvc9/test_dll/test_dll.vcproj +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/log4tango/msvc9/test_static/test_static.vcproj b/log4tango/msvc9/test_static/test_static.vcproj deleted file mode 100755 index 68eb52d3d..000000000 --- a/log4tango/msvc9/test_static/test_static.vcproj +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/log4tango/src/CMakeLists.txt b/log4tango/src/CMakeLists.txt deleted file mode 100644 index 376602606..000000000 --- a/log4tango/src/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -set(SOURCES - Appender.cpp - AppenderAttachable.cpp - LayoutAppender.cpp - FileAppender.cpp - RollingFileAppender.cpp - OstreamAppender.cpp - Layout.cpp - PatternLayout.cpp - XmlLayout.cpp - Logger.cpp - LogSeparator.cpp - LoggerStream.cpp - LoggingEvent.cpp - Level.cpp - NDC.cpp - Filter.cpp - TimeStamp.cpp - StringUtil.hh - StringUtil.cpp - DllMain.cpp - DummyThreads.cpp - MSThreads.cpp - PThreads.cpp - PortabilityImpl.hh - PortabilityImpl.cpp) - -add_library(log4tango_objects OBJECT ${SOURCES}) -target_compile_options(log4tango_objects PRIVATE -fPIC) \ No newline at end of file diff --git a/log4tango/src/LogStream.cpp b/log4tango/src/LogStream.cpp deleted file mode 100644 index 1596bb347..000000000 --- a/log4tango/src/LogStream.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// -// LogStream.cpp -// -// Copyright (C) : 2000 - 2002 -// LifeLine Networks BV (www.lifeline.nl). All rights reserved. -// Bastiaan Bakker. All rights reserved. -// -// 2004,2005,2006,2007,2008,2009,2010,2011,2012 -// Synchrotron SOLEIL -// L'Orme des Merisiers -// Saint-Aubin - BP 48 - France -// -// This file is part of log4tango. -// -// Log4ango is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Log4tango is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with Log4Tango. If not, see . - -#include "PortabilityImpl.hh" -#include - -namespace log4tango { - -//+---------------------------------------------------------------------------- -// method : LogStream::LogStream -//----------------------------------------------------------------------------- -LogStream::LogStream (LogStreamBuf* log_stream_buf) - : _ostream(log_stream_buf) -{ - //no-op -} - -//+---------------------------------------------------------------------------- -// method : LogStream::~LogStream -//----------------------------------------------------------------------------- -LogStream::~LogStream() -{ - //no-op -} - -} // namespace log4tango diff --git a/log4tango/src/LogStreambuf.cpp b/log4tango/src/LogStreambuf.cpp deleted file mode 100644 index d050ab104..000000000 --- a/log4tango/src/LogStreambuf.cpp +++ /dev/null @@ -1,165 +0,0 @@ -// -// LogStreambuf.cpp -// -// Copyright (C) : 2000 - 2002 -// LifeLine Networks BV (www.lifeline.nl). All rights reserved. -// Bastiaan Bakker. All rights reserved. -// -// 2004,2005,2006,2007,2008,2009,2010,2011,2012 -// Synchrotron SOLEIL -// L'Orme des Merisiers -// Saint-Aubin - BP 48 - France -// -// This file is part of log4tango. -// -// Log4ango is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Log4tango is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with Log4Tango. If not, see . - -#include "PortabilityImpl.hh" -#include - -namespace log4tango { - -//+---------------------------------------------------------------------------- -// method : LogStreamBuf::LogStreamBuf -//----------------------------------------------------------------------------- -LogStreamBuf::LogStreamBuf(Logger* logger, - Level::Value level, - bool filter, - size_t bsize) - : _buffer(0), _logger(logger), _level(level), _filter(filter) -{ -// -// Allocate the buffer -// - _buffer = new char[bsize]; - -// -// Set streambuf pointers -// - if (_buffer) { - setp(_buffer, _buffer + bsize); - } -} - -//+---------------------------------------------------------------------------- -// method : LogStreamBuf::~LogStreamBuf -//----------------------------------------------------------------------------- -LogStreamBuf::~LogStreamBuf() -{ -// -// Flush buffer -// - sync(); - -// -// Release buffer -// - if (_buffer) { - delete[] _buffer; - _buffer = 0; - } -} - -//+---------------------------------------------------------------------------- -// method : LogStreamBuf::xsputn -//----------------------------------------------------------------------------- -std::streamsize LogStreamBuf::xsputn (const char *_in, std::streamsize _in_size) -{ - if (!_buffer) { - return 0; - } - - std::streamsize _M, _Ns; - - for (_Ns = 0; 0 < _in_size;) - - if ((_M = (epptr() - pptr()))) - { - if (_in_size < _M) _M = _in_size; - - ::memcpy(pptr(), _in, _M); - - _in += _M, _Ns += _M, _in_size -= _M, pbump(_M); - } - - else if (flush_buffer() == -1) - - break; - - else - - ++_in, ++_Ns, --_in_size; - - return _Ns; -} - -//+---------------------------------------------------------------------------- -// method : LogStreamBuf::flush_buffer -//----------------------------------------------------------------------------- -int LogStreamBuf::flush_buffer (void) -{ -// -// Be sure we have a valid buffer -// - if (!_buffer) { - return -1; - } - -// -// Get current # chars in buffer -// - - long num_chars = pptr() - pbase(); - -// -// Send buffer to logger's targets -// - - try { - if (_logger) { - if (_filter) { - _logger->log(_level, std::string(pbase(), num_chars)); - } else { - _logger->log_unconditionally(_level, std::string(pbase(), num_chars)); - } - } - } catch (...) { - // ignore exception - } - -// -// Reset put pointer -// - - pbump(-num_chars); - - - return num_chars; -} - -//+---------------------------------------------------------------------------- -// method : LogStreamBuf::sync -//----------------------------------------------------------------------------- -int LogStreamBuf::sync (void) -{ -// -// Flush the buffer -// - - flush_buffer(); - - return 0; -} - -} // namespace log4tango diff --git a/log4tango/src/Makefile.am b/log4tango/src/Makefile.am deleted file mode 100644 index 9797c6909..000000000 --- a/log4tango/src/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -lib_LTLIBRARIES = liblog4tango.la - -INCLUDES = -I$(top_srcdir)/include - -noinst_HEADERS = snprintf.c - -liblog4tango_la_SOURCES = \ - Appender.cpp \ - AppenderAttachable.cpp \ - LayoutAppender.cpp \ - FileAppender.cpp \ - RollingFileAppender.cpp \ - OstreamAppender.cpp \ - Layout.cpp \ - PatternLayout.cpp \ - XmlLayout.cpp \ - Logger.cpp \ - LogSeparator.cpp \ - LoggerStream.cpp \ - LoggingEvent.cpp \ - Level.cpp \ - NDC.cpp \ - Filter.cpp \ - TimeStamp.cpp \ - StringUtil.hh \ - StringUtil.cpp \ - DllMain.cpp \ - DummyThreads.cpp \ - MSThreads.cpp \ - PThreads.cpp \ - PortabilityImpl.hh \ - PortabilityImpl.cpp - -liblog4tango_la_LDFLAGS = -version-info @LT_VERSION@ diff --git a/log4tango/src/Makefile.in b/log4tango/src/Makefile.in deleted file mode 100644 index a736f2e7d..000000000 --- a/log4tango/src/Makefile.in +++ /dev/null @@ -1,621 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/AC_CREATE_PREFIX_CONFIG_H.m4 \ - $(top_srcdir)/m4/AC_CXX_HAVE_SSTREAM.m4 \ - $(top_srcdir)/m4/AC_CXX_NAMESPACES.m4 \ - $(top_srcdir)/m4/AC_C_INT64_T.m4 \ - $(top_srcdir)/m4/AC_FUNC_SNPRINTF.m4 \ - $(top_srcdir)/m4/BB_CHECK_PTHREADS.m4 \ - $(top_srcdir)/m4/BB_ENABLE_DOXYGEN.m4 \ - $(top_srcdir)/m4/CREATE_GENERIC_CONFIG.m4 \ - $(top_srcdir)/m4/PETI_PEDANTIC_GCC.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_SUNPRO_CC.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(libdir)" -LTLIBRARIES = $(lib_LTLIBRARIES) -liblog4tango_la_LIBADD = -am_liblog4tango_la_OBJECTS = Appender.lo AppenderAttachable.lo \ - LayoutAppender.lo FileAppender.lo RollingFileAppender.lo \ - OstreamAppender.lo Layout.lo PatternLayout.lo XmlLayout.lo \ - Logger.lo LogSeparator.lo LoggerStream.lo LoggingEvent.lo \ - Level.lo NDC.lo Filter.lo TimeStamp.lo StringUtil.lo \ - DllMain.lo DummyThreads.lo MSThreads.lo PThreads.lo \ - PortabilityImpl.lo -liblog4tango_la_OBJECTS = $(am_liblog4tango_la_OBJECTS) -liblog4tango_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(liblog4tango_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(liblog4tango_la_SOURCES) -DIST_SOURCES = $(liblog4tango_la_SOURCES) -HEADERS = $(noinst_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GENERIC_CONFIG = @GENERIC_CONFIG@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -lib_LTLIBRARIES = liblog4tango.la -INCLUDES = -I$(top_srcdir)/include -noinst_HEADERS = snprintf.c -liblog4tango_la_SOURCES = \ - Appender.cpp \ - AppenderAttachable.cpp \ - LayoutAppender.cpp \ - FileAppender.cpp \ - RollingFileAppender.cpp \ - OstreamAppender.cpp \ - Layout.cpp \ - PatternLayout.cpp \ - XmlLayout.cpp \ - Logger.cpp \ - LogSeparator.cpp \ - LoggerStream.cpp \ - LoggingEvent.cpp \ - Level.cpp \ - NDC.cpp \ - Filter.cpp \ - TimeStamp.cpp \ - StringUtil.hh \ - StringUtil.cpp \ - DllMain.cpp \ - DummyThreads.cpp \ - MSThreads.cpp \ - PThreads.cpp \ - PortabilityImpl.hh \ - PortabilityImpl.cpp - -liblog4tango_la_LDFLAGS = -version-info @LT_VERSION@ -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -liblog4tango.la: $(liblog4tango_la_OBJECTS) $(liblog4tango_la_DEPENDENCIES) $(EXTRA_liblog4tango_la_DEPENDENCIES) - $(liblog4tango_la_LINK) -rpath $(libdir) $(liblog4tango_la_OBJECTS) $(liblog4tango_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Appender.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AppenderAttachable.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DllMain.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DummyThreads.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileAppender.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Filter.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Layout.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LayoutAppender.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Level.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LogSeparator.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Logger.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LoggerStream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LoggingEvent.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MSThreads.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NDC.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OstreamAppender.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PThreads.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PatternLayout.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PortabilityImpl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RollingFileAppender.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StringUtil.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TimeStamp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlLayout.Plo@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-libLTLIBRARIES - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-libLTLIBRARIES - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/log4tango/tests/Makefile.am b/log4tango/tests/Makefile.am deleted file mode 100644 index 83a42d0a1..000000000 --- a/log4tango/tests/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -TESTS = test_log4tango test_bench - -check_PROGRAMS = $(TESTS) - -#check_DATA = - -#EXTRA_DIST = - -#noinst_PROGRAMS = - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src - -test_log4tango_SOURCES = test_log4tango.cpp -test_log4tango_LDADD = $(top_builddir)/src/liblog4tango.la - -test_bench_SOURCES = clock.cpp clock.hh test_bench.cpp -test_bench_LDADD = $(top_builddir)/src/liblog4tango.la - -distclean-local: - $(RM) -f *.log diff --git a/log4tango/tests/Makefile.in b/log4tango/tests/Makefile.in deleted file mode 100644 index 422e47ba4..000000000 --- a/log4tango/tests/Makefile.in +++ /dev/null @@ -1,624 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -TESTS = test_log4tango$(EXEEXT) test_bench$(EXEEXT) -check_PROGRAMS = $(am__EXEEXT_1) -subdir = tests -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/AC_CREATE_PREFIX_CONFIG_H.m4 \ - $(top_srcdir)/m4/AC_CXX_HAVE_SSTREAM.m4 \ - $(top_srcdir)/m4/AC_CXX_NAMESPACES.m4 \ - $(top_srcdir)/m4/AC_C_INT64_T.m4 \ - $(top_srcdir)/m4/AC_FUNC_SNPRINTF.m4 \ - $(top_srcdir)/m4/BB_CHECK_PTHREADS.m4 \ - $(top_srcdir)/m4/BB_ENABLE_DOXYGEN.m4 \ - $(top_srcdir)/m4/CREATE_GENERIC_CONFIG.m4 \ - $(top_srcdir)/m4/PETI_PEDANTIC_GCC.m4 \ - $(top_srcdir)/m4/RSSH_CHECK_SUNPRO_CC.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__EXEEXT_1 = test_log4tango$(EXEEXT) test_bench$(EXEEXT) -am_test_bench_OBJECTS = clock.$(OBJEXT) test_bench.$(OBJEXT) -test_bench_OBJECTS = $(am_test_bench_OBJECTS) -test_bench_DEPENDENCIES = $(top_builddir)/src/liblog4tango.la -am_test_log4tango_OBJECTS = test_log4tango.$(OBJEXT) -test_log4tango_OBJECTS = $(am_test_log4tango_OBJECTS) -test_log4tango_DEPENDENCIES = $(top_builddir)/src/liblog4tango.la -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(test_bench_SOURCES) $(test_log4tango_SOURCES) -DIST_SOURCES = $(test_bench_SOURCES) $(test_log4tango_SOURCES) -ETAGS = etags -CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GENERIC_CONFIG = @GENERIC_CONFIG@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -#check_DATA = - -#EXTRA_DIST = - -#noinst_PROGRAMS = -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -test_log4tango_SOURCES = test_log4tango.cpp -test_log4tango_LDADD = $(top_builddir)/src/liblog4tango.la -test_bench_SOURCES = clock.cpp clock.hh test_bench.cpp -test_bench_LDADD = $(top_builddir)/src/liblog4tango.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -test_bench$(EXEEXT): $(test_bench_OBJECTS) $(test_bench_DEPENDENCIES) $(EXTRA_test_bench_DEPENDENCIES) - @rm -f test_bench$(EXEEXT) - $(CXXLINK) $(test_bench_OBJECTS) $(test_bench_LDADD) $(LIBS) -test_log4tango$(EXEEXT): $(test_log4tango_OBJECTS) $(test_log4tango_DEPENDENCIES) $(EXTRA_test_log4tango_DEPENDENCIES) - @rm -f test_log4tango$(EXEEXT) - $(CXXLINK) $(test_log4tango_OBJECTS) $(test_log4tango_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clock.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bench.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_log4tango.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ - fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ - else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) - $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-local distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: check-am install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-local distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am - - -distclean-local: - $(RM) -f *.log - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 000000000..53ee37e1a --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,3 @@ +add_subdirectory(client) +add_subdirectory(server) +add_subdirectory(log4tango) \ No newline at end of file diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt new file mode 100644 index 000000000..1a6e8d857 --- /dev/null +++ b/src/client/CMakeLists.txt @@ -0,0 +1,34 @@ +set(SOURCES dbapi_class.cpp + dbapi_server.cpp + dbapi_datum.cpp + dbapi_base.cpp + dbapi_device.cpp + dbapi_history.cpp + dbapi_attribute.cpp + dbapi_cache.cpp + dbapi_serverdata.cpp + devapi_attr.cpp + devapi_base.cpp + devapi_data.cpp + devapi_datahist.cpp + devapi_utils.cpp + devapi_pipe.cpp + api_util.cpp + asynreq.cpp + cbthread.cpp + proxy_asyn.cpp + proxy_asyn_cb.cpp + attr_proxy.cpp + group.cpp + filedatabase.cpp + apiexcept.cpp + accessproxy.cpp + lockthread.cpp + event.cpp + eventkeepalive.cpp + eventqueue.cpp + notifdeventconsumer.cpp + zmqeventconsumer.cpp) + +add_library(client_objects OBJECT ${SOURCES}) +target_compile_options(client_objects PRIVATE -fPIC) \ No newline at end of file diff --git a/cppapi/client/README b/src/client/README similarity index 100% rename from cppapi/client/README rename to src/client/README diff --git a/cppapi/client/accessproxy.cpp b/src/client/accessproxy.cpp similarity index 95% rename from cppapi/client/accessproxy.cpp rename to src/client/accessproxy.cpp index 072cbba21..f81614013 100644 --- a/cppapi/client/accessproxy.cpp +++ b/src/client/accessproxy.cpp @@ -36,7 +36,7 @@ #endif #include -#include +#include #include @@ -234,10 +234,10 @@ AccessControlType AccessProxy::check_access_control(string &devname) if (multi_ip == true) { dvsa.length(2 + host_ips.size()); - dvsa[0] = CORBA::string_dup(user.c_str()); - dvsa[1] = CORBA::string_dup(devname.c_str()); + dvsa[0] = Tango::string_dup(user.c_str()); + dvsa[1] = Tango::string_dup(devname.c_str()); for (unsigned int i = 0;i < host_ips.size();i++) - dvsa[2 + i] = CORBA::string_dup(host_ips[i].c_str()); + dvsa[2 + i] = Tango::string_dup(host_ips[i].c_str()); din << dvsa; dout = command_inout("GetAccessForMultiIp",din); @@ -247,9 +247,9 @@ AccessControlType AccessProxy::check_access_control(string &devname) two_tries = true; dvsa.length(3); - dvsa[0] = CORBA::string_dup(user.c_str()); - dvsa[1] = CORBA::string_dup(host_ips[0].c_str()); - dvsa[2] = CORBA::string_dup(devname.c_str()); + dvsa[0] = Tango::string_dup(user.c_str()); + dvsa[1] = Tango::string_dup(host_ips[0].c_str()); + dvsa[2] = Tango::string_dup(devname.c_str()); din << dvsa; diff --git a/cppapi/client/api_util.cpp b/src/client/api_util.cpp similarity index 97% rename from cppapi/client/api_util.cpp rename to src/client/api_util.cpp index 3e92e3746..e9834218b 100644 --- a/cppapi/client/api_util.cpp +++ b/src/client/api_util.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+================================================================================================================== // // C++ source code file for TANGO api class ApiUtil @@ -34,8 +32,8 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include -#include +#include +#include #ifndef _TG_WINDOWS_ #include @@ -323,7 +321,7 @@ void ApiUtil::create_orb() // bool omni_42_compat = false; - CORBA::ULong omni_vers_hex = omniORB::versionHex(); + DevULong omni_vers_hex = omniORB::versionHex(); if (omni_vers_hex > 0x04020000) omni_42_compat = true; @@ -868,31 +866,31 @@ void ApiUtil::attr_to_device(const AttributeValue *attr_value,const AttributeVal { const DevVarLongArray *tmp_seq_lo; - CORBA::Long *tmp_lo; + DevLong *tmp_lo; const DevVarShortArray *tmp_seq_sh; - CORBA::Short *tmp_sh; + DevShort *tmp_sh; const DevVarDoubleArray *tmp_seq_db; - CORBA::Double *tmp_db; + DevDouble *tmp_db; const DevVarStringArray *tmp_seq_str; - char **tmp_str; + DevString *tmp_str; const DevVarFloatArray *tmp_seq_fl; - CORBA::Float *tmp_fl; + DevFloat *tmp_fl; const DevVarBooleanArray *tmp_seq_boo; - CORBA::Boolean *tmp_boo; + DevBoolean *tmp_boo; const DevVarUShortArray *tmp_seq_ush; - CORBA::UShort *tmp_ush; + DevUShort *tmp_ush; const DevVarCharArray *tmp_seq_uch; - CORBA::Octet *tmp_uch; + DevUChar *tmp_uch; const DevVarLong64Array *tmp_seq_64; - CORBA::LongLong *tmp_lolo; + DevLong64 *tmp_lolo; const DevVarULongArray *tmp_seq_ulo; - CORBA::ULong *tmp_ulo; + DevULong *tmp_ulo; const DevVarULong64Array *tmp_seq_u64; - CORBA::ULongLong *tmp_ulolo; + DevULong64 *tmp_ulolo; const DevVarStateArray *tmp_seq_state; Tango::DevState *tmp_state; - CORBA::ULong max,len; + DevULong max,len; if (vers == 3) { @@ -942,12 +940,12 @@ void ApiUtil::attr_to_device(const AttributeValue *attr_value,const AttributeVal len = tmp_seq_lo->length(); if (tmp_seq_lo->release() == true) { - tmp_lo = (const_cast(tmp_seq_lo))->get_buffer((CORBA::Boolean)true); + tmp_lo = (const_cast(tmp_seq_lo))->get_buffer((DevBoolean)true); dev_attr->LongSeq = new DevVarLongArray(max,len,tmp_lo,true); } else { - tmp_lo = const_cast(tmp_seq_lo->get_buffer()); + tmp_lo = const_cast(tmp_seq_lo->get_buffer()); dev_attr->LongSeq = new DevVarLongArray(max,len,tmp_lo,false); } break; @@ -961,12 +959,12 @@ void ApiUtil::attr_to_device(const AttributeValue *attr_value,const AttributeVal len = tmp_seq_64->length(); if (tmp_seq_64->release() == true) { - tmp_lolo = (const_cast(tmp_seq_64))->get_buffer((CORBA::Boolean)true); + tmp_lolo = (const_cast(tmp_seq_64))->get_buffer((DevBoolean)true); dev_attr->Long64Seq = new DevVarLong64Array(max,len,tmp_lolo,true); } else { - tmp_lolo = const_cast(tmp_seq_64->get_buffer()); + tmp_lolo = const_cast(tmp_seq_64->get_buffer()); dev_attr->Long64Seq = new DevVarLong64Array(max,len,tmp_lolo,false); } break; @@ -980,12 +978,12 @@ void ApiUtil::attr_to_device(const AttributeValue *attr_value,const AttributeVal len = tmp_seq_sh->length(); if (tmp_seq_sh->release() == true) { - tmp_sh = (const_cast(tmp_seq_sh))->get_buffer((CORBA::Boolean)true); + tmp_sh = (const_cast(tmp_seq_sh))->get_buffer((DevBoolean)true); dev_attr->ShortSeq = new DevVarShortArray(max,len,tmp_sh,true); } else { - tmp_sh = const_cast(tmp_seq_sh->get_buffer()); + tmp_sh = const_cast(tmp_seq_sh->get_buffer()); dev_attr->ShortSeq = new DevVarShortArray(max,len,tmp_sh,false); } break; @@ -999,12 +997,12 @@ void ApiUtil::attr_to_device(const AttributeValue *attr_value,const AttributeVal len = tmp_seq_db->length(); if (tmp_seq_db->release() == true) { - tmp_db = (const_cast(tmp_seq_db))->get_buffer((CORBA::Boolean)true); + tmp_db = (const_cast(tmp_seq_db))->get_buffer((DevBoolean)true); dev_attr->DoubleSeq = new DevVarDoubleArray(max,len,tmp_db,true); } else { - tmp_db = const_cast(tmp_seq_db->get_buffer()); + tmp_db = const_cast(tmp_seq_db->get_buffer()); dev_attr->DoubleSeq = new DevVarDoubleArray(max,len,tmp_db,false); } break; @@ -1018,7 +1016,7 @@ void ApiUtil::attr_to_device(const AttributeValue *attr_value,const AttributeVal len = tmp_seq_str->length(); if (tmp_seq_str->release() == true) { - tmp_str = (const_cast(tmp_seq_str))->get_buffer((CORBA::Boolean)true); + tmp_str = (const_cast(tmp_seq_str))->get_buffer((DevBoolean)true); dev_attr->StringSeq = new DevVarStringArray(max,len,tmp_str,true); } else @@ -1037,12 +1035,12 @@ void ApiUtil::attr_to_device(const AttributeValue *attr_value,const AttributeVal len = tmp_seq_fl->length(); if (tmp_seq_fl->release() == true) { - tmp_fl = (const_cast(tmp_seq_fl))->get_buffer((CORBA::Boolean)true); + tmp_fl = (const_cast(tmp_seq_fl))->get_buffer((DevBoolean)true); dev_attr->FloatSeq = new DevVarFloatArray(max,len,tmp_fl,true); } else { - tmp_fl = const_cast(tmp_seq_fl->get_buffer()); + tmp_fl = const_cast(tmp_seq_fl->get_buffer()); dev_attr->FloatSeq = new DevVarFloatArray(max,len,tmp_fl,false); } break; @@ -1056,12 +1054,12 @@ void ApiUtil::attr_to_device(const AttributeValue *attr_value,const AttributeVal len = tmp_seq_boo->length(); if (tmp_seq_boo->release() == true) { - tmp_boo = (const_cast(tmp_seq_boo))->get_buffer((CORBA::Boolean)true); + tmp_boo = (const_cast(tmp_seq_boo))->get_buffer((DevBoolean)true); dev_attr->BooleanSeq = new DevVarBooleanArray(max,len,tmp_boo,true); } else { - tmp_boo = const_cast(tmp_seq_boo->get_buffer()); + tmp_boo = const_cast(tmp_seq_boo->get_buffer()); dev_attr->BooleanSeq = new DevVarBooleanArray(max,len,tmp_boo,false); } break; @@ -1075,12 +1073,12 @@ void ApiUtil::attr_to_device(const AttributeValue *attr_value,const AttributeVal len = tmp_seq_ush->length(); if (tmp_seq_ush->release() == true) { - tmp_ush = (const_cast(tmp_seq_ush))->get_buffer((CORBA::Boolean)true); + tmp_ush = (const_cast(tmp_seq_ush))->get_buffer((DevBoolean)true); dev_attr->UShortSeq = new DevVarUShortArray(max,len,tmp_ush,true); } else { - tmp_ush = const_cast(tmp_seq_ush->get_buffer()); + tmp_ush = const_cast(tmp_seq_ush->get_buffer()); dev_attr->UShortSeq = new DevVarUShortArray(max,len,tmp_ush,false); } break; @@ -1094,12 +1092,12 @@ void ApiUtil::attr_to_device(const AttributeValue *attr_value,const AttributeVal len = tmp_seq_uch->length(); if (tmp_seq_uch->release() == true) { - tmp_uch = (const_cast(tmp_seq_uch))->get_buffer((CORBA::Boolean)true); + tmp_uch = (const_cast(tmp_seq_uch))->get_buffer((DevBoolean)true); dev_attr->UCharSeq = new DevVarCharArray(max,len,tmp_uch,true); } else { - tmp_uch = const_cast(tmp_seq_uch->get_buffer()); + tmp_uch = const_cast(tmp_seq_uch->get_buffer()); dev_attr->UCharSeq = new DevVarCharArray(max,len,tmp_uch,false); } break; @@ -1113,12 +1111,12 @@ void ApiUtil::attr_to_device(const AttributeValue *attr_value,const AttributeVal len = tmp_seq_ulo->length(); if (tmp_seq_ulo->release() == true) { - tmp_ulo = (const_cast(tmp_seq_ulo))->get_buffer((CORBA::Boolean)true); + tmp_ulo = (const_cast(tmp_seq_ulo))->get_buffer((DevBoolean)true); dev_attr->ULongSeq = new DevVarULongArray(max,len,tmp_ulo,true); } else { - tmp_ulo = const_cast(tmp_seq_ulo->get_buffer()); + tmp_ulo = const_cast(tmp_seq_ulo->get_buffer()); dev_attr->ULongSeq = new DevVarULongArray(max,len,tmp_ulo,false); } break; @@ -1132,12 +1130,12 @@ void ApiUtil::attr_to_device(const AttributeValue *attr_value,const AttributeVal len = tmp_seq_u64->length(); if (tmp_seq_u64->release() == true) { - tmp_ulolo = (const_cast(tmp_seq_u64))->get_buffer((CORBA::Boolean)true); + tmp_ulolo = (const_cast(tmp_seq_u64))->get_buffer((DevBoolean)true); dev_attr->ULong64Seq = new DevVarULong64Array(max,len,tmp_ulolo,true); } else { - tmp_ulolo = const_cast(tmp_seq_u64->get_buffer()); + tmp_ulolo = const_cast(tmp_seq_u64->get_buffer()); dev_attr->ULong64Seq = new DevVarULong64Array(max,len,tmp_ulolo,false); } break; @@ -1151,7 +1149,7 @@ void ApiUtil::attr_to_device(const AttributeValue *attr_value,const AttributeVal len = tmp_seq_state->length(); if (tmp_seq_state->release() == true) { - tmp_state = (const_cast(tmp_seq_state))->get_buffer((CORBA::Boolean)true); + tmp_state = (const_cast(tmp_seq_state))->get_buffer((DevBoolean)true); dev_attr->StateSeq = new DevVarStateArray(max,len,tmp_state,true); } else @@ -1847,9 +1845,10 @@ AttributeInfoEx &AttributeInfoEx::operator=(const AttributeConfig_5 *att_5) else memorized = MEMORIZED_WRITE_INIT; } - for (unsigned int j=0; jenum_labels.length(); j++) + enum_labels.clear(); + for (size_t j = 0, size = att_5->enum_labels.length(); j < size; ++j) { - enum_labels[j] = att_5->enum_labels[j]; + enum_labels.push_back(att_5->enum_labels[j].in()); } alarms.min_alarm = att_5->att_alarm.min_alarm; diff --git a/cppapi/client/apiexcept.cpp b/src/client/apiexcept.cpp similarity index 94% rename from cppapi/client/apiexcept.cpp rename to src/client/apiexcept.cpp index 420e20205..5f3a6aee7 100644 --- a/cppapi/client/apiexcept.cpp +++ b/src/client/apiexcept.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================ // // file : apiexcept.cpp @@ -43,7 +41,7 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include +#include namespace Tango { @@ -108,11 +106,11 @@ NamedDevFailedList::NamedDevFailedList(const Tango::MultiDevFailed &corba_ex, errors.length(1); errors[0].severity = Tango::ERR; - errors[0].reason = CORBA::string_dup(reason); - errors[0].origin = CORBA::string_dup(op_name); + errors[0].reason = Tango::string_dup(reason); + errors[0].origin = Tango::string_dup(op_name); string st = desc.str(); - errors[0].desc = CORBA::string_dup(st.c_str()); + errors[0].desc = Tango::string_dup(st.c_str()); } diff --git a/cppapi/client/asynreq.cpp b/src/client/asynreq.cpp similarity index 99% rename from cppapi/client/asynreq.cpp rename to src/client/asynreq.cpp index 5516dd2c0..e98f7cbba 100644 --- a/cppapi/client/asynreq.cpp +++ b/src/client/asynreq.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - // // cpp - C++ source code file for TANGO AsynReq class // diff --git a/cppapi/client/attr_proxy.cpp b/src/client/attr_proxy.cpp similarity index 99% rename from cppapi/client/attr_proxy.cpp rename to src/client/attr_proxy.cpp index 70635ddcb..610b8c558 100644 --- a/cppapi/client/attr_proxy.cpp +++ b/src/client/attr_proxy.cpp @@ -1,4 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; // // attr_proxy.cpp - C++ source code file for TANGO attribute proxy api // @@ -34,7 +33,7 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include +#include #ifdef _TG_WINDOWS_ #include diff --git a/cppapi/client/cbthread.cpp b/src/client/cbthread.cpp similarity index 97% rename from cppapi/client/cbthread.cpp rename to src/client/cbthread.cpp index f14d6f0d9..8bf47b45b 100644 --- a/cppapi/client/cbthread.cpp +++ b/src/client/cbthread.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================ // // file : cbthread.cpp @@ -43,7 +41,7 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include +#include namespace Tango { diff --git a/cppapi/client/dbapi_attribute.cpp b/src/client/dbapi_attribute.cpp similarity index 99% rename from cppapi/client/dbapi_attribute.cpp rename to src/client/dbapi_attribute.cpp index 530013d76..2c42e71d1 100644 --- a/cppapi/client/dbapi_attribute.cpp +++ b/src/client/dbapi_attribute.cpp @@ -1,4 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; // // dbdevice.cpp - C++ source code file for TANGO dbapi class DbAttribute // diff --git a/cppapi/client/dbapi_base.cpp b/src/client/dbapi_base.cpp similarity index 99% rename from cppapi/client/dbapi_base.cpp rename to src/client/dbapi_base.cpp index e5baa406c..a5af4a8d0 100644 --- a/cppapi/client/dbapi_base.cpp +++ b/src/client/dbapi_base.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - // // cpp - C++ source code file for TANGO dbapi class Database // @@ -35,7 +33,7 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include +#include using namespace CORBA; @@ -2918,8 +2916,8 @@ void Database::get_device_property_list(string &dev, const string &wildcard, vec DevVarStringArray send_seq; send_seq.length(2); - send_seq[0] = CORBA::string_dup(dev.c_str()); - send_seq[1] = CORBA::string_dup(wildcard.c_str()); + send_seq[0] = Tango::string_dup(dev.c_str()); + send_seq[1] = Tango::string_dup(wildcard.c_str()); try { @@ -4186,7 +4184,7 @@ CORBA::Any *Database::fill_server_cache(string &ds_name,string &loc_host) DevVarStringArray attr_list; attr_list.length(1); - attr_list[0] = CORBA::string_dup("StoredProcedureRelease"); + attr_list[0] = Tango::string_dup("StoredProcedureRelease"); DeviceAttribute da; try @@ -4430,7 +4428,7 @@ AccessControlType Database::check_access_control(string &devname) { string tmp_err_desc(e.errors[0].desc.in()); tmp_err_desc = tmp_err_desc + "\nControlled access service defined in Db but unreachable --> Read access given to all devices..."; - e.errors[0].desc = CORBA::string_dup(tmp_err_desc.c_str()); + e.errors[0].desc = Tango::string_dup(tmp_err_desc.c_str()); } access_except_errors = e.errors; local_access = ACCESS_READ; diff --git a/cppapi/client/dbapi_cache.cpp b/src/client/dbapi_cache.cpp similarity index 94% rename from cppapi/client/dbapi_cache.cpp rename to src/client/dbapi_cache.cpp index 05ab487c4..0b43d5260 100644 --- a/cppapi/client/dbapi_cache.cpp +++ b/src/client/dbapi_cache.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //+================================================================================================================= // // file : Deviceclass.cpp @@ -315,7 +313,7 @@ const DevVarLongStringArray *DbServerCache::import_adm_dev() imp_adm_data.lvalue[1] = ::atoi((*data_list)[imp_adm.last_idx]); for (int loop = 0;loop < 5;loop++) - imp_adm_data.svalue[loop] = CORBA::string_dup((*data_list)[imp_adm.first_idx + loop]); + imp_adm_data.svalue[loop] = Tango::string_dup((*data_list)[imp_adm.first_idx + loop]); return &imp_adm_data; } @@ -348,7 +346,7 @@ const DevVarLongStringArray *DbServerCache::import_notifd_event() imp_notifd_event_data.lvalue[1] = ::atoi((*data_list)[imp_notifd_event.last_idx]); for (int loop = 0;loop < 4;loop++) - imp_notifd_event_data.svalue[loop] = CORBA::string_dup((*data_list)[imp_notifd_event.first_idx + loop]); + imp_notifd_event_data.svalue[loop] = Tango::string_dup((*data_list)[imp_notifd_event.first_idx + loop]); return &imp_notifd_event_data; } @@ -382,7 +380,7 @@ const DevVarLongStringArray *DbServerCache::import_adm_event() imp_adm_event_data.lvalue[1] = ::atoi((*data_list)[imp_notifd_event.last_idx]); for (int loop = 0;loop < 4;loop++) - imp_adm_event_data.svalue[loop] = CORBA::string_dup((*data_list)[imp_adm_event.first_idx + loop]); + imp_adm_event_data.svalue[loop] = Tango::string_dup((*data_list)[imp_adm_event.first_idx + loop]); return &imp_adm_event_data; } @@ -413,21 +411,21 @@ const DevVarStringArray *DbServerCache::get_class_property(DevVarStringArray *in if (TG_strcasecmp((*in_param)[0],"DServer") == 0) { ret_obj_prop.length(ret_length); - ret_obj_prop[0] = CORBA::string_dup("DServer"); + ret_obj_prop[0] = Tango::string_dup("DServer"); get_obj_prop(in_param,DServer_class_prop); } else if (TG_strcasecmp((*in_param)[0],"Default") == 0) { ret_obj_prop.length(ret_length); - ret_obj_prop[0] = CORBA::string_dup("Default"); + ret_obj_prop[0] = Tango::string_dup("Default"); get_obj_prop(in_param,Default_prop); } else { ret_obj_prop.length(ret_length); - ret_obj_prop[0] = CORBA::string_dup((*in_param)[0]); + ret_obj_prop[0] = Tango::string_dup((*in_param)[0]); int cl_idx = find_class((*in_param)[0]); if (cl_idx != -1) @@ -488,12 +486,12 @@ void DbServerCache::get_obj_prop(DevVarStringArray *in_param,PropEltIdx &obj,boo ret_length = ret_length + 2 + nb_elt; ret_obj_prop.length(ret_length); - ret_obj_prop[old_ret_length] = CORBA::string_dup((*in_param)[loop + 1]); - ret_obj_prop[old_ret_length + 1] = CORBA::string_dup((*data_list)[obj.props_idx[lo] + 1]); + ret_obj_prop[old_ret_length] = Tango::string_dup((*in_param)[loop + 1]); + ret_obj_prop[old_ret_length + 1] = Tango::string_dup((*data_list)[obj.props_idx[lo] + 1]); for (int k = 0;k < nb_elt;k++) { - ret_obj_prop[old_ret_length + 2 + k] = CORBA::string_dup((*data_list)[obj.props_idx[lo] + 2 + k]); + ret_obj_prop[old_ret_length + 2 + k] = Tango::string_dup((*data_list)[obj.props_idx[lo] + 2 + k]); } found_prop++; break; @@ -507,16 +505,16 @@ void DbServerCache::get_obj_prop(DevVarStringArray *in_param,PropEltIdx &obj,boo ret_length++; ret_obj_prop.length(ret_length); - ret_obj_prop[old_length] = CORBA::string_dup((*in_param)[loop + 1]); - ret_obj_prop[old_length + 1] = CORBA::string_dup("0"); + ret_obj_prop[old_length] = Tango::string_dup((*in_param)[loop + 1]); + ret_obj_prop[old_length + 1] = Tango::string_dup("0"); if (dev_prop == true) - ret_obj_prop[old_length + 2] = CORBA::string_dup(" "); + ret_obj_prop[old_length + 2] = Tango::string_dup(" "); found_prop++; } } ::sprintf(n_prop_str,"%d",found_prop); - ret_obj_prop[1] = CORBA::string_dup(n_prop_str); + ret_obj_prop[1] = Tango::string_dup(n_prop_str); // cout4 << "DbCache --> Data returned for a get_obj_property for object " << (*in_param)[0] << endl; // for (unsigned int ll=0;ll< ret_obj_prop.length();ll++) @@ -561,7 +559,7 @@ const DevVarStringArray *DbServerCache::get_dev_property(DevVarStringArray *in_p (const char *)"DbServerCache::get_dev_property"); } ret_obj_prop.length(ret_length); - ret_obj_prop[0] = CORBA::string_dup((*in_param)[0]); + ret_obj_prop[0] = Tango::string_dup((*in_param)[0]); get_obj_prop(in_param,adm_dev_prop,true); } @@ -580,7 +578,7 @@ const DevVarStringArray *DbServerCache::get_dev_property(DevVarStringArray *in_p else { ret_obj_prop.length(ret_length); - ret_obj_prop[0] = CORBA::string_dup((*in_param)[0]); + ret_obj_prop[0] = Tango::string_dup((*in_param)[0]); get_obj_prop(in_param,classes_idx[class_ind].devs_idx[dev_ind].dev_prop,true); } @@ -613,7 +611,7 @@ const DevVarStringArray *DbServerCache::get_dev_list(DevVarStringArray *in_param { ret_dev_list.length(classes_idx[cl_idx].dev_nb); for (int loop = 0;loop < classes_idx[cl_idx].dev_nb;loop++) - ret_dev_list[loop] = CORBA::string_dup((*data_list)[classes_idx[cl_idx].dev_list.first_idx + 2 + loop]); + ret_dev_list[loop] = Tango::string_dup((*data_list)[classes_idx[cl_idx].dev_list.first_idx + 2 + loop]); } else ret_dev_list.length(0); @@ -666,7 +664,7 @@ const DevVarStringArray *DbServerCache::get_class_att_property(DevVarStringArray char n_att_str[256]; ret_obj_att_prop.length(2); - ret_obj_att_prop[0] = CORBA::string_dup((*in_param)[0]); + ret_obj_att_prop[0] = Tango::string_dup((*in_param)[0]); int cl_idx = find_class((*in_param)[0]); if (cl_idx != -1) @@ -707,7 +705,7 @@ const DevVarStringArray *DbServerCache::get_class_att_property(DevVarStringArray int old_length = ret_obj_att_prop.length(); ret_obj_att_prop.length(old_length + nb_to_copy); for (int j = 0;j < nb_to_copy;j++) - ret_obj_att_prop[old_length + j] = CORBA::string_dup((*data_list)[att_index + j]); + ret_obj_att_prop[old_length + j] = Tango::string_dup((*data_list)[att_index + j]); found_att++; break; } @@ -717,12 +715,12 @@ const DevVarStringArray *DbServerCache::get_class_att_property(DevVarStringArray found_att++; int old_length = ret_obj_att_prop.length(); ret_obj_att_prop.length(old_length + 2); - ret_obj_att_prop[old_length] = CORBA::string_dup((*in_param)[loop + 1]); - ret_obj_att_prop[old_length + 1] = CORBA::string_dup("0"); + ret_obj_att_prop[old_length] = Tango::string_dup((*in_param)[loop + 1]); + ret_obj_att_prop[old_length + 1] = Tango::string_dup("0"); } } ::sprintf(n_att_str,"%d",found_att); - ret_obj_att_prop[1] = CORBA::string_dup(n_att_str); + ret_obj_att_prop[1] = Tango::string_dup(n_att_str); } else { @@ -763,7 +761,7 @@ const DevVarStringArray *DbServerCache::get_dev_att_property(DevVarStringArray * char n_att_str[256]; ret_obj_att_prop.length(2); - ret_obj_att_prop[0] = CORBA::string_dup((*in_param)[0]); + ret_obj_att_prop[0] = Tango::string_dup((*in_param)[0]); int class_ind,dev_ind; @@ -795,7 +793,7 @@ const DevVarStringArray *DbServerCache::get_dev_att_property(DevVarStringArray * int old_length = ret_obj_att_prop.length(); ret_obj_att_prop.length(old_length + nb_to_copy); for (int j = 0;j < nb_to_copy;j++) - ret_obj_att_prop[old_length + j] = CORBA::string_dup((*data_list)[att_index + j]); + ret_obj_att_prop[old_length + j] = Tango::string_dup((*data_list)[att_index + j]); found_att++; break; } @@ -806,12 +804,12 @@ const DevVarStringArray *DbServerCache::get_dev_att_property(DevVarStringArray * int old_length = ret_obj_att_prop.length(); ret_obj_att_prop.length(old_length + 2); - ret_obj_att_prop[old_length] = CORBA::string_dup((*in_param)[loop + 1]); - ret_obj_att_prop[old_length + 1] = CORBA::string_dup("0"); + ret_obj_att_prop[old_length] = Tango::string_dup((*in_param)[loop + 1]); + ret_obj_att_prop[old_length + 1] = Tango::string_dup("0"); } } ::sprintf(n_att_str,"%d",found_att); - ret_obj_att_prop[1] = CORBA::string_dup(n_att_str); + ret_obj_att_prop[1] = Tango::string_dup(n_att_str); } else { @@ -826,7 +824,7 @@ const DevVarStringArray *DbServerCache::get_dev_att_property(DevVarStringArray * else { ::sprintf(n_att_str,"%d",found_att); - ret_obj_att_prop[1] = CORBA::string_dup(n_att_str); + ret_obj_att_prop[1] = Tango::string_dup(n_att_str); } } @@ -1147,7 +1145,7 @@ const DevVarStringArray *DbServerCache::get_obj_property(DevVarStringArray *in_p int ret_length = 2; ret_obj_prop.length(ret_length); - ret_obj_prop[0] = CORBA::string_dup((*in_param)[0]); + ret_obj_prop[0] = Tango::string_dup((*in_param)[0]); get_obj_prop(in_param,ctrl_serv_prop,true); } @@ -1346,7 +1344,7 @@ void DbServerCache::get_obj_prop_list(DevVarStringArray *in_param,PropEltIdx &ob if (store == true) { ret_prop_list.length(ret_length); - ret_prop_list[ret_length - 1] = CORBA::string_dup((*data_list)[obj.props_idx[lo]]); + ret_prop_list[ret_length - 1] = Tango::string_dup((*data_list)[obj.props_idx[lo]]); ret_length = ret_length + 1; } } @@ -1428,7 +1426,7 @@ const DevVarLongStringArray *DbServerCache::import_tac_dev(string &tac_dev) imp_tac_data.lvalue[1] = ::atoi((*data_list)[imp_tac.last_idx - 1]); for (int loop = 0;loop < 5;loop++) - imp_tac_data.svalue[loop] = CORBA::string_dup((*data_list)[imp_tac.first_idx + loop]); + imp_tac_data.svalue[loop] = Tango::string_dup((*data_list)[imp_tac.first_idx + loop]); return &imp_tac_data; } @@ -1468,7 +1466,7 @@ const DevVarStringArray *DbServerCache::get_class_pipe_property(DevVarStringArra char n_pipe_str[256]; ret_obj_pipe_prop.length(2); - ret_obj_pipe_prop[0] = CORBA::string_dup((*in_param)[0]); + ret_obj_pipe_prop[0] = Tango::string_dup((*in_param)[0]); int cl_idx = find_class((*in_param)[0]); if (cl_idx != -1) @@ -1508,7 +1506,7 @@ const DevVarStringArray *DbServerCache::get_class_pipe_property(DevVarStringArra int old_length = ret_obj_pipe_prop.length(); ret_obj_pipe_prop.length(old_length + nb_to_copy); for (int j = 0;j < nb_to_copy;j++) - ret_obj_pipe_prop[old_length + j] = CORBA::string_dup((*data_list)[pipe_index + j]); + ret_obj_pipe_prop[old_length + j] = Tango::string_dup((*data_list)[pipe_index + j]); found_pipe++; break; } @@ -1518,12 +1516,12 @@ const DevVarStringArray *DbServerCache::get_class_pipe_property(DevVarStringArra found_pipe++; int old_length = ret_obj_pipe_prop.length(); ret_obj_pipe_prop.length(old_length + 2); - ret_obj_pipe_prop[old_length] = CORBA::string_dup((*in_param)[loop + 1]); - ret_obj_pipe_prop[old_length + 1] = CORBA::string_dup("0"); + ret_obj_pipe_prop[old_length] = Tango::string_dup((*in_param)[loop + 1]); + ret_obj_pipe_prop[old_length + 1] = Tango::string_dup("0"); } } ::sprintf(n_pipe_str,"%d",found_pipe); - ret_obj_pipe_prop[1] = CORBA::string_dup(n_pipe_str); + ret_obj_pipe_prop[1] = Tango::string_dup(n_pipe_str); } else { @@ -1576,7 +1574,7 @@ const DevVarStringArray *DbServerCache::get_dev_pipe_property(DevVarStringArray char n_pipe_str[256]; ret_obj_pipe_prop.length(2); - ret_obj_pipe_prop[0] = CORBA::string_dup((*in_param)[0]); + ret_obj_pipe_prop[0] = Tango::string_dup((*in_param)[0]); int class_ind,dev_ind; @@ -1608,7 +1606,7 @@ const DevVarStringArray *DbServerCache::get_dev_pipe_property(DevVarStringArray int old_length = ret_obj_pipe_prop.length(); ret_obj_pipe_prop.length(old_length + nb_to_copy); for (int j = 0;j < nb_to_copy;j++) - ret_obj_pipe_prop[old_length + j] = CORBA::string_dup((*data_list)[pipe_index + j]); + ret_obj_pipe_prop[old_length + j] = Tango::string_dup((*data_list)[pipe_index + j]); found_pipe++; break; } @@ -1619,12 +1617,12 @@ const DevVarStringArray *DbServerCache::get_dev_pipe_property(DevVarStringArray int old_length = ret_obj_pipe_prop.length(); ret_obj_pipe_prop.length(old_length + 2); - ret_obj_pipe_prop[old_length] = CORBA::string_dup((*in_param)[loop + 1]); - ret_obj_pipe_prop[old_length + 1] = CORBA::string_dup("0"); + ret_obj_pipe_prop[old_length] = Tango::string_dup((*in_param)[loop + 1]); + ret_obj_pipe_prop[old_length + 1] = Tango::string_dup("0"); } } ::sprintf(n_pipe_str,"%d",found_pipe); - ret_obj_pipe_prop[1] = CORBA::string_dup(n_pipe_str); + ret_obj_pipe_prop[1] = Tango::string_dup(n_pipe_str); } else { @@ -1639,7 +1637,7 @@ const DevVarStringArray *DbServerCache::get_dev_pipe_property(DevVarStringArray else { ::sprintf(n_pipe_str,"%d",found_pipe); - ret_obj_pipe_prop[1] = CORBA::string_dup(n_pipe_str); + ret_obj_pipe_prop[1] = Tango::string_dup(n_pipe_str); } } diff --git a/cppapi/client/dbapi_class.cpp b/src/client/dbapi_class.cpp similarity index 99% rename from cppapi/client/dbapi_class.cpp rename to src/client/dbapi_class.cpp index 413d1ba3d..81bed0de4 100644 --- a/cppapi/client/dbapi_class.cpp +++ b/src/client/dbapi_class.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //================================================================================================================== // // dbapi_class.cpp - C++ source code file for TANGO dbapi class DbClass diff --git a/cppapi/client/dbapi_datum.cpp b/src/client/dbapi_datum.cpp similarity index 99% rename from cppapi/client/dbapi_datum.cpp rename to src/client/dbapi_datum.cpp index e2c169fb7..3ca77e4fb 100644 --- a/cppapi/client/dbapi_datum.cpp +++ b/src/client/dbapi_datum.cpp @@ -1,4 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; // // dbdatum.cpp - C++ source code file for TANGO dbapi class DbDatum // diff --git a/cppapi/client/dbapi_device.cpp b/src/client/dbapi_device.cpp similarity index 99% rename from cppapi/client/dbapi_device.cpp rename to src/client/dbapi_device.cpp index a94f08ddf..d521eba49 100644 --- a/cppapi/client/dbapi_device.cpp +++ b/src/client/dbapi_device.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //=================================================================================================================== // // dbdevice.cpp - C++ source code file for TANGO dbapi class DbDevice diff --git a/cppapi/client/dbapi_history.cpp b/src/client/dbapi_history.cpp similarity index 99% rename from cppapi/client/dbapi_history.cpp rename to src/client/dbapi_history.cpp index b5e08609a..895f55b9f 100644 --- a/cppapi/client/dbapi_history.cpp +++ b/src/client/dbapi_history.cpp @@ -1,4 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; // // dbapi_history.cpp - C++ source code file for TANGO dbapi class DbHistory // diff --git a/cppapi/client/dbapi_server.cpp b/src/client/dbapi_server.cpp similarity index 99% rename from cppapi/client/dbapi_server.cpp rename to src/client/dbapi_server.cpp index 978205d5c..c4c2ee835 100644 --- a/cppapi/client/dbapi_server.cpp +++ b/src/client/dbapi_server.cpp @@ -1,4 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; // // dbdevice.cpp - C++ source code file for TANGO dbapi class DbServer // diff --git a/cppapi/client/dbapi_serverdata.cpp b/src/client/dbapi_serverdata.cpp similarity index 99% rename from cppapi/client/dbapi_serverdata.cpp rename to src/client/dbapi_serverdata.cpp index c789d2c7e..a10e6a6b6 100644 --- a/cppapi/client/dbapi_serverdata.cpp +++ b/src/client/dbapi_serverdata.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //+=================================================================================================================== // // file : dbapi_serverdata.cpp diff --git a/cppapi/client/devapi_attr.cpp b/src/client/devapi_attr.cpp similarity index 99% rename from cppapi/client/devapi_attr.cpp rename to src/client/devapi_attr.cpp index e4bb1f52a..7e7d28067 100644 --- a/cppapi/client/devapi_attr.cpp +++ b/src/client/devapi_attr.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //=================================================================================================================== // // devapi_attr.cpp - C++ source code file for TANGO devapi class DeviceAttribute @@ -2861,8 +2859,8 @@ void DeviceAttribute::insert(char *&str,unsigned char *&ptr,unsigned int size) DevVarEncodedArray *enc_vararr = new(DevVarEncodedArray); enc_vararr->length(1); - (*enc_vararr)[0].encoded_format = CORBA::string_dup(str); - (*enc_vararr)[0].encoded_data.replace(size,size,(CORBA::Octet *)ptr); + (*enc_vararr)[0].encoded_format = Tango::string_dup(str); + (*enc_vararr)[0].encoded_data.replace(size,size,(DevUChar *)ptr); EncodedSeq = enc_vararr; del_mem(Tango::DEV_ENCODED); @@ -2879,8 +2877,8 @@ void DeviceAttribute::insert(const char *str,unsigned char *ptr,unsigned int siz DevVarEncodedArray *enc_vararr = new(DevVarEncodedArray); enc_vararr->length(1); - (*enc_vararr)[0].encoded_format = CORBA::string_dup(str); - (*enc_vararr)[0].encoded_data.replace(size,size,(CORBA::Octet *)ptr); + (*enc_vararr)[0].encoded_format = Tango::string_dup(str); + (*enc_vararr)[0].encoded_data.replace(size,size,(DevUChar *)ptr); EncodedSeq = enc_vararr; del_mem(Tango::DEV_ENCODED); @@ -2897,7 +2895,7 @@ void DeviceAttribute::insert(const string &str,vector &array) DevVarEncodedArray *enc_vararr = new(DevVarEncodedArray); enc_vararr->length(1); - (*enc_vararr)[0].encoded_format = CORBA::string_dup(str.c_str()); + (*enc_vararr)[0].encoded_format = Tango::string_dup(str.c_str()); (*enc_vararr)[0].encoded_data << array; EncodedSeq = enc_vararr; @@ -2921,7 +2919,7 @@ void DeviceAttribute::insert(const char *str,DevVarCharArray *array) DevVarEncodedArray *enc_vararr = new(DevVarEncodedArray); enc_vararr->length(1); - (*enc_vararr)[0].encoded_format = CORBA::string_dup(str); + (*enc_vararr)[0].encoded_format = Tango::string_dup(str); (*enc_vararr)[0].encoded_data.replace(array->length(),array->length(),array->get_buffer()); EncodedSeq = enc_vararr; @@ -4942,7 +4940,7 @@ bool DeviceAttribute::extract(char *&str,unsigned char *&data_ptr,unsigned int & { if (EncodedSeq->length() != 0) { - str = CORBA::string_dup(EncodedSeq[0].encoded_format.in()); + str = Tango::string_dup(EncodedSeq[0].encoded_format.in()); data_size = EncodedSeq[0].encoded_data.length(); data_ptr = EncodedSeq[0].encoded_data.get_buffer(true); } diff --git a/cppapi/client/devapi_base.cpp b/src/client/devapi_base.cpp similarity index 98% rename from cppapi/client/devapi_base.cpp rename to src/client/devapi_base.cpp index d5d19e1f3..2b84dfab2 100644 --- a/cppapi/client/devapi_base.cpp +++ b/src/client/devapi_base.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //=================================================================================================================== // // devapi_base.cpp - C++ source code file for TANGO device api @@ -34,8 +32,8 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include -#include +#include +#include #ifdef _TG_WINDOWS_ #include @@ -507,9 +505,9 @@ void Connection::connect(string &corba_name) IIOP::ProfileBody pBody; IIOP::unmarshalProfile(ior.profiles[0],pBody); - CORBA::ULong total = pBody.components.length(); + DevULong total = pBody.components.length(); - for (CORBA::ULong index=0; index < total; index++) + for (DevULong index=0; index < total; index++) { IOP::TaggedComponent& c = pBody.components[index]; if (c.tag == 3) @@ -628,12 +626,12 @@ void Connection::toIOR(const char* iorstr,IOP::IOR& ior) s = (s-4)/2; // how many octets are there in the string p += 4; - cdrMemoryStream buf((CORBA::ULong)s,0); + cdrMemoryStream buf((DevULong)s,0); for (int i=0; i<(int)s; i++) { int j = i*2; - CORBA::Octet v; + DevUChar v; if (p[j] >= '0' && p[j] <= '9') { @@ -669,7 +667,7 @@ void Connection::toIOR(const char* iorstr,IOP::IOR& ior) } buf.rewindInputPtr(); - CORBA::Boolean b = buf.unmarshalBoolean(); + DevBoolean b = buf.unmarshalBoolean(); buf.setByteSwapFlag(b); ior.type_id = IOP::IOR::unmarshaltype_id(buf); @@ -5098,10 +5096,10 @@ DevicePipe DeviceProxy::read_pipe(const string& pipe_name) dev_pipe.set_name(pipe_value_5->name.in()); dev_pipe.set_time(pipe_value_5->time); - CORBA::ULong max,len; + DevULong max,len; max = pipe_value_5->data_blob.blob_data.maximum(); len = pipe_value_5->data_blob.blob_data.length(); - DevPipeDataElt *buf = pipe_value_5->data_blob.blob_data.get_buffer((CORBA::Boolean)true); + DevPipeDataElt *buf = pipe_value_5->data_blob.blob_data.get_buffer((DevBoolean)true); DevVarPipeDataEltArray *dvpdea = new DevVarPipeDataEltArray(max,len,buf,true); dev_pipe.get_root_blob().reset_extract_ctr(); @@ -5153,10 +5151,10 @@ void DeviceProxy::write_pipe(DevicePipe& dev_pipe) Except::throw_exception(API_PipeNoDataElement,"No data in pipe!","DeviceProxy::write_pipe()"); } - CORBA::ULong max,len; + DevULong max,len; max = tmp_ptr->maximum(); len = tmp_ptr->length(); - pipe_value_5.data_blob.blob_data.replace(max,len,tmp_ptr->get_buffer((CORBA::Boolean)true),true); + pipe_value_5.data_blob.blob_data.replace(max,len,tmp_ptr->get_buffer((DevBoolean)true),true); while (ctr < 2) { @@ -5279,10 +5277,10 @@ DevicePipe DeviceProxy::write_read_pipe(DevicePipe &pipe_data) pipe_value_5.data_blob.name = bl_name.c_str(); DevVarPipeDataEltArray *tmp_ptr = pipe_data.get_root_blob().get_insert_data(); - CORBA::ULong max,len; + DevULong max,len; max = tmp_ptr->maximum(); len = tmp_ptr->length(); - pipe_value_5.data_blob.blob_data.replace(max,len,tmp_ptr->get_buffer((CORBA::Boolean)true),true); + pipe_value_5.data_blob.blob_data.replace(max,len,tmp_ptr->get_buffer((DevBoolean)true),true); delete tmp_ptr; @@ -5364,7 +5362,7 @@ DevicePipe DeviceProxy::write_read_pipe(DevicePipe &pipe_data) max = r_pipe_value_5->data_blob.blob_data.maximum(); len = r_pipe_value_5->data_blob.blob_data.length(); - DevPipeDataElt *buf = r_pipe_value_5->data_blob.blob_data.get_buffer((CORBA::Boolean)true); + DevPipeDataElt *buf = r_pipe_value_5->data_blob.blob_data.get_buffer((DevBoolean)true); DevVarPipeDataEltArray *dvpdea = new DevVarPipeDataEltArray(max,len,buf,true); r_dev_pipe.get_root_blob().reset_extract_ctr(); @@ -5565,11 +5563,11 @@ vector *DeviceProxy::read_attributes(vector& attr_strin desc << ", attribute " << (*dev_attr)[i].name << ends; err_list.inout().length(nb_except + 1); - err_list[nb_except].reason = CORBA::string_dup(API_AttributeFailed); - err_list[nb_except].origin = CORBA::string_dup("DeviceProxy::read_attributes()"); + err_list[nb_except].reason = Tango::string_dup(API_AttributeFailed); + err_list[nb_except].origin = Tango::string_dup("DeviceProxy::read_attributes()"); string st = desc.str(); - err_list[nb_except].desc = CORBA::string_dup(st.c_str()); + err_list[nb_except].desc = Tango::string_dup(st.c_str()); err_list[nb_except].severity = Tango::ERR; } } @@ -5601,7 +5599,7 @@ DeviceAttribute DeviceProxy::read_attribute(string& attr_string) Tango::DevSource local_source; attr_list.length(1); - attr_list[0] = CORBA::string_dup(attr_string.c_str()); + attr_list[0] = Tango::string_dup(attr_string.c_str()); while (ctr < 2) { @@ -5667,11 +5665,11 @@ DeviceAttribute DeviceProxy::read_attribute(string& attr_string) desc << ", attribute " << dev_attr.name << ends; err_list.inout().length(nb_except + 1); - err_list[nb_except].reason = CORBA::string_dup(API_AttributeFailed); - err_list[nb_except].origin = CORBA::string_dup("DeviceProxy::read_attribute()"); + err_list[nb_except].reason = Tango::string_dup(API_AttributeFailed); + err_list[nb_except].origin = Tango::string_dup("DeviceProxy::read_attribute()"); string st = desc.str(); - err_list[nb_except].desc = CORBA::string_dup(st.c_str()); + err_list[nb_except].desc = Tango::string_dup(st.c_str()); err_list[nb_except].severity = Tango::ERR; } } @@ -5695,7 +5693,7 @@ void DeviceProxy::read_attribute(const char *attr_str,DeviceAttribute &dev_attr) Tango::DevSource local_source; attr_list.length(1); - attr_list[0] = CORBA::string_dup(attr_str); + attr_list[0] = Tango::string_dup(attr_str); while (ctr < 2) { @@ -5769,11 +5767,11 @@ void DeviceProxy::read_attribute(const char *attr_str,DeviceAttribute &dev_attr) desc << ", attribute " << dev_attr.name << ends; err_list.inout().length(nb_except + 1); - err_list[nb_except].reason = CORBA::string_dup(API_AttributeFailed); - err_list[nb_except].origin = CORBA::string_dup("DeviceProxy::read_attribute()"); + err_list[nb_except].reason = Tango::string_dup(API_AttributeFailed); + err_list[nb_except].origin = Tango::string_dup("DeviceProxy::read_attribute()"); string st = desc.str(); - err_list[nb_except].desc = CORBA::string_dup(st.c_str()); + err_list[nb_except].desc = Tango::string_dup(st.c_str()); err_list[nb_except].severity = Tango::ERR; } } @@ -5799,7 +5797,7 @@ void DeviceProxy::read_attribute(const string &attr_str,AttributeValue_4 *&av_4) } attr_list.length(1); - attr_list[0] = CORBA::string_dup(attr_str.c_str()); + attr_list[0] = Tango::string_dup(attr_str.c_str()); while (ctr < 2) { @@ -5833,11 +5831,11 @@ void DeviceProxy::read_attribute(const string &attr_str,AttributeValue_4 *&av_4) desc << ", attribute " << attr_str << ends; av_4->err_list.length(nb_except + 1); - av_4->err_list[nb_except].reason = CORBA::string_dup(API_AttributeFailed); - av_4->err_list[nb_except].origin = CORBA::string_dup("DeviceProxy::read_attribute()"); + av_4->err_list[nb_except].reason = Tango::string_dup(API_AttributeFailed); + av_4->err_list[nb_except].origin = Tango::string_dup("DeviceProxy::read_attribute()"); string st = desc.str(); - av_4->err_list[nb_except].desc = CORBA::string_dup(st.c_str()); + av_4->err_list[nb_except].desc = Tango::string_dup(st.c_str()); av_4->err_list[nb_except].severity = Tango::ERR; } } @@ -5856,7 +5854,7 @@ void DeviceProxy::read_attribute(const string &attr_str,AttributeValue_5 *&av_5) } attr_list.length(1); - attr_list[0] = CORBA::string_dup(attr_str.c_str()); + attr_list[0] = Tango::string_dup(attr_str.c_str()); while (ctr < 2) { @@ -5890,11 +5888,11 @@ void DeviceProxy::read_attribute(const string &attr_str,AttributeValue_5 *&av_5) desc << ", attribute " << attr_str << ends; av_5->err_list.length(nb_except + 1); - av_5->err_list[nb_except].reason = CORBA::string_dup(API_AttributeFailed); - av_5->err_list[nb_except].origin = CORBA::string_dup("DeviceProxy::read_attribute()"); + av_5->err_list[nb_except].reason = Tango::string_dup(API_AttributeFailed); + av_5->err_list[nb_except].origin = Tango::string_dup("DeviceProxy::read_attribute()"); string st = desc.str(); - av_5->err_list[nb_except].desc = CORBA::string_dup(st.c_str()); + av_5->err_list[nb_except].desc = Tango::string_dup(st.c_str()); av_5->err_list[nb_except].severity = Tango::ERR; } } @@ -7247,9 +7245,9 @@ void DeviceProxy::poll_command(string &cmd_name, int period) in.lvalue.length(1); in.svalue.length(3); - in.svalue[0] = CORBA::string_dup(device_name.c_str()); - in.svalue[1] = CORBA::string_dup("command"); - in.svalue[2] = CORBA::string_dup(cmd_name.c_str()); + in.svalue[0] = Tango::string_dup(device_name.c_str()); + in.svalue[1] = Tango::string_dup("command"); + in.svalue[2] = Tango::string_dup(cmd_name.c_str()); in.lvalue[0] = period; if (poll == true) @@ -7329,9 +7327,9 @@ void DeviceProxy::poll_attribute(string &attr_name, int period) in.lvalue.length(1); in.svalue.length(3); - in.svalue[0] = CORBA::string_dup(device_name.c_str()); - in.svalue[1] = CORBA::string_dup("attribute"); - in.svalue[2] = CORBA::string_dup(attr_name.c_str()); + in.svalue[0] = Tango::string_dup(device_name.c_str()); + in.svalue[1] = Tango::string_dup("attribute"); + in.svalue[2] = Tango::string_dup(attr_name.c_str()); in.lvalue[0] = period; if (poll == true) @@ -7432,9 +7430,9 @@ void DeviceProxy::stop_poll_command(string &cmd_name) DevVarStringArray in; in.length(3); - in[0] = CORBA::string_dup(device_name.c_str()); - in[1] = CORBA::string_dup("command"); - in[2] = CORBA::string_dup(cmd_name.c_str()); + in[0] = Tango::string_dup(device_name.c_str()); + in[1] = Tango::string_dup("command"); + in[2] = Tango::string_dup(cmd_name.c_str()); DeviceData din; string cmd("RemObjPolling"); @@ -7464,9 +7462,9 @@ void DeviceProxy::stop_poll_attribute(string &attr_name) DevVarStringArray in; in.length(3); - in[0] = CORBA::string_dup(device_name.c_str()); - in[1] = CORBA::string_dup("attribute"); - in[2] = CORBA::string_dup(attr_name.c_str()); + in[0] = Tango::string_dup(device_name.c_str()); + in[1] = Tango::string_dup("attribute"); + in[2] = Tango::string_dup(attr_name.c_str()); DeviceData din; string cmd("RemObjPolling"); @@ -7496,8 +7494,8 @@ void DeviceProxy::add_logging_target(const string &target_type_name) DevVarStringArray in(2); in.length(2); - in[0] = CORBA::string_dup(device_name.c_str()); - in[1] = CORBA::string_dup(target_type_name.c_str()); + in[0] = Tango::string_dup(device_name.c_str()); + in[1] = Tango::string_dup(target_type_name.c_str()); DeviceData din; string cmd("AddLoggingTarget"); @@ -7525,8 +7523,8 @@ void DeviceProxy::remove_logging_target (const string &target_type_name) DevVarStringArray in(2); in.length(2); - in[0] = CORBA::string_dup(device_name.c_str()); - in[1] = CORBA::string_dup(target_type_name.c_str()); + in[0] = Tango::string_dup(device_name.c_str()); + in[1] = Tango::string_dup(target_type_name.c_str()); DeviceData din; string cmd("RemoveLoggingTarget"); @@ -7588,7 +7586,7 @@ int DeviceProxy::get_logging_level (void) DevVarStringArray in; in.length(1); - in[0] = CORBA::string_dup(device_name.c_str()); + in[0] = Tango::string_dup(device_name.c_str()); DeviceData din; din.any <<= in; @@ -7644,7 +7642,7 @@ void DeviceProxy::set_logging_level (int level) in.lvalue.length(1); in.lvalue[0] = level; in.svalue.length(1); - in.svalue[0] = CORBA::string_dup(device_name.c_str()); + in.svalue[0] = Tango::string_dup(device_name.c_str()); DeviceData din; din.any <<= in; @@ -8367,7 +8365,7 @@ void DeviceProxy::lock(int lock_validity) DeviceData din; DevVarLongStringArray sent_data; sent_data.svalue.length(1); - sent_data.svalue[0] = CORBA::string_dup(device_name.c_str()); + sent_data.svalue[0] = Tango::string_dup(device_name.c_str()); sent_data.lvalue.length(1); sent_data.lvalue[0] = lock_validity; din << sent_data; @@ -8498,7 +8496,7 @@ void DeviceProxy::unlock(bool force) DeviceData din,dout; DevVarLongStringArray sent_data; sent_data.svalue.length(1); - sent_data.svalue[0] = CORBA::string_dup(device_name.c_str()); + sent_data.svalue[0] = Tango::string_dup(device_name.c_str()); sent_data.lvalue.length(1); if (force == true) sent_data.lvalue[0] = 1; @@ -9018,7 +9016,7 @@ DeviceAttribute DeviceProxy::write_read_attribute(DeviceAttribute &dev_attr) Tango::DevVarStringArray dvsa; dvsa.length(1); - dvsa[0] = CORBA::string_dup(dev_attr.name.c_str()); + dvsa[0] = Tango::string_dup(dev_attr.name.c_str()); int ctr = 0; AttributeValueList_4_var attr_value_list_4; @@ -9183,11 +9181,11 @@ DeviceAttribute DeviceProxy::write_read_attribute(DeviceAttribute &dev_attr) desc << ", attribute " << dev_attr.name << ends; err_list.inout().length(nb_except + 1); - err_list[nb_except].reason = CORBA::string_dup(API_AttributeFailed); - err_list[nb_except].origin = CORBA::string_dup("DeviceProxy::write_read_attribute()"); + err_list[nb_except].reason = Tango::string_dup(API_AttributeFailed); + err_list[nb_except].origin = Tango::string_dup("DeviceProxy::write_read_attribute()"); string st = desc.str(); - err_list[nb_except].desc = CORBA::string_dup(st.c_str()); + err_list[nb_except].desc = Tango::string_dup(st.c_str()); err_list[nb_except].severity = Tango::ERR; } @@ -9428,11 +9426,11 @@ vector *DeviceProxy::write_read_attributes(vector> (DevEncoded &datum) { datum.encoded_data[i] = tmp_enc->encoded_data[i]; } - datum.encoded_format = CORBA::string_dup(tmp_enc->encoded_format); + datum.encoded_format = Tango::string_dup(tmp_enc->encoded_format); } } return ret; @@ -1942,7 +1940,7 @@ bool DeviceData::operator >> (const DevVarDoubleStringArray* &datum) void DeviceData::insert (const string &str_datum, vector& char_datum) { DevEncoded *the_enc = new DevEncoded(); - the_enc->encoded_format = CORBA::string_dup(str_datum.c_str()); + the_enc->encoded_format = Tango::string_dup(str_datum.c_str()); the_enc->encoded_data.replace(char_datum.size(),char_datum.size(),&(char_datum[0]),false); any.inout() <<= the_enc; @@ -1958,7 +1956,7 @@ void DeviceData::insert (const string &str_datum, vector& char_da void DeviceData::insert (const char *str_datum, DevVarCharArray *char_datum) { DevEncoded *the_enc = new DevEncoded(); - the_enc->encoded_format = CORBA::string_dup(str_datum); + the_enc->encoded_format = Tango::string_dup(str_datum); the_enc->encoded_data.replace(char_datum->length(),char_datum->length(),char_datum->get_buffer(),false); any.inout() <<= the_enc; @@ -1974,7 +1972,7 @@ void DeviceData::insert (const char *str_datum, DevVarCharArray *char_datum) void DeviceData::insert (const char *str_datum,unsigned char *data,unsigned int length) { DevEncoded *the_enc = new DevEncoded(); - the_enc->encoded_format = CORBA::string_dup(str_datum); + the_enc->encoded_format = Tango::string_dup(str_datum); the_enc->encoded_data.replace(length,length,data,false); any.inout() <<= the_enc; diff --git a/cppapi/client/devapi_datahist.cpp b/src/client/devapi_datahist.cpp similarity index 94% rename from cppapi/client/devapi_datahist.cpp rename to src/client/devapi_datahist.cpp index b41294978..fbb6d65e6 100644 --- a/cppapi/client/devapi_datahist.cpp +++ b/src/client/devapi_datahist.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - // // devapi_datahist.cpp - C++ source code file for TANGO devapi class // DeviceDataHistory and DeviceAttributeHistory @@ -363,31 +361,31 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_var &seq name = seq[n].value.name; const DevVarLongArray *tmp_seq_lo; - CORBA::Long *tmp_lo; + DevLong *tmp_lo; const DevVarLong64Array *tmp_seq_lolo; - CORBA::LongLong *tmp_lolo; + DevLong64 *tmp_lolo; const DevVarShortArray *tmp_seq_sh; - CORBA::Short *tmp_sh; + DevShort *tmp_sh; const DevVarDoubleArray *tmp_seq_db; - CORBA::Double *tmp_db; + DevDouble *tmp_db; const DevVarStringArray *tmp_seq_str; char **tmp_str; const DevVarFloatArray *tmp_seq_fl; - CORBA::Float *tmp_fl; + DevFloat *tmp_fl; const DevVarBooleanArray *tmp_seq_boo; - CORBA::Boolean *tmp_boo; + DevBoolean *tmp_boo; const DevVarUShortArray *tmp_seq_ush; - CORBA::UShort *tmp_ush; + DevUShort *tmp_ush; const DevVarCharArray *tmp_seq_uch; - CORBA::Octet *tmp_uch; + DevUChar *tmp_uch; const DevVarULongArray *tmp_seq_ulo; - CORBA::ULong *tmp_ulo; + DevULong *tmp_ulo; const DevVarULong64Array *tmp_seq_ulolo; - CORBA::ULongLong *tmp_ulolo; + DevULong64 *tmp_ulolo; const DevVarStateArray *tmp_seq_state; Tango::DevState *tmp_state; - CORBA::ULong max,len; + DevULong max,len; if ((fail == false) && (quality != Tango::ATTR_INVALID)) { @@ -400,7 +398,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_var &seq seq[n].value.value >>= tmp_seq_lo; max = tmp_seq_lo->maximum(); len = tmp_seq_lo->length(); - tmp_lo = (const_cast(tmp_seq_lo))->get_buffer((CORBA::Boolean)true); + tmp_lo = (const_cast(tmp_seq_lo))->get_buffer((DevBoolean)true); LongSeq = new DevVarLongArray(max,len,tmp_lo,true); break; @@ -408,7 +406,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_var &seq seq[n].value.value >>= tmp_seq_lolo; max = tmp_seq_lolo->maximum(); len = tmp_seq_lolo->length(); - tmp_lolo = (const_cast(tmp_seq_lolo))->get_buffer((CORBA::Boolean)true); + tmp_lolo = (const_cast(tmp_seq_lolo))->get_buffer((DevBoolean)true); Long64Seq = new DevVarLong64Array(max,len,tmp_lolo,true); break; @@ -416,7 +414,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_var &seq seq[n].value.value >>= tmp_seq_sh; max = tmp_seq_sh->maximum(); len = tmp_seq_sh->length(); - tmp_sh = (const_cast(tmp_seq_sh))->get_buffer((CORBA::Boolean)true); + tmp_sh = (const_cast(tmp_seq_sh))->get_buffer((DevBoolean)true); ShortSeq = new DevVarShortArray(max,len,tmp_sh,true); break; @@ -424,7 +422,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_var &seq seq[n].value.value >>= tmp_seq_db; max = tmp_seq_db->maximum(); len = tmp_seq_db->length(); - tmp_db = (const_cast(tmp_seq_db))->get_buffer((CORBA::Boolean)true); + tmp_db = (const_cast(tmp_seq_db))->get_buffer((DevBoolean)true); DoubleSeq = new DevVarDoubleArray(max,len,tmp_db,true); break; @@ -432,7 +430,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_var &seq seq[n].value.value >>= tmp_seq_str; max = tmp_seq_str->maximum(); len = tmp_seq_str->length(); - tmp_str = (const_cast(tmp_seq_str))->get_buffer((CORBA::Boolean)true); + tmp_str = (const_cast(tmp_seq_str))->get_buffer((DevBoolean)true); StringSeq = new DevVarStringArray(max,len,tmp_str,true); break; @@ -440,7 +438,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_var &seq seq[n].value.value >>= tmp_seq_fl; max = tmp_seq_fl->maximum(); len = tmp_seq_fl->length(); - tmp_fl = (const_cast(tmp_seq_fl))->get_buffer((CORBA::Boolean)true); + tmp_fl = (const_cast(tmp_seq_fl))->get_buffer((DevBoolean)true); FloatSeq = new DevVarFloatArray(max,len,tmp_fl,true); break; @@ -448,7 +446,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_var &seq seq[n].value.value >>= tmp_seq_boo; max = tmp_seq_boo->maximum(); len = tmp_seq_boo->length(); - tmp_boo = (const_cast(tmp_seq_boo))->get_buffer((CORBA::Boolean)true); + tmp_boo = (const_cast(tmp_seq_boo))->get_buffer((DevBoolean)true); BooleanSeq = new DevVarBooleanArray(max,len,tmp_boo,true); break; @@ -456,7 +454,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_var &seq seq[n].value.value >>= tmp_seq_ush; max = tmp_seq_ush->maximum(); len = tmp_seq_ush->length(); - tmp_ush = (const_cast(tmp_seq_ush))->get_buffer((CORBA::Boolean)true); + tmp_ush = (const_cast(tmp_seq_ush))->get_buffer((DevBoolean)true); UShortSeq = new DevVarUShortArray(max,len,tmp_ush,true); break; @@ -464,7 +462,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_var &seq seq[n].value.value >>= tmp_seq_uch; max = tmp_seq_uch->maximum(); len = tmp_seq_uch->length(); - tmp_uch = (const_cast(tmp_seq_uch))->get_buffer((CORBA::Boolean)true); + tmp_uch = (const_cast(tmp_seq_uch))->get_buffer((DevBoolean)true); UCharSeq = new DevVarCharArray(max,len,tmp_uch,true); break; @@ -472,7 +470,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_var &seq seq[n].value.value >>= tmp_seq_ulo; max = tmp_seq_ulo->maximum(); len = tmp_seq_ulo->length(); - tmp_ulo = (const_cast(tmp_seq_ulo))->get_buffer((CORBA::Boolean)true); + tmp_ulo = (const_cast(tmp_seq_ulo))->get_buffer((DevBoolean)true); ULongSeq = new DevVarULongArray(max,len,tmp_ulo,true); break; @@ -480,7 +478,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_var &seq seq[n].value.value >>= tmp_seq_ulolo; max = tmp_seq_ulolo->maximum(); len = tmp_seq_ulolo->length(); - tmp_ulolo = (const_cast(tmp_seq_ulolo))->get_buffer((CORBA::Boolean)true); + tmp_ulolo = (const_cast(tmp_seq_ulolo))->get_buffer((DevBoolean)true); ULong64Seq = new DevVarULong64Array(max,len,tmp_ulolo,true); break; @@ -488,7 +486,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_var &seq seq[n].value.value >>= tmp_seq_state; max = tmp_seq_state->maximum(); len = tmp_seq_state->length(); - tmp_state = (const_cast(tmp_seq_state))->get_buffer((CORBA::Boolean)true); + tmp_state = (const_cast(tmp_seq_state))->get_buffer((DevBoolean)true); StateSeq = new DevVarStateArray(max,len,tmp_state,true); break; @@ -514,31 +512,31 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_3_var &s name = seq[n].value.name; const DevVarLongArray *tmp_seq_lo; - CORBA::Long *tmp_lo; + DevLong *tmp_lo; const DevVarLong64Array *tmp_seq_lolo; - CORBA::LongLong *tmp_lolo; + DevLong64 *tmp_lolo; const DevVarShortArray *tmp_seq_sh; - CORBA::Short *tmp_sh; + DevShort *tmp_sh; const DevVarDoubleArray *tmp_seq_db; - CORBA::Double *tmp_db; + DevDouble *tmp_db; const DevVarStringArray *tmp_seq_str; char **tmp_str; const DevVarFloatArray *tmp_seq_fl; - CORBA::Float *tmp_fl; + DevFloat *tmp_fl; const DevVarBooleanArray *tmp_seq_boo; - CORBA::Boolean *tmp_boo; + DevBoolean *tmp_boo; const DevVarUShortArray *tmp_seq_ush; - CORBA::UShort *tmp_ush; + DevUShort *tmp_ush; const DevVarCharArray *tmp_seq_uch; - CORBA::Octet *tmp_uch; + DevUChar *tmp_uch; const DevVarULongArray *tmp_seq_ulo; - CORBA::ULong *tmp_ulo; + DevULong *tmp_ulo; const DevVarULong64Array *tmp_seq_ulolo; - CORBA::ULongLong *tmp_ulolo; + DevULong64 *tmp_ulolo; const DevVarStateArray *tmp_seq_state; Tango::DevState *tmp_state; - CORBA::ULong max,len; + DevULong max,len; if ((fail == false) && (quality != Tango::ATTR_INVALID)) { @@ -551,7 +549,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_3_var &s seq[n].value.value >>= tmp_seq_lo; max = tmp_seq_lo->maximum(); len = tmp_seq_lo->length(); - tmp_lo = (const_cast(tmp_seq_lo))->get_buffer((CORBA::Boolean)true); + tmp_lo = (const_cast(tmp_seq_lo))->get_buffer((DevBoolean)true); LongSeq = new DevVarLongArray(max,len,tmp_lo,true); break; @@ -559,7 +557,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_3_var &s seq[n].value.value >>= tmp_seq_lolo; max = tmp_seq_lolo->maximum(); len = tmp_seq_lolo->length(); - tmp_lolo = (const_cast(tmp_seq_lolo))->get_buffer((CORBA::Boolean)true); + tmp_lolo = (const_cast(tmp_seq_lolo))->get_buffer((DevBoolean)true); Long64Seq = new DevVarLong64Array(max,len,tmp_lolo,true); break; @@ -567,7 +565,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_3_var &s seq[n].value.value >>= tmp_seq_sh; max = tmp_seq_sh->maximum(); len = tmp_seq_sh->length(); - tmp_sh = (const_cast(tmp_seq_sh))->get_buffer((CORBA::Boolean)true); + tmp_sh = (const_cast(tmp_seq_sh))->get_buffer((DevBoolean)true); ShortSeq = new DevVarShortArray(max,len,tmp_sh,true); break; @@ -575,7 +573,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_3_var &s seq[n].value.value >>= tmp_seq_db; max = tmp_seq_db->maximum(); len = tmp_seq_db->length(); - tmp_db = (const_cast(tmp_seq_db))->get_buffer((CORBA::Boolean)true); + tmp_db = (const_cast(tmp_seq_db))->get_buffer((DevBoolean)true); DoubleSeq = new DevVarDoubleArray(max,len,tmp_db,true); break; @@ -583,7 +581,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_3_var &s seq[n].value.value >>= tmp_seq_str; max = tmp_seq_str->maximum(); len = tmp_seq_str->length(); - tmp_str = (const_cast(tmp_seq_str))->get_buffer((CORBA::Boolean)true); + tmp_str = (const_cast(tmp_seq_str))->get_buffer((DevBoolean)true); StringSeq = new DevVarStringArray(max,len,tmp_str,true); break; @@ -591,7 +589,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_3_var &s seq[n].value.value >>= tmp_seq_fl; max = tmp_seq_fl->maximum(); len = tmp_seq_fl->length(); - tmp_fl = (const_cast(tmp_seq_fl))->get_buffer((CORBA::Boolean)true); + tmp_fl = (const_cast(tmp_seq_fl))->get_buffer((DevBoolean)true); FloatSeq = new DevVarFloatArray(max,len,tmp_fl,true); break; @@ -599,7 +597,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_3_var &s seq[n].value.value >>= tmp_seq_boo; max = tmp_seq_boo->maximum(); len = tmp_seq_boo->length(); - tmp_boo = (const_cast(tmp_seq_boo))->get_buffer((CORBA::Boolean)true); + tmp_boo = (const_cast(tmp_seq_boo))->get_buffer((DevBoolean)true); BooleanSeq = new DevVarBooleanArray(max,len,tmp_boo,true); break; @@ -607,7 +605,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_3_var &s seq[n].value.value >>= tmp_seq_ush; max = tmp_seq_ush->maximum(); len = tmp_seq_ush->length(); - tmp_ush = (const_cast(tmp_seq_ush))->get_buffer((CORBA::Boolean)true); + tmp_ush = (const_cast(tmp_seq_ush))->get_buffer((DevBoolean)true); UShortSeq = new DevVarUShortArray(max,len,tmp_ush,true); break; @@ -615,7 +613,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_3_var &s seq[n].value.value >>= tmp_seq_uch; max = tmp_seq_uch->maximum(); len = tmp_seq_uch->length(); - tmp_uch = (const_cast(tmp_seq_uch))->get_buffer((CORBA::Boolean)true); + tmp_uch = (const_cast(tmp_seq_uch))->get_buffer((DevBoolean)true); UCharSeq = new DevVarCharArray(max,len,tmp_uch,true); break; @@ -623,7 +621,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_3_var &s seq[n].value.value >>= tmp_seq_ulo; max = tmp_seq_ulo->maximum(); len = tmp_seq_ulo->length(); - tmp_ulo = (const_cast(tmp_seq_ulo))->get_buffer((CORBA::Boolean)true); + tmp_ulo = (const_cast(tmp_seq_ulo))->get_buffer((DevBoolean)true); ULongSeq = new DevVarULongArray(max,len,tmp_ulo,true); break; @@ -631,7 +629,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_3_var &s seq[n].value.value >>= tmp_seq_ulolo; max = tmp_seq_ulolo->maximum(); len = tmp_seq_ulolo->length(); - tmp_ulolo = (const_cast(tmp_seq_ulolo))->get_buffer((CORBA::Boolean)true); + tmp_ulolo = (const_cast(tmp_seq_ulolo))->get_buffer((DevBoolean)true); ULong64Seq = new DevVarULong64Array(max,len,tmp_ulolo,true); break; @@ -639,7 +637,7 @@ DeviceAttributeHistory::DeviceAttributeHistory(int n,DevAttrHistoryList_3_var &s seq[n].value.value >>= tmp_seq_state; max = tmp_seq_state->maximum(); len = tmp_seq_state->length(); - tmp_state = (const_cast(tmp_seq_state))->get_buffer((CORBA::Boolean)true); + tmp_state = (const_cast(tmp_seq_state))->get_buffer((DevBoolean)true); StateSeq = new DevVarStateArray(max,len,tmp_state,true); break; diff --git a/cppapi/client/devapi_pipe.cpp b/src/client/devapi_pipe.cpp similarity index 98% rename from cppapi/client/devapi_pipe.cpp rename to src/client/devapi_pipe.cpp index 0583bddd1..78846ad75 100644 --- a/cppapi/client/devapi_pipe.cpp +++ b/src/client/devapi_pipe.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //=================================================================================================================== // // devapi_pipe.cpp - C++ source code file for TANGO devapi class DevicePipe @@ -913,7 +911,7 @@ void DevicePipeBlob::set_data_elt_names(vector &elt_names) for (size_t loop = 0;loop < elt_names.size();loop++) { - (*insert_elt_array)[loop].name = CORBA::string_dup(elt_names[loop].c_str()); + (*insert_elt_array)[loop].name = Tango::string_dup(elt_names[loop].c_str()); (*insert_elt_array)[loop].value.union_no_data(true); (*insert_elt_array)[loop].inner_blob.length(0); } @@ -992,7 +990,7 @@ void DevicePipeBlob::set_current_delt_name(const string &_na) (*insert_elt_array)[insert_ctr].inner_blob.length(0); } - (*insert_elt_array)[insert_ctr].name = CORBA::string_dup(_na.c_str()); + (*insert_elt_array)[insert_ctr].name = Tango::string_dup(_na.c_str()); } //------------------------------------------------------------------------------------------------------------------ @@ -1115,18 +1113,18 @@ DevicePipeBlob & DevicePipeBlob::operator<<(DevString &datum) { DevVarStringArray dvsa; dvsa.length(1); - dvsa[0] = CORBA::string_dup(datum); + dvsa[0] = Tango::string_dup(datum); if (insert_ind != -1) { (*insert_elt_array)[insert_ind].value.string_att_value(dvsa); - (*insert_elt_array)[insert_ctr].inner_blob_name = CORBA::string_dup("Scalar"); + (*insert_elt_array)[insert_ctr].inner_blob_name = Tango::string_dup("Scalar"); insert_ind = -1; } else { (*insert_elt_array)[insert_ctr].value.string_att_value(dvsa); - (*insert_elt_array)[insert_ctr].inner_blob_name = CORBA::string_dup("Scalar"); + (*insert_elt_array)[insert_ctr].inner_blob_name = Tango::string_dup("Scalar"); insert_ctr++; } } @@ -1180,18 +1178,18 @@ DevicePipeBlob & DevicePipeBlob::operator<<(const string &datum) { DevVarStringArray dvsa; dvsa.length(1); - dvsa[0] = CORBA::string_dup(datum.c_str()); + dvsa[0] = Tango::string_dup(datum.c_str()); if (insert_ind != -1) { (*insert_elt_array)[insert_ind].value.string_att_value(dvsa); - (*insert_elt_array)[insert_ind].inner_blob_name = CORBA::string_dup("Scalar"); + (*insert_elt_array)[insert_ind].inner_blob_name = Tango::string_dup("Scalar"); insert_ind = -1; } else { (*insert_elt_array)[insert_ctr].value.string_att_value(dvsa); - (*insert_elt_array)[insert_ctr].inner_blob_name = CORBA::string_dup("Scalar"); + (*insert_elt_array)[insert_ctr].inner_blob_name = Tango::string_dup("Scalar"); insert_ctr++; } } @@ -1231,20 +1229,20 @@ DevicePipeBlob & DevicePipeBlob::operator<<(DevicePipeBlob &datum) DevVarPipeDataEltArray *tmp_ptr = datum.get_insert_data(); if (tmp_ptr != Tango_nullptr) { - CORBA::ULong max,len; + DevULong max,len; max = tmp_ptr->maximum(); len = tmp_ptr->length(); if (insert_ind != -1) { - (*insert_elt_array)[insert_ind].inner_blob.replace(max,len,tmp_ptr->get_buffer((CORBA::Boolean)true),true); - (*insert_elt_array)[insert_ind].inner_blob_name = CORBA::string_dup(datum.get_name().c_str()); + (*insert_elt_array)[insert_ind].inner_blob.replace(max,len,tmp_ptr->get_buffer((DevBoolean)true),true); + (*insert_elt_array)[insert_ind].inner_blob_name = Tango::string_dup(datum.get_name().c_str()); insert_ind = -1; } else { - (*insert_elt_array)[insert_ctr].inner_blob.replace(max,len,tmp_ptr->get_buffer((CORBA::Boolean)true),true); - (*insert_elt_array)[insert_ctr].inner_blob_name = CORBA::string_dup(datum.get_name().c_str()); + (*insert_elt_array)[insert_ctr].inner_blob.replace(max,len,tmp_ptr->get_buffer((DevBoolean)true),true); + (*insert_elt_array)[insert_ctr].inner_blob_name = Tango::string_dup(datum.get_name().c_str()); insert_ctr++; } @@ -1422,7 +1420,7 @@ DevicePipeBlob & DevicePipeBlob::operator<<(vector &datum) size_t nb = datum.size(); char **strvec = DevVarStringArray::allocbuf(nb); for (size_t i = 0;i < nb;i++) - strvec[i] = CORBA::string_dup(datum[i].c_str()); + strvec[i] = Tango::string_dup(datum[i].c_str()); DevVarStringArray dvsa; if (insert_ind != -1) @@ -1747,7 +1745,7 @@ DevicePipeBlob &DevicePipeBlob::operator >> (DevString &datum) } else { - datum = CORBA::string_dup((uni_ptr->string_att_value())[0].in()); + datum = Tango::string_dup((uni_ptr->string_att_value())[0].in()); if (extract_ind != -1) extract_ind = -1; else diff --git a/cppapi/client/devapi_utils.cpp b/src/client/devapi_utils.cpp similarity index 95% rename from cppapi/client/devapi_utils.cpp rename to src/client/devapi_utils.cpp index bdbda51c9..604a33dbd 100644 --- a/cppapi/client/devapi_utils.cpp +++ b/src/client/devapi_utils.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //+================================================================================================================== // devapi_utils.cpp - C++ source code file for TANGO device api // @@ -272,8 +270,8 @@ void DeviceProxy::from_hist4_2_DataHistory(DevCmdHistory_4_var &hist_4,vectorget_buffer(); - CORBA::Short *seq_buff = const_cast(c_seq_buff); + const DevShort *c_seq_buff = tmp_sh->get_buffer(); + DevShort *seq_buff = const_cast(c_seq_buff); Tango::DevVarShortArray ShortSeq = DevVarShortArray(data_length,data_length,&(seq_buff[base - data_length]),false); CORBA::Any *any_ptr = new CORBA::Any(); @@ -293,8 +291,8 @@ void DeviceProxy::from_hist4_2_DataHistory(DevCmdHistory_4_var &hist_4,vectorget_buffer(); - CORBA::Long *seq_buff = const_cast(c_seq_buff); + const DevLong *c_seq_buff = tmp_lg->get_buffer(); + DevLong *seq_buff = const_cast(c_seq_buff); Tango::DevVarLongArray LongSeq = DevVarLongArray(data_length,data_length,&(seq_buff[base - data_length]),false); CORBA::Any *any_ptr = new CORBA::Any(); @@ -314,8 +312,8 @@ void DeviceProxy::from_hist4_2_DataHistory(DevCmdHistory_4_var &hist_4,vectorget_buffer(); - CORBA::Float *seq_buff = const_cast(c_seq_buff); + const DevFloat *c_seq_buff = tmp_fl->get_buffer(); + DevFloat *seq_buff = const_cast(c_seq_buff); Tango::DevVarFloatArray FloatSeq = DevVarFloatArray(data_length,data_length,&(seq_buff[base - data_length]),false); CORBA::Any *any_ptr = new CORBA::Any(); @@ -335,8 +333,8 @@ void DeviceProxy::from_hist4_2_DataHistory(DevCmdHistory_4_var &hist_4,vectorget_buffer(); - CORBA::Double *seq_buff = const_cast(c_seq_buff); + const DevDouble *c_seq_buff = tmp_db->get_buffer(); + DevDouble *seq_buff = const_cast(c_seq_buff); Tango::DevVarDoubleArray DoubleSeq = DevVarDoubleArray(data_length,data_length,&(seq_buff[base - data_length]),false); CORBA::Any *any_ptr = new CORBA::Any(); @@ -356,8 +354,8 @@ void DeviceProxy::from_hist4_2_DataHistory(DevCmdHistory_4_var &hist_4,vectorget_buffer(); - CORBA::LongLong *seq_buff = const_cast(c_seq_buff); + const DevLong64 *c_seq_buff = tmp_lg64->get_buffer(); + DevLong64 *seq_buff = const_cast(c_seq_buff); Tango::DevVarLong64Array Long64Seq = DevVarLong64Array(data_length,data_length,&(seq_buff[base - data_length]),false); CORBA::Any *any_ptr = new CORBA::Any(); @@ -521,7 +519,7 @@ void DeviceProxy::from_hist4_2_DataHistory(DevCmdHistory_4_var &hist_4,vector -#include +#include #include @@ -347,8 +345,8 @@ void EventConsumerKeepAliveThread::re_subscribe_event(EvCbIte &epos,EvChanIte &i CosNotifyFilter::ConstraintExpSeq exp; exp.length(1); exp[0].event_types = evs; - exp[0].constraint_expr = CORBA::string_dup(constraint_expr.c_str()); - CORBA::Boolean res = 0; // OK + exp[0].constraint_expr = Tango::string_dup(constraint_expr.c_str()); + DevBoolean res = 0; // OK try { CosNotifyFilter::ConstraintInfoSeq_var dummy = filter->add_constraints(exp); @@ -1098,9 +1096,9 @@ void EventConsumerKeepAliveThread::main_reconnect(ZmqEventConsumer *event_consum errors.length(1); errors[0].severity = Tango::ERR; - errors[0].origin = CORBA::string_dup("EventConsumer::KeepAliveThread()"); - errors[0].reason = CORBA::string_dup("API_EventTimeout"); - errors[0].desc = CORBA::string_dup("Event channel is not responding anymore, maybe the server or event system is down"); + errors[0].origin = Tango::string_dup("EventConsumer::KeepAliveThread()"); + errors[0].reason = Tango::string_dup("API_EventTimeout"); + errors[0].desc = Tango::string_dup("Event channel is not responding anymore, maybe the server or event system is down"); DeviceAttribute *dev_attr = NULL; AttributeInfoEx *dev_attr_conf = NULL; DevicePipe *dev_pipe = NULL; diff --git a/cppapi/client/eventqueue.cpp b/src/client/eventqueue.cpp similarity index 99% rename from cppapi/client/eventqueue.cpp rename to src/client/eventqueue.cpp index 43b4889a1..68b6d1559 100644 --- a/cppapi/client/eventqueue.cpp +++ b/src/client/eventqueue.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //=================================================================================================================== // // file : eventqueue.cpp @@ -34,7 +32,7 @@ static const char *RcsId = "$Id$\n$Name$"; #include -#include +#include namespace Tango diff --git a/cppapi/client/filedatabase.cpp b/src/client/filedatabase.cpp similarity index 95% rename from cppapi/client/filedatabase.cpp rename to src/client/filedatabase.cpp index 2924ee984..5e0fa2556 100644 --- a/cppapi/client/filedatabase.cpp +++ b/src/client/filedatabase.cpp @@ -1171,10 +1171,10 @@ CORBA::Any* FileDatabase :: DbGetDeviceProperty(CORBA::Any& send) int index = 0; data_out->length(2); - (*data_out)[0] = CORBA::string_dup( (*data_in)[0] ); index++; + (*data_out)[0] = Tango::string_dup( (*data_in)[0] ); index++; num_prop = data_in->length() - 1; sprintf(num_prop_str,"%ud",num_prop); - (*data_out)[index] = CORBA::string_dup(num_prop_str); index++; + (*data_out)[index] = Tango::string_dup(num_prop_str); index++; if (data_in->length() >= 2) { @@ -1202,12 +1202,12 @@ CORBA::Any* FileDatabase :: DbGetDeviceProperty(CORBA::Any& send) num_val = m_server.devices[i]->properties[m]->value.size(); seq_length = seq_length + 2 + m_server.devices[i]->properties[m]->value.size(); data_out->length(seq_length); - (*data_out)[index] = CORBA::string_dup( m_server.devices[i]->properties[m]->name.c_str() );index++; + (*data_out)[index] = Tango::string_dup( m_server.devices[i]->properties[m]->name.c_str() );index++; sprintf(num_vals_str,"%d",num_val); - (*data_out)[index] = CORBA::string_dup(num_vals_str); index++; + (*data_out)[index] = Tango::string_dup(num_vals_str); index++; for (int k=0; k < num_val; k++) { - (*data_out)[index] = CORBA::string_dup( m_server.devices[i]->properties[m]->value[k].c_str());index++; + (*data_out)[index] = Tango::string_dup( m_server.devices[i]->properties[m]->value[k].c_str());index++; } break; } @@ -1218,9 +1218,9 @@ CORBA::Any* FileDatabase :: DbGetDeviceProperty(CORBA::Any& send) { seq_length = seq_length + 3; data_out->length(seq_length); - (*data_out)[index] = CORBA::string_dup((*data_in)[j].in());index++; - (*data_out)[index] = CORBA::string_dup("0");index++; - (*data_out)[index] = CORBA::string_dup(" ");index++; + (*data_out)[index] = Tango::string_dup((*data_in)[j].in());index++; + (*data_out)[index] = Tango::string_dup("0");index++; + (*data_out)[index] = Tango::string_dup(" ");index++; } } break; @@ -1233,9 +1233,9 @@ CORBA::Any* FileDatabase :: DbGetDeviceProperty(CORBA::Any& send) { seq_length = seq_length + 3; data_out->length(seq_length); - (*data_out)[index] = CORBA::string_dup((*data_in)[i + 1].in());index++; - (*data_out)[index] = CORBA::string_dup("0");index++; - (*data_out)[index] = CORBA::string_dup(" ");index++; + (*data_out)[index] = Tango::string_dup((*data_in)[i + 1].in());index++; + (*data_out)[index] = Tango::string_dup("0");index++; + (*data_out)[index] = Tango::string_dup(" ");index++; } } } @@ -1367,10 +1367,10 @@ CORBA::Any* FileDatabase :: DbGetDeviceAttributeProperty(CORBA::Any& send) int index = 0; data_out->length(2); - (*data_out)[0] = CORBA::string_dup( (*data_in)[0] ); index++; + (*data_out)[0] = Tango::string_dup( (*data_in)[0] ); index++; num_attr = data_in->length() - 1; sprintf(num_attr_str, "%ud", num_attr); - (*data_out)[index] = CORBA::string_dup( num_attr_str ); index++; + (*data_out)[index] = Tango::string_dup( num_attr_str ); index++; std::vector::iterator dev_it; @@ -1381,8 +1381,8 @@ CORBA::Any* FileDatabase :: DbGetDeviceAttributeProperty(CORBA::Any& send) for(unsigned int k =0; k < num_attr; k++) { data_out->length(index+2); - (*data_out)[index] = CORBA::string_dup((*data_in)[k+1]); index++; // attribute name - (*data_out)[index] = CORBA::string_dup("0"); index++; // number of properties + (*data_out)[index] = Tango::string_dup((*data_in)[k+1]); index++; // attribute name + (*data_out)[index] = Tango::string_dup("0"); index++; // number of properties for(unsigned int j = 0; j < (*dev_it)->attribute_properties.size(); j++) { if (equalsIgnoreCase((*dev_it)->attribute_properties[j]->attribute_name, (*data_in)[k+1].in())) @@ -1396,24 +1396,24 @@ CORBA::Any* FileDatabase :: DbGetDeviceAttributeProperty(CORBA::Any& send) //cout << "num proprieta'= " << num_prop_str << endl; num_attr_find++; - (*data_out)[index-1] = CORBA::string_dup(num_prop_str); + (*data_out)[index-1] = Tango::string_dup(num_prop_str); for (unsigned int l = 0; l < num_prop; l++) { char num_val_str[256]; data_out->length(index + 1 + 1 + (*dev_it)->attribute_properties[j]->properties[l]->value.size()); - (*data_out)[index] = CORBA::string_dup((*dev_it)->attribute_properties[j]->properties[l]->name.c_str());index++; + (*data_out)[index] = Tango::string_dup((*dev_it)->attribute_properties[j]->properties[l]->name.c_str());index++; #ifdef TANGO_LONG64 sprintf(num_val_str, "%lu", (*dev_it)->attribute_properties[j]->properties[l]->value.size()); #else sprintf(num_val_str, "%d", (*dev_it)->attribute_properties[j]->properties[l]->value.size()); #endif - (*data_out)[index] = CORBA::string_dup(num_val_str); index++; + (*data_out)[index] = Tango::string_dup(num_val_str); index++; for(unsigned int ii = 0; ii < (*dev_it)->attribute_properties[j]->properties[l]->value.size(); ii++) { //cout << ii << " = " << (*dev_it)->attribute_properties[j]->properties[l]->value[ii].c_str() << endl; - (*data_out)[index] = CORBA::string_dup((*dev_it)->attribute_properties[j]->properties[l]->value[ii].c_str()); index++; + (*data_out)[index] = Tango::string_dup((*dev_it)->attribute_properties[j]->properties[l]->value[ii].c_str()); index++; } } @@ -1425,8 +1425,8 @@ CORBA::Any* FileDatabase :: DbGetDeviceAttributeProperty(CORBA::Any& send) data_out->length(index + 2 * num_attr); for(unsigned int i = 0; i < num_attr; i++) { - (*data_out)[index] = CORBA::string_dup((*data_in)[i+1]); index++; - (*data_out)[index] = CORBA::string_dup("0"); index++; + (*data_out)[index] = Tango::string_dup((*data_in)[i+1]); index++; + (*data_out)[index] = Tango::string_dup("0"); index++; } } @@ -1599,10 +1599,10 @@ CORBA::Any* FileDatabase :: DbGetClassProperty(CORBA::Any& send) data_out->length(2); - (*data_out)[0] = CORBA::string_dup((*data_in)[0]); index++; + (*data_out)[0] = Tango::string_dup((*data_in)[0]); index++; num_prop = data_in->length() - 1; sprintf(num_prop_str,"%ud",num_prop); - (*data_out)[index] = CORBA::string_dup(num_prop_str); index++; + (*data_out)[index] = Tango::string_dup(num_prop_str); index++; unsigned long nb_classes_defined = m_server.classes.size(); unsigned long i; @@ -1624,16 +1624,16 @@ CORBA::Any* FileDatabase :: DbGetClassProperty(CORBA::Any& send) num_val = m_server.classes[i]->properties[m]->value.size(); seq_length = seq_length + 2 + num_val; (*data_out).length(seq_length); - (*data_out)[index] = CORBA::string_dup((*data_in)[j]); index++; + (*data_out)[index] = Tango::string_dup((*data_in)[j]); index++; #ifdef TANGO_LONG64 sprintf(num_vals_str,"%lu",m_server.classes[i]->properties[m]->value.size()); #else sprintf(num_vals_str,"%d",m_server.classes[i]->properties[m]->value.size()); #endif - (*data_out)[index] = CORBA::string_dup(num_vals_str); index++; + (*data_out)[index] = Tango::string_dup(num_vals_str); index++; for (unsigned int n = 0; n < num_val; n++) { - (*data_out)[index] = CORBA::string_dup(m_server.classes[i]->properties[m]->value[n].c_str()); index++; + (*data_out)[index] = Tango::string_dup(m_server.classes[i]->properties[m]->value[n].c_str()); index++; } break; } @@ -1643,9 +1643,9 @@ CORBA::Any* FileDatabase :: DbGetClassProperty(CORBA::Any& send) { seq_length = seq_length + 2; data_out->length(seq_length); - (*data_out)[index] = CORBA::string_dup((*data_in)[i + 1].in());index++; - (*data_out)[index] = CORBA::string_dup("0");index++; -// (*data_out)[index] = CORBA::string_dup(" ");index++; + (*data_out)[index] = Tango::string_dup((*data_in)[i + 1].in());index++; + (*data_out)[index] = Tango::string_dup("0");index++; +// (*data_out)[index] = Tango::string_dup(" ");index++; } } break; @@ -1658,9 +1658,9 @@ CORBA::Any* FileDatabase :: DbGetClassProperty(CORBA::Any& send) { seq_length = seq_length + 2; data_out->length(seq_length); - (*data_out)[index] = CORBA::string_dup((*data_in)[i + 1].in());index++; - (*data_out)[index] = CORBA::string_dup("0");index++; -// (*data_out)[index] = CORBA::string_dup(" ");index++; + (*data_out)[index] = Tango::string_dup((*data_in)[i + 1].in());index++; + (*data_out)[index] = Tango::string_dup("0");index++; +// (*data_out)[index] = Tango::string_dup(" ");index++; } } @@ -1795,10 +1795,10 @@ CORBA::Any* FileDatabase :: DbGetClassAttributeProperty(CORBA::Any& send) int index = 0; data_out->length(2); - (*data_out)[0] = CORBA::string_dup((*data_in)[0]); index++; + (*data_out)[0] = Tango::string_dup((*data_in)[0]); index++; num_attr = data_in->length() - 1; sprintf(num_attr_str,"%ud",num_attr); - (*data_out)[1] = CORBA::string_dup(num_attr_str); index++; + (*data_out)[1] = Tango::string_dup(num_attr_str); index++; std::vector::iterator it; it = find_if(m_server.classes.begin(), m_server.classes.end(), hasName(string((*data_in)[0]))); @@ -1808,8 +1808,8 @@ CORBA::Any* FileDatabase :: DbGetClassAttributeProperty(CORBA::Any& send) data_out->length(index + num_attr*2); for(unsigned int j = 0; j < num_attr; j++) { - (*data_out)[index] = CORBA::string_dup((*data_in)[j+1]); index++; - (*data_out)[index] = CORBA::string_dup("0"); index++; + (*data_out)[index] = Tango::string_dup((*data_in)[j+1]); index++; + (*data_out)[index] = Tango::string_dup("0"); index++; } (*any_ptr) <<= data_out; @@ -1820,8 +1820,8 @@ CORBA::Any* FileDatabase :: DbGetClassAttributeProperty(CORBA::Any& send) for(unsigned int k =0; k < num_attr; k++) { data_out->length(index+2); - (*data_out)[index] = CORBA::string_dup((*data_in)[k+1]); index++; - (*data_out)[index] = CORBA::string_dup("0"); index++; + (*data_out)[index] = Tango::string_dup((*data_in)[k+1]); index++; + (*data_out)[index] = Tango::string_dup("0"); index++; for(unsigned int j = 0; j < classe_trovata.attribute_properties.size(); j++) { @@ -1830,26 +1830,26 @@ CORBA::Any* FileDatabase :: DbGetClassAttributeProperty(CORBA::Any& send) num_prop = classe_trovata.attribute_properties[j]->properties.size(); sprintf(num_prop_str, "%d", num_prop); //data_out->length(index + 2*num_prop); - (*data_out)[index-1] = CORBA::string_dup(num_prop_str); + (*data_out)[index-1] = Tango::string_dup(num_prop_str); for (unsigned int l = 0; l < classe_trovata.attribute_properties[j]->properties.size(); l++) { char num_val_str[256]; data_out->length(index + 1 + 1 + classe_trovata.attribute_properties[j]->properties[l]->value.size()); - (*data_out)[index] = CORBA::string_dup(classe_trovata.attribute_properties[j]->properties[l]->name.c_str());index++; + (*data_out)[index] = Tango::string_dup(classe_trovata.attribute_properties[j]->properties[l]->name.c_str());index++; #ifdef TANGO_LONG64 sprintf(num_val_str, "%lu", classe_trovata.attribute_properties[j]->properties[l]->value.size()); #else sprintf(num_val_str, "%d", classe_trovata.attribute_properties[j]->properties[l]->value.size()); #endif - (*data_out)[index] = CORBA::string_dup(num_val_str); index++; - //(*data_out)[index] = CORBA::string_dup(classe_trovata.attribute_properties[j]->properties[l]->name.c_str());index++; + (*data_out)[index] = Tango::string_dup(num_val_str); index++; + //(*data_out)[index] = Tango::string_dup(classe_trovata.attribute_properties[j]->properties[l]->name.c_str());index++; //string temp_value(""); if (classe_trovata.attribute_properties[j]->properties[l]->value.size() > 0) { //temp_value += classe_trovata.attribute_properties[j]->properties[l]->value[0]; for (unsigned int m = 0; m < classe_trovata.attribute_properties[j]->properties[l]->value.size(); m++) { - (*data_out)[index] = CORBA::string_dup(classe_trovata.attribute_properties[j]->properties[l]->value[m].c_str()); index++; + (*data_out)[index] = Tango::string_dup(classe_trovata.attribute_properties[j]->properties[l]->value[m].c_str()); index++; //temp_value += "\n" + classe_trovata.attribute_properties[j]->properties[l]->value[m]; } } @@ -1999,7 +1999,7 @@ CORBA::Any* FileDatabase :: DbGetDeviceList(CORBA::Any& send) data_out->length(m_server.classes[i]->devices.size()); for (unsigned int j = 0; j < m_server.classes[i]->devices.size(); j++) { - (*data_out)[j] = CORBA::string_dup( m_server.classes[i]->devices[j]->name.c_str() ); + (*data_out)[j] = Tango::string_dup( m_server.classes[i]->devices[j]->name.c_str() ); } break; } @@ -2044,48 +2044,48 @@ CORBA::Any* FileDatabase :: DbInfo(CORBA::Any&){ data_out->length(13); char temp_str[256]; sprintf(temp_str,"TANGO FileDatabase %s", filename.c_str()); - (*data_out)[0] = CORBA::string_dup(temp_str); - (*data_out)[1] = CORBA::string_dup(""); - (*data_out)[2] = CORBA::string_dup("Running since ----"); - (*data_out)[3] = CORBA::string_dup(""); + (*data_out)[0] = Tango::string_dup(temp_str); + (*data_out)[1] = Tango::string_dup(""); + (*data_out)[2] = Tango::string_dup("Running since ----"); + (*data_out)[3] = Tango::string_dup(""); #ifdef TANGO_LONG64 sprintf(temp_str,"Devices defined = %lu", m_server.devices.size()); #else sprintf(temp_str,"Devices defined = %d", m_server.devices.size()); #endif - (*data_out)[4] = CORBA::string_dup(temp_str); + (*data_out)[4] = Tango::string_dup(temp_str); #ifdef TANGO_LONG64 sprintf(temp_str,"Devices exported = %lu", m_server.devices.size()); #else sprintf(temp_str,"Devices exported = %d", m_server.devices.size()); #endif - (*data_out)[5] = CORBA::string_dup(temp_str); - (*data_out)[6] = CORBA::string_dup("Device servers defined = 1"); - (*data_out)[7] = CORBA::string_dup("Device servers exported = 1"); - (*data_out)[8] = CORBA::string_dup(""); + (*data_out)[5] = Tango::string_dup(temp_str); + (*data_out)[6] = Tango::string_dup("Device servers defined = 1"); + (*data_out)[7] = Tango::string_dup("Device servers exported = 1"); + (*data_out)[8] = Tango::string_dup(""); long temp_long = 0; for(std::vector::iterator it = m_server.classes.begin(); it != m_server.classes.end(); ++it) temp_long += (*it)->properties.size(); sprintf(temp_str,"Class properties defined = %ld", temp_long); - (*data_out)[9] = CORBA::string_dup(temp_str); + (*data_out)[9] = Tango::string_dup(temp_str); temp_long = 0; for(std::vector::iterator ite = m_server.devices.begin(); ite != m_server.devices.end(); ++ite) temp_long += (*ite)->properties.size(); sprintf(temp_str,"Device properties defined = %ld", temp_long); - (*data_out)[10] = CORBA::string_dup(temp_str); + (*data_out)[10] = Tango::string_dup(temp_str); temp_long = 0; for(std::vector::iterator iter = m_server.classes.begin(); iter != m_server.classes.end(); ++iter) temp_long += (*iter)->attribute_properties.size(); sprintf(temp_str,"Class attribute properties defined = %ld", temp_long); - (*data_out)[11] = CORBA::string_dup(temp_str); + (*data_out)[11] = Tango::string_dup(temp_str); temp_long = 0; for(std::vector::iterator itera = m_server.devices.begin(); itera != m_server.devices.end(); ++itera) temp_long += (*itera)->attribute_properties.size(); sprintf(temp_str,"Device attribute properties defined = %ld", temp_long); - (*data_out)[12] = CORBA::string_dup(temp_str); + (*data_out)[12] = Tango::string_dup(temp_str); (*any_ptr) <<= data_out; return any_ptr; @@ -2209,7 +2209,7 @@ CORBA::Any* FileDatabase :: DbGetDeviceMemberList(CORBA::Any&) Tango::DevVarStringArray* argout = new Tango::DevVarStringArray(); argout->length(1); - (*argout)[0] = CORBA::string_dup("NoMember"); + (*argout)[0] = Tango::string_dup("NoMember"); (*any_ptr) <<= argout; return any_ptr; @@ -2233,7 +2233,7 @@ CORBA::Any* FileDatabase :: DbGetDeviceFamilyList(CORBA::Any&) Tango::DevVarStringArray* argout = new Tango::DevVarStringArray(); argout->length(1); - (*argout)[0] = CORBA::string_dup("NoDevice"); + (*argout)[0] = Tango::string_dup("NoDevice"); (*any_ptr) <<= argout; return any_ptr; @@ -2245,7 +2245,7 @@ CORBA::Any* FileDatabase :: DbGetDeviceDomainList(CORBA::Any&) Tango::DevVarStringArray* argout = new Tango::DevVarStringArray(); argout->length(1); - (*argout)[0] = CORBA::string_dup("NoDevice"); + (*argout)[0] = Tango::string_dup("NoDevice"); (*any_ptr) <<= argout; return any_ptr; @@ -2270,8 +2270,8 @@ CORBA::Any* FileDatabase :: DbGetProperty(CORBA::Any& send) data_out->length(2); sprintf(num_attr_str,"%ud",data_in->length()-1); - (*data_out)[0] = CORBA::string_dup((*data_in)[0]); - (*data_out)[1] = CORBA::string_dup(zero_str); + (*data_out)[0] = Tango::string_dup((*data_in)[0]); + (*data_out)[1] = Tango::string_dup(zero_str); (*any_ptr) <<= data_out; diff --git a/cppapi/client/group.cpp b/src/client/group.cpp similarity index 93% rename from cppapi/client/group.cpp rename to src/client/group.cpp index 51a53d2ea..8a44e9a1f 100644 --- a/cppapi/client/group.cpp +++ b/src/client/group.cpp @@ -32,7 +32,7 @@ // //============================================================================= -#include +#include //----------------------------------------------------------------------------- // LOCAL DEBUGGING MACRO @@ -311,9 +311,9 @@ GroupCmdReply::~GroupCmdReply () Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("no available data"); - errors[0].reason = CORBA::string_dup("no data - group member is disabled"); - errors[0].origin = CORBA::string_dup("GroupCmdReply::get_data"); + errors[0].desc = Tango::string_dup("no available data"); + errors[0].reason = Tango::string_dup("no data - group member is disabled"); + errors[0].origin = Tango::string_dup("GroupCmdReply::get_data"); DevFailed df(errors); throw df; } @@ -336,9 +336,9 @@ bool GroupCmdReply::extract (std::vector& vl, std::vector& Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("no available data"); - errors[0].reason = CORBA::string_dup("no data - group member is disabled"); - errors[0].origin = CORBA::string_dup("GroupCmdReply::extract"); + errors[0].desc = Tango::string_dup("no available data"); + errors[0].reason = Tango::string_dup("no data - group member is disabled"); + errors[0].origin = Tango::string_dup("GroupCmdReply::extract"); DevFailed df(errors); throw df; } @@ -371,9 +371,9 @@ bool GroupCmdReply::extract (std::vector& vl, std::vector& Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("unknown exception caught"); - errors[0].reason = CORBA::string_dup("an error occured while trying to extract data"); - errors[0].origin = CORBA::string_dup("GroupCmdReply::extract"); + errors[0].desc = Tango::string_dup("unknown exception caught"); + errors[0].reason = Tango::string_dup("an error occured while trying to extract data"); + errors[0].origin = Tango::string_dup("GroupCmdReply::extract"); DevFailed df(errors); exception_m = df; throw exception_m; @@ -394,9 +394,9 @@ bool GroupCmdReply::extract (std::vector& vd, std::vector& Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("no available data"); - errors[0].reason = CORBA::string_dup("no data - group member is disabled"); - errors[0].origin = CORBA::string_dup("GroupCmdReply::extract"); + errors[0].desc = Tango::string_dup("no available data"); + errors[0].reason = Tango::string_dup("no data - group member is disabled"); + errors[0].origin = Tango::string_dup("GroupCmdReply::extract"); DevFailed df(errors); throw df; } @@ -429,9 +429,9 @@ bool GroupCmdReply::extract (std::vector& vd, std::vector& Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("unknown exception caught"); - errors[0].reason = CORBA::string_dup("an error occured while trying to extract data"); - errors[0].origin = CORBA::string_dup("GroupCmdReply::extract"); + errors[0].desc = Tango::string_dup("unknown exception caught"); + errors[0].reason = Tango::string_dup("an error occured while trying to extract data"); + errors[0].origin = Tango::string_dup("GroupCmdReply::extract"); DevFailed df(errors); exception_m = df; throw exception_m; @@ -507,9 +507,9 @@ GroupAttrReply::~GroupAttrReply () Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("no available data"); - errors[0].reason = CORBA::string_dup("no data - group member is disabled"); - errors[0].origin = CORBA::string_dup("GroupCmdReply::get_data"); + errors[0].desc = Tango::string_dup("no available data"); + errors[0].reason = Tango::string_dup("no data - group member is disabled"); + errors[0].origin = Tango::string_dup("GroupCmdReply::get_data"); DevFailed df(errors); throw df; } @@ -1200,9 +1200,9 @@ GroupCmdReplyList Group::command_inout_reply_i (long ari, long tmo) Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].reason = CORBA::string_dup("API_BadAsynPollId"); - errors[0].desc = CORBA::string_dup("Invalid asynch. request identifier specified"); - errors[0].origin = CORBA::string_dup("Group::command_inout_reply"); + errors[0].reason = Tango::string_dup("API_BadAsynPollId"); + errors[0].desc = Tango::string_dup("Invalid asynch. request identifier specified"); + errors[0].origin = Tango::string_dup("Group::command_inout_reply"); throw DevFailed(errors); } GroupCmdReplyList reply; @@ -1282,9 +1282,9 @@ GroupAttrReplyList Group::read_attribute_reply_i (long ari, long tmo) Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].reason = CORBA::string_dup("API_BadAsynPollId"); - errors[0].desc = CORBA::string_dup("Invalid asynch. request identifier specified"); - errors[0].origin = CORBA::string_dup("Group::read_attribute_reply"); + errors[0].reason = Tango::string_dup("API_BadAsynPollId"); + errors[0].desc = Tango::string_dup("Invalid asynch. request identifier specified"); + errors[0].origin = Tango::string_dup("Group::read_attribute_reply"); throw DevFailed(errors); } GroupAttrReplyList reply; @@ -1346,9 +1346,9 @@ GroupAttrReplyList Group::read_attributes_reply_i (long ari, long tmo) Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].reason = CORBA::string_dup("API_BadAsynPollId"); - errors[0].desc = CORBA::string_dup("Invalid asynch. request identifier specified"); - errors[0].origin = CORBA::string_dup("Group::read_attributes_reply"); + errors[0].reason = Tango::string_dup("API_BadAsynPollId"); + errors[0].desc = Tango::string_dup("Invalid asynch. request identifier specified"); + errors[0].origin = Tango::string_dup("Group::read_attributes_reply"); throw DevFailed(errors); } GroupAttrReplyList reply; @@ -1472,9 +1472,9 @@ GroupReplyList Group::write_attribute_reply_i (long ari, long tmo) Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].reason = CORBA::string_dup("API_BadAsynPollId"); - errors[0].desc = CORBA::string_dup("Invalid asynch. request identifier specified"); - errors[0].origin = CORBA::string_dup("Group::write_attribute_reply"); + errors[0].reason = Tango::string_dup("API_BadAsynPollId"); + errors[0].desc = Tango::string_dup("Invalid asynch. request identifier specified"); + errors[0].origin = Tango::string_dup("Group::write_attribute_reply"); throw DevFailed(errors); } GroupReplyList reply; @@ -1702,9 +1702,9 @@ long GroupDeviceElement::command_inout_asynch_i (const std::string& c, bool fgt, Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("unknown error"); - errors[0].reason = CORBA::string_dup("unknown exception caught"); - errors[0].origin = CORBA::string_dup("GroupDeviceElement::command_inout_asynch"); + errors[0].desc = Tango::string_dup("unknown error"); + errors[0].reason = Tango::string_dup("unknown exception caught"); + errors[0].origin = Tango::string_dup("GroupDeviceElement::command_inout_asynch"); DevFailed df(errors); arp.insert(AsynchRequestRepValue(id, AsynchRequest(-1, c, df))); } @@ -1747,9 +1747,9 @@ long GroupDeviceElement::command_inout_asynch_i (const std::string& c, const Dev Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("unknown error"); - errors[0].reason = CORBA::string_dup("unknown exception caught"); - errors[0].origin = CORBA::string_dup("GroupDeviceElement::command_inout_asynch"); + errors[0].desc = Tango::string_dup("unknown error"); + errors[0].reason = Tango::string_dup("unknown exception caught"); + errors[0].origin = Tango::string_dup("GroupDeviceElement::command_inout_asynch"); DevFailed df(errors); arp.insert(AsynchRequestRepValue(id, AsynchRequest(-1, c, df))); } @@ -1770,9 +1770,9 @@ GroupCmdReplyList GroupDeviceElement::command_inout_reply_i (long id, long tmo) Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].reason = CORBA::string_dup("API_BadAsynPollId"); - errors[0].desc = CORBA::string_dup("Invalid asynch. request identifier specified"); - errors[0].origin = CORBA::string_dup("GroupDeviceElement::command_inout_reply"); + errors[0].reason = Tango::string_dup("API_BadAsynPollId"); + errors[0].desc = Tango::string_dup("Invalid asynch. request identifier specified"); + errors[0].origin = Tango::string_dup("GroupDeviceElement::command_inout_reply"); DevFailed df(errors); //- populate the returned vector rl.push_back(GroupCmdReply(get_name(), "unknown", df)); @@ -1813,9 +1813,9 @@ GroupCmdReplyList GroupDeviceElement::command_inout_reply_i (long id, long tmo) Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("unknown error"); - errors[0].reason = CORBA::string_dup("unknown exception caught"); - errors[0].origin = CORBA::string_dup("GroupDeviceElement::command_inout_reply"); + errors[0].desc = Tango::string_dup("unknown error"); + errors[0].reason = Tango::string_dup("unknown exception caught"); + errors[0].origin = Tango::string_dup("GroupDeviceElement::command_inout_reply"); DevFailed df(errors); rl.push_back(GroupCmdReply(get_name(), it->second.obj_names[0], df)); } @@ -1849,9 +1849,9 @@ long GroupDeviceElement::read_attribute_asynch_i (const std::string& a, TANGO_UN Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("unknown error"); - errors[0].reason = CORBA::string_dup("unknown exception caught"); - errors[0].origin = CORBA::string_dup("GroupDeviceElement::read_attribute_asynch"); + errors[0].desc = Tango::string_dup("unknown error"); + errors[0].reason = Tango::string_dup("unknown exception caught"); + errors[0].origin = Tango::string_dup("GroupDeviceElement::read_attribute_asynch"); DevFailed df(errors); arp.insert(AsynchRequestRepValue(id, AsynchRequest(-1, a, df))); } @@ -1871,9 +1871,9 @@ GroupAttrReplyList GroupDeviceElement::read_attribute_reply_i (long id, long tmo Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].reason = CORBA::string_dup("API_BadAsynPollId"); - errors[0].desc = CORBA::string_dup("Invalid asynch. request identifier specified"); - errors[0].origin = CORBA::string_dup("GroupDeviceElement::read_attribute_reply"); + errors[0].reason = Tango::string_dup("API_BadAsynPollId"); + errors[0].desc = Tango::string_dup("Invalid asynch. request identifier specified"); + errors[0].origin = Tango::string_dup("GroupDeviceElement::read_attribute_reply"); DevFailed df(errors); //- populate the returned vector rl.push_back(GroupAttrReply(get_name(), "unknown", df)); @@ -1907,9 +1907,9 @@ GroupAttrReplyList GroupDeviceElement::read_attribute_reply_i (long id, long tmo Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("internal error"); - errors[0].reason = CORBA::string_dup("Tango::DeviceProxy::read_attribute_reply returned NULL"); - errors[0].origin = CORBA::string_dup("GroupDeviceElement::read_attribute_reply"); + errors[0].desc = Tango::string_dup("internal error"); + errors[0].reason = Tango::string_dup("Tango::DeviceProxy::read_attribute_reply returned NULL"); + errors[0].origin = Tango::string_dup("GroupDeviceElement::read_attribute_reply"); DevFailed df(errors); rl.push_back(GroupAttrReply(get_name(), it->second.obj_names[0], df)); } @@ -1937,9 +1937,9 @@ GroupAttrReplyList GroupDeviceElement::read_attribute_reply_i (long id, long tmo Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("unknown error"); - errors[0].reason = CORBA::string_dup("unknown exception caught"); - errors[0].origin = CORBA::string_dup("GroupDeviceElement::read_attribute_reply"); + errors[0].desc = Tango::string_dup("unknown error"); + errors[0].reason = Tango::string_dup("unknown exception caught"); + errors[0].origin = Tango::string_dup("GroupDeviceElement::read_attribute_reply"); DevFailed df(errors); rl.push_back(GroupAttrReply(get_name(), it->second.obj_names[0], df)); } @@ -1973,9 +1973,9 @@ long GroupDeviceElement::read_attributes_asynch_i (const std::vectorsecond.obj_names.size(); a++) { @@ -2077,9 +2077,9 @@ GroupAttrReplyList GroupDeviceElement::read_attributes_reply_i (long id, long tm Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("unknown error"); - errors[0].reason = CORBA::string_dup("unknown exception caught"); - errors[0].origin = CORBA::string_dup("GroupDeviceElement::read_attribute_reply"); + errors[0].desc = Tango::string_dup("unknown error"); + errors[0].reason = Tango::string_dup("unknown exception caught"); + errors[0].origin = Tango::string_dup("GroupDeviceElement::read_attribute_reply"); DevFailed df(errors); for (a = 0; a < it->second.obj_names.size(); a++) { @@ -2116,9 +2116,9 @@ long GroupDeviceElement::write_attribute_asynch_i (const DeviceAttribute& d, TAN Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("unknown error"); - errors[0].reason = CORBA::string_dup("unknown exception caught"); - errors[0].origin = CORBA::string_dup("GroupDeviceElement::write_attribute_asynch"); + errors[0].desc = Tango::string_dup("unknown error"); + errors[0].reason = Tango::string_dup("unknown exception caught"); + errors[0].origin = Tango::string_dup("GroupDeviceElement::write_attribute_asynch"); DevFailed df(errors); arp.insert(AsynchRequestRepValue(id, AsynchRequest(-1, const_cast(d).get_name(), df))); } @@ -2137,9 +2137,9 @@ GroupReplyList GroupDeviceElement::write_attribute_reply_i (long id, long tmo) Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].reason = CORBA::string_dup("API_BadAsynPollId"); - errors[0].desc = CORBA::string_dup("Invalid asynch. request identifier specified"); - errors[0].origin = CORBA::string_dup("GroupDeviceElement::write_attribute_reply"); + errors[0].reason = Tango::string_dup("API_BadAsynPollId"); + errors[0].desc = Tango::string_dup("Invalid asynch. request identifier specified"); + errors[0].origin = Tango::string_dup("GroupDeviceElement::write_attribute_reply"); DevFailed df(errors); //- populate the returned vector rl.push_back(GroupReply(get_name(), "unknown", df)); @@ -2180,9 +2180,9 @@ GroupReplyList GroupDeviceElement::write_attribute_reply_i (long id, long tmo) Tango::DevErrorList errors(1); errors.length(1); errors[0].severity = Tango::ERR; - errors[0].desc = CORBA::string_dup("unknown error"); - errors[0].reason = CORBA::string_dup("unknown exception caught"); - errors[0].origin = CORBA::string_dup("GroupDeviceElement::write_attribute_reply"); + errors[0].desc = Tango::string_dup("unknown error"); + errors[0].reason = Tango::string_dup("unknown exception caught"); + errors[0].origin = Tango::string_dup("GroupDeviceElement::write_attribute_reply"); DevFailed df(errors); rl.push_back(GroupReply(get_name(), it->second.obj_names[0], df)); } diff --git a/cppapi/client/lockthread.cpp b/src/client/lockthread.cpp similarity index 98% rename from cppapi/client/lockthread.cpp rename to src/client/lockthread.cpp index 695a132ef..23715b624 100644 --- a/cppapi/client/lockthread.cpp +++ b/src/client/lockthread.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //+================================================================================================================== // // file : LockThread.cpp @@ -38,7 +36,7 @@ static const char *RcsId = "$Id$"; #endif #include -#include +#include #include #include @@ -402,7 +400,7 @@ void LockThread::unlock_all_devs() unsigned int locked_devices_nb = locked_devices.size(); sent_data.svalue.length(locked_devices_nb); for (unsigned int loop = 0;loop < locked_devices_nb;loop++) - sent_data.svalue[loop] = CORBA::string_dup(locked_devices[loop].dev_name.c_str()); + sent_data.svalue[loop] = Tango::string_dup(locked_devices[loop].dev_name.c_str()); sent_data.lvalue.length(1); sent_data.lvalue[0] = 1; diff --git a/cppapi/client/notifdeventconsumer.cpp b/src/client/notifdeventconsumer.cpp similarity index 98% rename from cppapi/client/notifdeventconsumer.cpp rename to src/client/notifdeventconsumer.cpp index e430637dd..c05fa4e41 100644 --- a/cppapi/client/notifdeventconsumer.cpp +++ b/src/client/notifdeventconsumer.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //////////////////////////////////////////////////////////////////////////////// /// /// file notifdeventconsumer.cpp @@ -37,7 +35,7 @@ static const char *RcsId = "$Id$"; //////////////////////////////////////////////////////////////////////////////// #include -#include +#include #include @@ -309,8 +307,8 @@ void NotifdEventConsumer::connect_event_system(string &device_name,string &att_n CosNotifyFilter::ConstraintExpSeq exp; exp.length(1); exp[0].event_types = evs; - exp[0].constraint_expr = CORBA::string_dup(constraint_expr); - CORBA::Boolean res = 0; // OK + exp[0].constraint_expr = Tango::string_dup(constraint_expr); + DevBoolean res = 0; // OK try { @@ -643,8 +641,8 @@ void NotifdEventConsumer::connect_event_channel(string &channel_name,Database *d CosNotifyFilter::ConstraintExpSeq exp; exp.length(1); exp[0].event_types = evs; - exp[0].constraint_expr = CORBA::string_dup(constraint_expr); - CORBA::Boolean res = 0; // OK + exp[0].constraint_expr = Tango::string_dup(constraint_expr); + DevBoolean res = 0; // OK try { CosNotifyFilter::ConstraintInfoSeq_var dummy = filter->add_constraints(exp); @@ -937,9 +935,9 @@ void NotifdEventConsumer::push_structured_event(const CosNotification::Structure errors.length(1); errors[0].severity = Tango::ERR; - errors[0].origin = CORBA::string_dup("NotifdEventConsumer::push_structured_event()"); - errors[0].reason = CORBA::string_dup(API_IncompatibleAttrDataType); - errors[0].desc = CORBA::string_dup("Unknown structure used to pass attribute value (Need compilation ?)"); + errors[0].origin = Tango::string_dup("NotifdEventConsumer::push_structured_event()"); + errors[0].reason = Tango::string_dup(API_IncompatibleAttrDataType); + errors[0].desc = Tango::string_dup("Unknown structure used to pass attribute value (Need compilation ?)"); dev_attr = NULL; } diff --git a/cppapi/client/proxy_asyn.cpp b/src/client/proxy_asyn.cpp similarity index 97% rename from cppapi/client/proxy_asyn.cpp rename to src/client/proxy_asyn.cpp index ff0de9543..46b4bcf9a 100644 --- a/cppapi/client/proxy_asyn.cpp +++ b/src/client/proxy_asyn.cpp @@ -1,4 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; //==================================================================================== // // cpp - C++ source code file for TANGO api Connection and DeviceProxy @@ -359,7 +358,7 @@ DeviceData Connection::command_inout_reply(long id) const char *cmd = NULL; CORBA::NamedValue_ptr nv = req_arg->item(0); *(nv->value()) >>= cmd; - char *tmp = CORBA::string_dup(cmd); + char *tmp = Tango::string_dup(cmd); TangoSys_OMemStream desc; desc << "Timeout (" << timeout << " mS) exceeded on device " << dev_name(); @@ -405,7 +404,7 @@ DeviceData Connection::command_inout_reply(long id) const char *cmd = NULL; CORBA::NamedValue_ptr nv = req_arg->item(0); *(nv->value()) >>= cmd; - char *tmp = CORBA::string_dup(cmd); + char *tmp = Tango::string_dup(cmd); TangoSys_OMemStream desc; desc << "Failed to execute command_inout_asynch on device " << dev_name(); @@ -436,7 +435,7 @@ DeviceData Connection::command_inout_reply(long id) const char *cmd = NULL; CORBA::NamedValue_ptr nv = req_arg->item(0); *(nv->value()) >>= cmd; - char *tmp = CORBA::string_dup(cmd); + char *tmp = Tango::string_dup(cmd); char cb_excep_mess[256]; Tango::Except::print_CORBA_SystemException_r(sys_ex,cb_excep_mess); @@ -574,15 +573,15 @@ DeviceData Connection::command_inout_reply(long id,long call_timeout) #endif } - if (i == nb) + if(i == nb && !req.request->poll_response()) { TangoSys_OMemStream desc; desc << "Device " << dev_name(); desc << ": Reply for asynchronous call (id = " << id; desc << ") is not yet arrived" << ends; ApiAsynNotThereExcept::throw_exception(API_AsynReplyNotArrived, - desc.str(), - "Connection::command_inout_reply"); + desc.str(), + "Connection::command_inout_reply"); } } @@ -682,7 +681,7 @@ DeviceData Connection::command_inout_reply(long id,long call_timeout) const char *cmd = NULL; CORBA::NamedValue_ptr nv = req_arg->item(0); *(nv->value()) >>= cmd; - char *tmp = CORBA::string_dup(cmd); + char *tmp = Tango::string_dup(cmd); TangoSys_OMemStream desc; desc << "Timeout (" << timeout << " mS) exceeded on device " << dev_name(); @@ -728,7 +727,7 @@ DeviceData Connection::command_inout_reply(long id,long call_timeout) const char *cmd = NULL; CORBA::NamedValue_ptr nv = req_arg->item(0); *(nv->value()) >>= cmd; - char *tmp = CORBA::string_dup(cmd); + char *tmp = Tango::string_dup(cmd); TangoSys_OMemStream desc; desc << "Failed to execute command_inout_asynch on device " << dev_name(); @@ -757,7 +756,7 @@ DeviceData Connection::command_inout_reply(long id,long call_timeout) const char *cmd = NULL; CORBA::NamedValue_ptr nv = req_arg->item(0); *(nv->value()) >>= cmd; - char *tmp = CORBA::string_dup(cmd); + char *tmp = Tango::string_dup(cmd); char cb_excep_mess[256]; Tango::Except::print_CORBA_SystemException_r(sys_ex,cb_excep_mess); @@ -1104,11 +1103,11 @@ vector *DeviceProxy::read_attributes_reply(long id) desc << ", attribute " << (*dev_attr)[i].name << ends; err_list.inout().length(nb_except + 1); - err_list[nb_except].reason = CORBA::string_dup(API_AttributeFailed); - err_list[nb_except].origin = CORBA::string_dup("DeviceProxy::read_attribute()"); + err_list[nb_except].reason = Tango::string_dup(API_AttributeFailed); + err_list[nb_except].origin = Tango::string_dup("DeviceProxy::read_attribute()"); string st = desc.str(); - err_list[nb_except].desc = CORBA::string_dup(st.c_str()); + err_list[nb_except].desc = Tango::string_dup(st.c_str()); err_list[nb_except].severity = Tango::ERR; } } @@ -1300,11 +1299,11 @@ DeviceAttribute *DeviceProxy::read_attribute_reply(long id) desc << ", attribute " << dev_attr->name << ends; err_list.inout().length(nb_except + 1); - err_list[nb_except].reason = CORBA::string_dup(API_AttributeFailed); - err_list[nb_except].origin = CORBA::string_dup("DeviceProxy::read_attribute_reply()"); + err_list[nb_except].reason = Tango::string_dup(API_AttributeFailed); + err_list[nb_except].origin = Tango::string_dup("DeviceProxy::read_attribute_reply()"); string st = desc.str(); - err_list[nb_except].desc = CORBA::string_dup(st.c_str()); + err_list[nb_except].desc = Tango::string_dup(st.c_str()); err_list[nb_except].severity = Tango::ERR; } @@ -1405,15 +1404,15 @@ vector *DeviceProxy::read_attributes_reply(long id,long call_ti #endif } - if (i == nb) + if(i == nb && !req.request->poll_response()) { TangoSys_OMemStream desc; desc << "Device " << device_name; desc << ": Reply for asynchronous call (id = " << id; desc << ") is not yet arrived" << ends; ApiAsynNotThereExcept::throw_exception(API_AsynReplyNotArrived, - desc.str(), - "DeviceProxy::read_attributes_reply"); + desc.str(), + "DeviceProxy::read_attributes_reply"); } } @@ -1545,11 +1544,11 @@ vector *DeviceProxy::read_attributes_reply(long id,long call_ti desc << ", attribute " << (*dev_attr)[i].name << ends; err_list.inout().length(nb_except + 1); - err_list[nb_except].reason = CORBA::string_dup(API_AttributeFailed); - err_list[nb_except].origin = CORBA::string_dup("DeviceProxy::read_attributes_reply()"); + err_list[nb_except].reason = Tango::string_dup(API_AttributeFailed); + err_list[nb_except].origin = Tango::string_dup("DeviceProxy::read_attributes_reply()"); string st = desc.str(); - err_list[nb_except].desc = CORBA::string_dup(st.c_str()); + err_list[nb_except].desc = Tango::string_dup(st.c_str()); err_list[nb_except].severity = Tango::ERR; } } @@ -1648,15 +1647,15 @@ DeviceAttribute *DeviceProxy::read_attribute_reply(long id,long call_timeout) #endif } - if (i == nb) + if(i == nb && !req.request->poll_response()) { TangoSys_OMemStream desc; desc << "Device " << device_name; desc << ": Reply for asynchronous call (id = " << id; desc << ") is not yet arrived" << ends; ApiAsynNotThereExcept::throw_exception(API_AsynReplyNotArrived, - desc.str(), - "DeviceProxy::read_attribute_reply"); + desc.str(), + "DeviceProxy::read_attribute_reply"); } } @@ -1778,11 +1777,11 @@ DeviceAttribute *DeviceProxy::read_attribute_reply(long id,long call_timeout) desc << ", attribute " << dev_attr->name << ends; err_list.inout().length(nb_except + 1); - err_list[nb_except].reason = CORBA::string_dup(API_AttributeFailed); - err_list[nb_except].origin = CORBA::string_dup("DeviceProxy::read_attribute_reply()"); + err_list[nb_except].reason = Tango::string_dup(API_AttributeFailed); + err_list[nb_except].origin = Tango::string_dup("DeviceProxy::read_attribute_reply()"); string st = desc.str(); - err_list[nb_except].desc = CORBA::string_dup(st.c_str()); + err_list[nb_except].desc = Tango::string_dup(st.c_str()); err_list[nb_except].severity = Tango::ERR; } } @@ -2263,15 +2262,15 @@ void DeviceProxy::write_attributes_reply(long id,long call_timeout) #endif } - if (i == nb) + if(i == nb && !req.request->poll_response()) { TangoSys_OMemStream desc; desc << "Device " << device_name; desc << ": Reply for asynchronous call (id = " << id; desc << ") is not yet arrived" << ends; ApiAsynNotThereExcept::throw_exception(API_AsynReplyNotArrived, - desc.str(), - "DeviceProxy::write_attributes_reply"); + desc.str(), + "DeviceProxy::write_attributes_reply"); } } diff --git a/cppapi/client/proxy_asyn_cb.cpp b/src/client/proxy_asyn_cb.cpp similarity index 91% rename from cppapi/client/proxy_asyn_cb.cpp rename to src/client/proxy_asyn_cb.cpp index fe18cd7eb..56ae02629 100644 --- a/cppapi/client/proxy_asyn_cb.cpp +++ b/src/client/proxy_asyn_cb.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - // // cpp - C++ source code file for TANGO api class and asynchronous callback // related methods @@ -323,7 +321,7 @@ void Connection::Cb_Cmd_Request(CORBA::Request_ptr req,Tango::CallBack *cb_ptr) if (tra->minor() == omni::TRANSIENT_CallTimedout) { to_except = true; - char *tmp = CORBA::string_dup(cmd); + char *tmp = Tango::string_dup(cmd); char cb_excep_mess[256]; Tango::Except::print_CORBA_SystemException_r(tra,cb_excep_mess); @@ -333,16 +331,16 @@ void Connection::Cb_Cmd_Request(CORBA::Request_ptr req,Tango::CallBack *cb_ptr) CORBA::string_free(tmp); errors.length(2); - errors[0].desc = CORBA::string_dup(cb_excep_mess); + errors[0].desc = Tango::string_dup(cb_excep_mess); errors[0].severity = Tango::ERR; - errors[0].reason = CORBA::string_dup("API_CorbaException"); - errors[0].origin = CORBA::string_dup("Connection::Cb_Cmd_Request()"); + errors[0].reason = Tango::string_dup("API_CorbaException"); + errors[0].origin = Tango::string_dup("Connection::Cb_Cmd_Request()"); string st = desc.str(); - errors[1].desc = CORBA::string_dup(st.c_str()); + errors[1].desc = Tango::string_dup(st.c_str()); errors[1].severity = Tango::ERR; - errors[1].reason = CORBA::string_dup("API_DeviceTimedOut"); - errors[1].origin = CORBA::string_dup("Connection::Cb_Cmd_request()"); + errors[1].reason = Tango::string_dup("API_DeviceTimedOut"); + errors[1].origin = Tango::string_dup("Connection::Cb_Cmd_request()"); } } @@ -359,7 +357,7 @@ void Connection::Cb_Cmd_Request(CORBA::Request_ptr req,Tango::CallBack *cb_ptr) unk_ex->exception() >>= serv_ex; errors = serv_ex->errors; - char *tmp = CORBA::string_dup(cmd); + char *tmp = Tango::string_dup(cmd); TangoSys_OMemStream desc; desc << "Failed to execute command_inout_asynch on device " << dev_name(); @@ -371,9 +369,9 @@ void Connection::Cb_Cmd_Request(CORBA::Request_ptr req,Tango::CallBack *cb_ptr) errors[nb_err].severity = Tango::ERR; string st = desc.str(); - errors[nb_err].desc = CORBA::string_dup(st.c_str()); - errors[nb_err].origin = CORBA::string_dup("Connection::Cb_Cmd_Request()"); - errors[nb_err].reason = CORBA::string_dup(API_CommandFailed); + errors[nb_err].desc = Tango::string_dup(st.c_str()); + errors[nb_err].origin = Tango::string_dup("Connection::Cb_Cmd_Request()"); + errors[nb_err].reason = Tango::string_dup(API_CommandFailed); } else if (((sys_ex = CORBA::SystemException::_downcast(ex_ptr)) != NULL) && (to_except == false)) @@ -385,7 +383,7 @@ void Connection::Cb_Cmd_Request(CORBA::Request_ptr req,Tango::CallBack *cb_ptr) // Re-throw all CORBA system exceptions // - char *tmp = CORBA::string_dup(cmd); + char *tmp = Tango::string_dup(cmd); char cb_excep_mess[256]; Tango::Except::print_CORBA_SystemException_r(sys_ex,cb_excep_mess); @@ -396,16 +394,16 @@ void Connection::Cb_Cmd_Request(CORBA::Request_ptr req,Tango::CallBack *cb_ptr) CORBA::string_free(tmp); errors.length(2); - errors[0].desc = CORBA::string_dup(cb_excep_mess); + errors[0].desc = Tango::string_dup(cb_excep_mess); errors[0].severity = Tango::ERR; - errors[0].reason = CORBA::string_dup("API_CorbaException"); - errors[0].origin = CORBA::string_dup("Connection::Cb_Cmd_Request()"); + errors[0].reason = Tango::string_dup("API_CorbaException"); + errors[0].origin = Tango::string_dup("Connection::Cb_Cmd_Request()"); string st = desc.str(); - errors[1].desc = CORBA::string_dup(st.c_str()); + errors[1].desc = Tango::string_dup(st.c_str()); errors[1].severity = Tango::ERR; - errors[1].reason = CORBA::string_dup("API_CommunicationFailed"); - errors[1].origin = CORBA::string_dup("Connection::Cb_Cmd_request()"); + errors[1].reason = Tango::string_dup("API_CommunicationFailed"); + errors[1].origin = Tango::string_dup("Connection::Cb_Cmd_request()"); } } @@ -526,10 +524,10 @@ void Connection::Cb_ReadAttr_Request(CORBA::Request_ptr req,Tango::CallBack *cb_ desc << ", attribute " << (*dev_attr)[i].name << ends; err_list.inout().length(nb_except + 1); - err_list[nb_except].reason = CORBA::string_dup(API_AttributeFailed); - err_list[nb_except].origin = CORBA::string_dup("Connection::Cb_ReadAttr_Request"); + err_list[nb_except].reason = Tango::string_dup(API_AttributeFailed); + err_list[nb_except].origin = Tango::string_dup("Connection::Cb_ReadAttr_Request"); string st = desc.str(); - err_list[nb_except].desc = CORBA::string_dup(st.c_str()); + err_list[nb_except].desc = Tango::string_dup(st.c_str()); err_list[nb_except].severity = Tango::ERR; } } @@ -576,16 +574,16 @@ void Connection::Cb_ReadAttr_Request(CORBA::Request_ptr req,Tango::CallBack *cb_ desc << ends; errors.length(2); - errors[0].desc = CORBA::string_dup(cb_excep_mess); + errors[0].desc = Tango::string_dup(cb_excep_mess); errors[0].severity = Tango::ERR; - errors[0].reason = CORBA::string_dup("API_CorbaException"); - errors[0].origin = CORBA::string_dup("Connection::Cb_ReadAttr_Request()"); + errors[0].reason = Tango::string_dup("API_CorbaException"); + errors[0].origin = Tango::string_dup("Connection::Cb_ReadAttr_Request()"); string st = desc.str(); - errors[1].desc = CORBA::string_dup(st.c_str()); + errors[1].desc = Tango::string_dup(st.c_str()); errors[1].severity = Tango::ERR; - errors[1].reason = CORBA::string_dup("API_DeviceTimedOut"); - errors[1].origin = CORBA::string_dup("Connection::Cb_ReadAttr_request()"); + errors[1].reason = Tango::string_dup("API_DeviceTimedOut"); + errors[1].origin = Tango::string_dup("Connection::Cb_ReadAttr_request()"); } } @@ -618,9 +616,9 @@ void Connection::Cb_ReadAttr_Request(CORBA::Request_ptr req,Tango::CallBack *cb_ errors[nb_err].severity = Tango::ERR; string st = desc.str(); - errors[nb_err].desc = CORBA::string_dup(st.c_str()); - errors[nb_err].origin = CORBA::string_dup("Connection::Cb_ReadAttr_Request()"); - errors[nb_err].reason = CORBA::string_dup(API_AttributeFailed); + errors[nb_err].desc = Tango::string_dup(st.c_str()); + errors[nb_err].origin = Tango::string_dup("Connection::Cb_ReadAttr_Request()"); + errors[nb_err].reason = Tango::string_dup(API_AttributeFailed); } else if (((sys_ex = CORBA::SystemException::_downcast(ex_ptr)) != NULL) && (to_except == false)) @@ -647,16 +645,16 @@ void Connection::Cb_ReadAttr_Request(CORBA::Request_ptr req,Tango::CallBack *cb_ desc << ends; errors.length(2); - errors[0].desc = CORBA::string_dup(cb_excep_mess); + errors[0].desc = Tango::string_dup(cb_excep_mess); errors[0].severity = Tango::ERR; - errors[0].reason = CORBA::string_dup("API_CorbaException"); - errors[0].origin = CORBA::string_dup("Connection::Cb_ReadAttr_Request()"); + errors[0].reason = Tango::string_dup("API_CorbaException"); + errors[0].origin = Tango::string_dup("Connection::Cb_ReadAttr_Request()"); string st = desc.str(); - errors[1].desc = CORBA::string_dup(st.c_str()); + errors[1].desc = Tango::string_dup(st.c_str()); errors[1].severity = Tango::ERR; - errors[1].reason = CORBA::string_dup("API_CommunicationFailed"); - errors[1].origin = CORBA::string_dup("Connection::Cb_ReadAttr_Request()"); + errors[1].reason = Tango::string_dup("API_CommunicationFailed"); + errors[1].origin = Tango::string_dup("Connection::Cb_ReadAttr_Request()"); } } @@ -754,16 +752,16 @@ void Connection::Cb_WriteAttr_Request(CORBA::Request_ptr req,Tango::CallBack *cb desc << ends; err_3.errors.length(2); - err_3.errors[0].desc = CORBA::string_dup(cb_excep_mess); + err_3.errors[0].desc = Tango::string_dup(cb_excep_mess); err_3.errors[0].severity = Tango::ERR; - err_3.errors[0].reason = CORBA::string_dup("API_CorbaException"); - err_3.errors[0].origin = CORBA::string_dup("Connection::Cb_WriteAttr_Request()"); + err_3.errors[0].reason = Tango::string_dup("API_CorbaException"); + err_3.errors[0].origin = Tango::string_dup("Connection::Cb_WriteAttr_Request()"); string st = desc.str(); - err_3.errors[1].desc = CORBA::string_dup(st.c_str()); + err_3.errors[1].desc = Tango::string_dup(st.c_str()); err_3.errors[1].severity = Tango::ERR; - err_3.errors[1].reason = CORBA::string_dup("API_DeviceTimedOut"); - err_3.errors[1].origin = CORBA::string_dup("Connection::Cb_WriteAttr_request()"); + err_3.errors[1].reason = Tango::string_dup("API_DeviceTimedOut"); + err_3.errors[1].origin = Tango::string_dup("Connection::Cb_WriteAttr_request()"); } } @@ -800,9 +798,9 @@ void Connection::Cb_WriteAttr_Request(CORBA::Request_ptr req,Tango::CallBack *cb err_3.errors.length(1); err_3.errors[0].severity = Tango::ERR; string st = desc.str(); - err_3.errors[0].desc = CORBA::string_dup(st.c_str()); - err_3.errors[0].origin = CORBA::string_dup("Connection::Cb_WriteAttr_Request()"); - err_3.errors[0].reason = CORBA::string_dup(API_AttributeFailed); + err_3.errors[0].desc = Tango::string_dup(st.c_str()); + err_3.errors[0].origin = Tango::string_dup("Connection::Cb_WriteAttr_Request()"); + err_3.errors[0].reason = Tango::string_dup(API_AttributeFailed); err_3.err_list.resize(1); err_3.err_list[0].err_stack = serv_ex->errors; @@ -840,9 +838,9 @@ void Connection::Cb_WriteAttr_Request(CORBA::Request_ptr req,Tango::CallBack *cb err_3.errors[0].severity = Tango::ERR; string st = desc.str(); - err_3.errors[0].desc = CORBA::string_dup(st.c_str()); - err_3.errors[0].origin = CORBA::string_dup("Connection::Cb_WriteAttr_Request()"); - err_3.errors[0].reason = CORBA::string_dup(API_AttributeFailed); + err_3.errors[0].desc = Tango::string_dup(st.c_str()); + err_3.errors[0].origin = Tango::string_dup("Connection::Cb_WriteAttr_Request()"); + err_3.errors[0].reason = Tango::string_dup(API_AttributeFailed); err_3.err_list.resize(1); err_3.err_list[0].err_stack = serv_ex->errors; @@ -878,16 +876,16 @@ void Connection::Cb_WriteAttr_Request(CORBA::Request_ptr req,Tango::CallBack *cb desc << ends; err_3.errors.length(2); - err_3.errors[0].desc = CORBA::string_dup(cb_excep_mess); + err_3.errors[0].desc = Tango::string_dup(cb_excep_mess); err_3.errors[0].severity = Tango::ERR; - err_3.errors[0].reason = CORBA::string_dup("API_CorbaException"); - err_3.errors[0].origin = CORBA::string_dup("Connection::Cb_WriteAttr_Request()"); + err_3.errors[0].reason = Tango::string_dup("API_CorbaException"); + err_3.errors[0].origin = Tango::string_dup("Connection::Cb_WriteAttr_Request()"); string st = desc.str(); - err_3.errors[1].desc = CORBA::string_dup(st.c_str()); + err_3.errors[1].desc = Tango::string_dup(st.c_str()); err_3.errors[1].severity = Tango::ERR; - err_3.errors[1].reason = CORBA::string_dup("API_CommunicationFailed"); - err_3.errors[1].origin = CORBA::string_dup("Connection::Cb_WriteAttr_Request()"); + err_3.errors[1].reason = Tango::string_dup("API_CommunicationFailed"); + err_3.errors[1].origin = Tango::string_dup("Connection::Cb_WriteAttr_Request()"); } } diff --git a/cppapi/client/zmqeventconsumer.cpp b/src/client/zmqeventconsumer.cpp similarity index 99% rename from cppapi/client/zmqeventconsumer.cpp rename to src/client/zmqeventconsumer.cpp index 5a179522b..15900f18c 100644 --- a/cppapi/client/zmqeventconsumer.cpp +++ b/src/client/zmqeventconsumer.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //===================================================================================================================== // // file : zmqeventconsumer.cpp @@ -34,7 +32,7 @@ static const char *RcsId = "$Id$"; //==================================================================================================================== #include -#include +#include #include #include @@ -2204,13 +2202,13 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq:: { if (data_type == PIPE) { - data_ptr = data_ptr + (sizeof(CORBA::Long) << 1); - data_size = data_size - (sizeof(CORBA::Long) << 1); + data_ptr = data_ptr + (sizeof(DevLong) << 1); + data_size = data_size - (sizeof(DevLong) << 1); } else { - data_ptr = data_ptr + sizeof(CORBA::Long); - data_size = data_size - sizeof(CORBA::Long); + data_ptr = data_ptr + sizeof(DevLong); + data_size = data_size - sizeof(DevLong); } } @@ -2261,7 +2259,7 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq:: errors.length(1); errors[0].reason = API_WrongEventData; errors[0].origin = "ZmqEventConsumer::push_zmq_event()"; - errors[0].desc = CORBA::string_dup(o.str().c_str()); + errors[0].desc = Tango::string_dup(o.str().c_str()); errors[0].severity = ERR; } } @@ -2295,7 +2293,7 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq:: errors.length(1); errors[0].reason = API_WrongEventData; errors[0].origin = "ZmqEventConsumer::push_zmq_event()"; - errors[0].desc = CORBA::string_dup(o.str().c_str()); + errors[0].desc = Tango::string_dup(o.str().c_str()); errors[0].severity = ERR; } } @@ -2319,7 +2317,7 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq:: errors.length(1); errors[0].reason = API_WrongEventData; errors[0].origin = "ZmqEventConsumer::push_zmq_event()"; - errors[0].desc = CORBA::string_dup(o.str().c_str()); + errors[0].desc = Tango::string_dup(o.str().c_str()); errors[0].severity = ERR; } } @@ -2351,7 +2349,7 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq:: errors.length(1); errors[0].reason = API_WrongEventData; errors[0].origin = "ZmqEventConsumer::push_zmq_event()"; - errors[0].desc = CORBA::string_dup(o.str().c_str()); + errors[0].desc = Tango::string_dup(o.str().c_str()); errors[0].severity = ERR; } break; @@ -2372,7 +2370,7 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq:: errors.length(1); errors[0].reason = API_WrongEventData; errors[0].origin = "ZmqEventConsumer::push_zmq_event()"; - errors[0].desc = CORBA::string_dup(o.str().c_str()); + errors[0].desc = Tango::string_dup(o.str().c_str()); errors[0].severity = ERR; } break; @@ -2412,7 +2410,7 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq:: errors.length(1); errors[0].reason = API_WrongEventData; errors[0].origin = "ZmqEventConsumer::push_zmq_event()"; - errors[0].desc = CORBA::string_dup(o.str().c_str()); + errors[0].desc = Tango::string_dup(o.str().c_str()); errors[0].severity = ERR; } } @@ -2450,7 +2448,7 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq:: errors.length(1); errors[0].reason = API_WrongEventData; errors[0].origin = "ZmqEventConsumer::push_zmq_event()"; - errors[0].desc = CORBA::string_dup(o.str().c_str()); + errors[0].desc = Tango::string_dup(o.str().c_str()); errors[0].severity = ERR; } } @@ -2474,7 +2472,7 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq:: errors.length(1); errors[0].reason = API_WrongEventData; errors[0].origin = "ZmqEventConsumer::push_zmq_event()"; - errors[0].desc = CORBA::string_dup(o.str().c_str()); + errors[0].desc = Tango::string_dup(o.str().c_str()); errors[0].severity = ERR; } } @@ -2497,7 +2495,7 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq:: errors.length(1); errors[0].reason = API_WrongEventData; errors[0].origin = "ZmqEventConsumer::push_zmq_event()"; - errors[0].desc = CORBA::string_dup(o.str().c_str()); + errors[0].desc = Tango::string_dup(o.str().c_str()); errors[0].severity = ERR; } } @@ -2516,10 +2514,10 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq:: dev_pipe = new DevicePipe(pipe_name,root_blob_name); dev_pipe->set_time(zdpd.time); - CORBA::ULong max,len; + DevULong max,len; max = zdpd.data_blob.blob_data.maximum(); len = zdpd.data_blob.blob_data.length(); - DevPipeDataElt *buf = zdpd.data_blob.blob_data.get_buffer((CORBA::Boolean)true); + DevPipeDataElt *buf = zdpd.data_blob.blob_data.get_buffer((DevBoolean)true); DevVarPipeDataEltArray *dvpdea = new DevVarPipeDataEltArray(max,len,buf,true); dev_pipe->get_root_blob().set_extract_data(dvpdea); @@ -2534,7 +2532,7 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq:: errors.length(1); errors[0].reason = API_WrongEventData; errors[0].origin = "ZmqEventConsumer::push_zmq_event()"; - errors[0].desc = CORBA::string_dup(o.str().c_str()); + errors[0].desc = Tango::string_dup(o.str().c_str()); errors[0].severity = ERR; } break; diff --git a/log4tango/AUTHORS b/src/log4tango/AUTHORS similarity index 100% rename from log4tango/AUTHORS rename to src/log4tango/AUTHORS diff --git a/log4tango/src/Appender.cpp b/src/log4tango/Appender.cpp similarity index 100% rename from log4tango/src/Appender.cpp rename to src/log4tango/Appender.cpp diff --git a/log4tango/src/AppenderAttachable.cpp b/src/log4tango/AppenderAttachable.cpp similarity index 100% rename from log4tango/src/AppenderAttachable.cpp rename to src/log4tango/AppenderAttachable.cpp diff --git a/src/log4tango/CMakeLists.txt b/src/log4tango/CMakeLists.txt new file mode 100644 index 000000000..283d0ab03 --- /dev/null +++ b/src/log4tango/CMakeLists.txt @@ -0,0 +1,29 @@ +set(SOURCES + Appender.cpp + AppenderAttachable.cpp + LayoutAppender.cpp + FileAppender.cpp + RollingFileAppender.cpp + OstreamAppender.cpp + Layout.cpp + PatternLayout.cpp + XmlLayout.cpp + Logger.cpp + LogSeparator.cpp + LoggerStream.cpp + LoggingEvent.cpp + Level.cpp + NDC.cpp + Filter.cpp + TimeStamp.cpp + StringUtil.hh + StringUtil.cpp + DllMain.cpp + DummyThreads.cpp + MSThreads.cpp + PThreads.cpp + PortabilityImpl.hh + PortabilityImpl.cpp) + +add_library(log4tango_objects OBJECT ${SOURCES}) +target_compile_options(log4tango_objects PRIVATE -fPIC) \ No newline at end of file diff --git a/log4tango/src/DllMain.cpp b/src/log4tango/DllMain.cpp similarity index 100% rename from log4tango/src/DllMain.cpp rename to src/log4tango/DllMain.cpp diff --git a/log4tango/src/DummyThreads.cpp b/src/log4tango/DummyThreads.cpp similarity index 100% rename from log4tango/src/DummyThreads.cpp rename to src/log4tango/DummyThreads.cpp diff --git a/log4tango/src/FileAppender.cpp b/src/log4tango/FileAppender.cpp similarity index 100% rename from log4tango/src/FileAppender.cpp rename to src/log4tango/FileAppender.cpp diff --git a/log4tango/src/Filter.cpp b/src/log4tango/Filter.cpp similarity index 100% rename from log4tango/src/Filter.cpp rename to src/log4tango/Filter.cpp diff --git a/log4tango/src/Layout.cpp b/src/log4tango/Layout.cpp similarity index 100% rename from log4tango/src/Layout.cpp rename to src/log4tango/Layout.cpp diff --git a/log4tango/src/LayoutAppender.cpp b/src/log4tango/LayoutAppender.cpp similarity index 100% rename from log4tango/src/LayoutAppender.cpp rename to src/log4tango/LayoutAppender.cpp diff --git a/log4tango/src/Level.cpp b/src/log4tango/Level.cpp similarity index 100% rename from log4tango/src/Level.cpp rename to src/log4tango/Level.cpp diff --git a/log4tango/src/LogSeparator.cpp b/src/log4tango/LogSeparator.cpp similarity index 100% rename from log4tango/src/LogSeparator.cpp rename to src/log4tango/LogSeparator.cpp diff --git a/log4tango/src/Logger.cpp b/src/log4tango/Logger.cpp similarity index 100% rename from log4tango/src/Logger.cpp rename to src/log4tango/Logger.cpp diff --git a/log4tango/src/LoggerStream.cpp b/src/log4tango/LoggerStream.cpp similarity index 100% rename from log4tango/src/LoggerStream.cpp rename to src/log4tango/LoggerStream.cpp diff --git a/log4tango/src/LoggingEvent.cpp b/src/log4tango/LoggingEvent.cpp similarity index 100% rename from log4tango/src/LoggingEvent.cpp rename to src/log4tango/LoggingEvent.cpp diff --git a/log4tango/src/MSThreads.cpp b/src/log4tango/MSThreads.cpp similarity index 100% rename from log4tango/src/MSThreads.cpp rename to src/log4tango/MSThreads.cpp diff --git a/log4tango/src/NDC.cpp b/src/log4tango/NDC.cpp similarity index 100% rename from log4tango/src/NDC.cpp rename to src/log4tango/NDC.cpp diff --git a/log4tango/src/OstreamAppender.cpp b/src/log4tango/OstreamAppender.cpp similarity index 100% rename from log4tango/src/OstreamAppender.cpp rename to src/log4tango/OstreamAppender.cpp diff --git a/log4tango/src/PThreads.cpp b/src/log4tango/PThreads.cpp similarity index 100% rename from log4tango/src/PThreads.cpp rename to src/log4tango/PThreads.cpp diff --git a/log4tango/src/PatternLayout.cpp b/src/log4tango/PatternLayout.cpp similarity index 100% rename from log4tango/src/PatternLayout.cpp rename to src/log4tango/PatternLayout.cpp diff --git a/log4tango/src/PortabilityImpl.cpp b/src/log4tango/PortabilityImpl.cpp similarity index 100% rename from log4tango/src/PortabilityImpl.cpp rename to src/log4tango/PortabilityImpl.cpp diff --git a/log4tango/src/PortabilityImpl.hh b/src/log4tango/PortabilityImpl.hh similarity index 100% rename from log4tango/src/PortabilityImpl.hh rename to src/log4tango/PortabilityImpl.hh diff --git a/log4tango/README b/src/log4tango/README similarity index 100% rename from log4tango/README rename to src/log4tango/README diff --git a/log4tango/src/RollingFileAppender.cpp b/src/log4tango/RollingFileAppender.cpp similarity index 100% rename from log4tango/src/RollingFileAppender.cpp rename to src/log4tango/RollingFileAppender.cpp diff --git a/log4tango/src/StringUtil.cpp b/src/log4tango/StringUtil.cpp similarity index 100% rename from log4tango/src/StringUtil.cpp rename to src/log4tango/StringUtil.cpp diff --git a/log4tango/src/StringUtil.hh b/src/log4tango/StringUtil.hh similarity index 100% rename from log4tango/src/StringUtil.hh rename to src/log4tango/StringUtil.hh diff --git a/log4tango/THANKS b/src/log4tango/THANKS similarity index 100% rename from log4tango/THANKS rename to src/log4tango/THANKS diff --git a/log4tango/src/TimeStamp.cpp b/src/log4tango/TimeStamp.cpp similarity index 100% rename from log4tango/src/TimeStamp.cpp rename to src/log4tango/TimeStamp.cpp diff --git a/log4tango/src/XmlLayout.cpp b/src/log4tango/XmlLayout.cpp similarity index 100% rename from log4tango/src/XmlLayout.cpp rename to src/log4tango/XmlLayout.cpp diff --git a/log4tango/src/snprintf.c b/src/log4tango/snprintf.c similarity index 100% rename from log4tango/src/snprintf.c rename to src/log4tango/snprintf.c diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt new file mode 100644 index 000000000..e46ad9c2a --- /dev/null +++ b/src/server/CMakeLists.txt @@ -0,0 +1,67 @@ +set(SOURCES attrdesc.cpp + attrgetsetprop.cpp + attribute.cpp + attrsetval.cpp + attrmanip.cpp + basiccommand.cpp + blackbox.cpp + class_factory.cpp + classattribute.cpp + command.cpp + coutappender.cpp + classpipe.cpp + dev_event.cpp + dev_poll.cpp + device.cpp + device_2.cpp + device_3.cpp + device_4.cpp + device_5.cpp + deviceclass.cpp + devicelog.cpp + devintr.cpp + dintrthread.cpp + dserver.cpp + dserverclass.cpp + dserverlock.cpp + dserverlog.cpp + dserverpoll.cpp + dserversignal.cpp + encoded_attribute.cpp + eventcmds.cpp + eventsupplier.cpp + except.cpp + fwdattrdesc.cpp + fwdattribute.cpp + logcmds.cpp + logging.cpp + logstream.cpp + multiattribute.cpp + notifdeventsupplier.cpp + pipe.cpp + pollcmds.cpp + pollobj.cpp + pollring.cpp + pollthread.cpp + rootattreg.cpp + seqvec.cpp + subdev_diag.cpp + tangoappender.cpp + tangorollingfileappender.cpp + templ_inst.cpp + thsig.cpp + utils.cpp + utils_polling.cpp + utils_shut.cpp + w_attribute.cpp + w_pipe.cpp + zmqeventsupplier.cpp) + + +add_subdirectory(jpeg) +add_subdirectory(jpeg_mmx) + +add_library(server_objects OBJECT ${SOURCES}) +target_compile_options(server_objects PRIVATE -fPIC) +target_include_directories(server_objects PRIVATE .) + diff --git a/cppapi/server/README b/src/server/README similarity index 100% rename from cppapi/server/README rename to src/server/README diff --git a/cppapi/server/attrdesc.cpp b/src/server/attrdesc.cpp similarity index 99% rename from cppapi/server/attrdesc.cpp rename to src/server/attrdesc.cpp index 8b7f90149..fc78b6df5 100644 --- a/cppapi/server/attrdesc.cpp +++ b/src/server/attrdesc.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+=================================================================================================================== // // file : attrdesc.cpp @@ -38,7 +36,7 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include +#include namespace Tango { diff --git a/cppapi/server/attrgetsetprop.cpp b/src/server/attrgetsetprop.cpp similarity index 96% rename from cppapi/server/attrgetsetprop.cpp rename to src/server/attrgetsetprop.cpp index 5db7d11c0..26fbe100d 100644 --- a/cppapi/server/attrgetsetprop.cpp +++ b/src/server/attrgetsetprop.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //==================================================================================================================== // // file : attrgetsetprop.cpp @@ -37,9 +35,9 @@ static const char *RcsId = "$Id$"; #endif #include -#include -#include -#include +#include +#include +#include #include #include @@ -80,23 +78,23 @@ void Attribute::get_properties(Tango::AttributeConfig &conf) conf.max_dim_x = max_x; conf.max_dim_y = max_y; conf.data_type = data_type; - conf.name = CORBA::string_dup(name.c_str()); + conf.name = Tango::string_dup(name.c_str()); // // Copy optional properties // - conf.label = CORBA::string_dup(label.c_str()); - conf.description = CORBA::string_dup(description.c_str()); - conf.unit = CORBA::string_dup(unit.c_str()); - conf.standard_unit = CORBA::string_dup(standard_unit.c_str()); - conf.display_unit = CORBA::string_dup(display_unit.c_str()); - conf.format = CORBA::string_dup(format.c_str()); - conf.writable_attr_name = CORBA::string_dup(writable_attr_name.c_str()); - conf.min_alarm = CORBA::string_dup(min_alarm_str.c_str()); - conf.max_alarm = CORBA::string_dup(max_alarm_str.c_str()); - conf.min_value = CORBA::string_dup(min_value_str.c_str()); - conf.max_value = CORBA::string_dup(max_value_str.c_str()); + conf.label = Tango::string_dup(label.c_str()); + conf.description = Tango::string_dup(description.c_str()); + conf.unit = Tango::string_dup(unit.c_str()); + conf.standard_unit = Tango::string_dup(standard_unit.c_str()); + conf.display_unit = Tango::string_dup(display_unit.c_str()); + conf.format = Tango::string_dup(format.c_str()); + conf.writable_attr_name = Tango::string_dup(writable_attr_name.c_str()); + conf.min_alarm = Tango::string_dup(min_alarm_str.c_str()); + conf.max_alarm = Tango::string_dup(max_alarm_str.c_str()); + conf.min_value = Tango::string_dup(min_value_str.c_str()); + conf.max_value = Tango::string_dup(max_value_str.c_str()); } void Attribute::get_properties(Tango::AttributeConfig_2 &conf) @@ -111,23 +109,23 @@ void Attribute::get_properties(Tango::AttributeConfig_2 &conf) conf.max_dim_x = max_x; conf.max_dim_y = max_y; conf.data_type = data_type; - conf.name = CORBA::string_dup(name.c_str()); + conf.name = Tango::string_dup(name.c_str()); // // Copy optional properties // - conf.label = CORBA::string_dup(label.c_str()); - conf.description = CORBA::string_dup(description.c_str()); - conf.unit = CORBA::string_dup(unit.c_str()); - conf.standard_unit = CORBA::string_dup(standard_unit.c_str()); - conf.display_unit = CORBA::string_dup(display_unit.c_str()); - conf.format = CORBA::string_dup(format.c_str()); - conf.writable_attr_name = CORBA::string_dup(writable_attr_name.c_str()); - conf.min_alarm = CORBA::string_dup(min_alarm_str.c_str()); - conf.max_alarm = CORBA::string_dup(max_alarm_str.c_str()); - conf.min_value = CORBA::string_dup(min_value_str.c_str()); - conf.max_value = CORBA::string_dup(max_value_str.c_str()); + conf.label = Tango::string_dup(label.c_str()); + conf.description = Tango::string_dup(description.c_str()); + conf.unit = Tango::string_dup(unit.c_str()); + conf.standard_unit = Tango::string_dup(standard_unit.c_str()); + conf.display_unit = Tango::string_dup(display_unit.c_str()); + conf.format = Tango::string_dup(format.c_str()); + conf.writable_attr_name = Tango::string_dup(writable_attr_name.c_str()); + conf.min_alarm = Tango::string_dup(min_alarm_str.c_str()); + conf.max_alarm = Tango::string_dup(max_alarm_str.c_str()); + conf.min_value = Tango::string_dup(min_value_str.c_str()); + conf.max_value = Tango::string_dup(max_value_str.c_str()); conf.level = disp_level; } @@ -158,36 +156,36 @@ void Attribute::get_properties(Tango::AttributeConfig_3 &conf) conf.max_dim_x = max_x; conf.max_dim_y = max_y; conf.data_type = data_type; - conf.name = CORBA::string_dup(name.c_str()); + conf.name = Tango::string_dup(name.c_str()); // // Copy optional properties // - conf.label = CORBA::string_dup(label.c_str()); - conf.description = CORBA::string_dup(description.c_str()); - conf.unit = CORBA::string_dup(unit.c_str()); - conf.standard_unit = CORBA::string_dup(standard_unit.c_str()); - conf.display_unit = CORBA::string_dup(display_unit.c_str()); - conf.format = CORBA::string_dup(format.c_str()); - conf.writable_attr_name = CORBA::string_dup(writable_attr_name.c_str()); - conf.min_value = CORBA::string_dup(min_value_str.c_str()); - conf.max_value = CORBA::string_dup(max_value_str.c_str()); + conf.label = Tango::string_dup(label.c_str()); + conf.description = Tango::string_dup(description.c_str()); + conf.unit = Tango::string_dup(unit.c_str()); + conf.standard_unit = Tango::string_dup(standard_unit.c_str()); + conf.display_unit = Tango::string_dup(display_unit.c_str()); + conf.format = Tango::string_dup(format.c_str()); + conf.writable_attr_name = Tango::string_dup(writable_attr_name.c_str()); + conf.min_value = Tango::string_dup(min_value_str.c_str()); + conf.max_value = Tango::string_dup(max_value_str.c_str()); conf.level = disp_level; // // Copy alarm properties // - conf.att_alarm.min_alarm = CORBA::string_dup(min_alarm_str.c_str()); - conf.att_alarm.max_alarm = CORBA::string_dup(max_alarm_str.c_str()); - conf.att_alarm.min_warning = CORBA::string_dup(min_warning_str.c_str()); - conf.att_alarm.max_warning = CORBA::string_dup(max_warning_str.c_str()); + conf.att_alarm.min_alarm = Tango::string_dup(min_alarm_str.c_str()); + conf.att_alarm.max_alarm = Tango::string_dup(max_alarm_str.c_str()); + conf.att_alarm.min_warning = Tango::string_dup(min_warning_str.c_str()); + conf.att_alarm.max_warning = Tango::string_dup(max_warning_str.c_str()); if (delta_t == 0) - conf.att_alarm.delta_t = CORBA::string_dup(AlrmValueNotSpec); + conf.att_alarm.delta_t = Tango::string_dup(AlrmValueNotSpec); else - conf.att_alarm.delta_t = CORBA::string_dup(delta_t_str.c_str()); - conf.att_alarm.delta_val = CORBA::string_dup(delta_val_str.c_str()); + conf.att_alarm.delta_t = Tango::string_dup(delta_t_str.c_str()); + conf.att_alarm.delta_val = Tango::string_dup(delta_val_str.c_str()); // // Copy periodic event property @@ -197,7 +195,7 @@ void Attribute::get_properties(Tango::AttributeConfig_3 &conf) str.precision(TANGO_FLOAT_PRECISION); if (event_period == INT_MAX) - conf.event_prop.per_event.period = CORBA::string_dup((const char *)(DEFAULT_EVENT_PERIOD)); + conf.event_prop.per_event.period = Tango::string_dup((const char *)(DEFAULT_EVENT_PERIOD)); else { int per = (int)((double)event_period); @@ -212,7 +210,7 @@ void Attribute::get_properties(Tango::AttributeConfig_3 &conf) if (fabs(rel_change[0]) == fabs(rel_change[1])) { if (rel_change[0] == INT_MAX) - conf.event_prop.ch_event.rel_change = CORBA::string_dup(AlrmValueNotSpec); + conf.event_prop.ch_event.rel_change = Tango::string_dup(AlrmValueNotSpec); else { str << fabs(rel_change[1]); @@ -237,7 +235,7 @@ void Attribute::get_properties(Tango::AttributeConfig_3 &conf) if (fabs(abs_change[0]) == fabs(abs_change[1])) { if (abs_change[0] == INT_MAX) - conf.event_prop.ch_event.abs_change = CORBA::string_dup(AlrmValueNotSpec); + conf.event_prop.ch_event.abs_change = Tango::string_dup(AlrmValueNotSpec); else { str << fabs(abs_change[1]); @@ -264,7 +262,7 @@ void Attribute::get_properties(Tango::AttributeConfig_3 &conf) // if (archive_period == INT_MAX) - conf.event_prop.arch_event.period = CORBA::string_dup(AlrmValueNotSpec); + conf.event_prop.arch_event.period = Tango::string_dup(AlrmValueNotSpec); else { int per = (int)((double)archive_period); @@ -275,7 +273,7 @@ void Attribute::get_properties(Tango::AttributeConfig_3 &conf) if (fabs(archive_rel_change[0]) == fabs(archive_rel_change[1])) { if (archive_rel_change[0] == INT_MAX) - conf.event_prop.arch_event.rel_change = CORBA::string_dup(AlrmValueNotSpec); + conf.event_prop.arch_event.rel_change = Tango::string_dup(AlrmValueNotSpec); else { str << fabs(archive_rel_change[1]); @@ -300,7 +298,7 @@ void Attribute::get_properties(Tango::AttributeConfig_3 &conf) if (fabs(archive_abs_change[0]) == fabs(archive_abs_change[1])) { if (archive_abs_change[0] == INT_MAX) - conf.event_prop.arch_event.abs_change = CORBA::string_dup(AlrmValueNotSpec); + conf.event_prop.arch_event.abs_change = Tango::string_dup(AlrmValueNotSpec); else { str << fabs(archive_abs_change[1]); @@ -386,10 +384,10 @@ void Attribute::add_config_5_specific(AttributeConfig_5 &conf) { FwdAttribute *fwd = static_cast(this); string str(fwd->get_fwd_dev_name() + '/' + fwd->get_fwd_att_name()); - conf.root_attr_name = CORBA::string_dup(str.c_str()); + conf.root_attr_name = Tango::string_dup(str.c_str()); } else - conf.root_attr_name = CORBA::string_dup(AlrmValueNotSpec); + conf.root_attr_name = Tango::string_dup(AlrmValueNotSpec); // // Memorized info @@ -415,7 +413,7 @@ void Attribute::add_config_5_specific(AttributeConfig_5 &conf) { conf.enum_labels.length(enum_labels.size()); for (size_t loop = 0;loop < enum_labels.size();loop++) - conf.enum_labels[loop] = CORBA::string_dup(enum_labels[loop].c_str()); + conf.enum_labels[loop] = Tango::string_dup(enum_labels[loop].c_str()); } } @@ -2246,11 +2244,6 @@ void Attribute::set_one_event_prop(const char *prop_name,const CORBA::String_mem prop_val[1] = rel_change_tmp[1]; } - if (strcmp(prop_name,"archive_rel_change") == 0 || strcmp(prop_name,"rel_change") == 0) - prop_val[0] = fabs(prop_val[0]); - prop_val[1] = fabs(prop_val[1]); - - // // Manage db // @@ -3065,12 +3058,12 @@ void Attribute::event_prop_db_xxx(vector &rel_change_tmp,vector vector rel_change_usr_def_tmp(2); rel_change_usr_def_tmp[0] = rel_change_usr_def_tmp[1] = false; - if(rel_change_tmp[0] == fabs(rel_change_usr[0])) + if(rel_change_tmp[0] == rel_change_usr[0]) { rel_change_str_tmp[0] = NotANumber; rel_change_usr_def_tmp[0] = true; } - if(rel_change_tmp[1] == fabs(rel_change_usr[1])) + if(rel_change_tmp[1] == rel_change_usr[1]) { rel_change_str_tmp[1] = NotANumber; rel_change_usr_def_tmp[1] = true; diff --git a/cppapi/server/attribute.cpp b/src/server/attribute.cpp similarity index 99% rename from cppapi/server/attribute.cpp rename to src/server/attribute.cpp index 52bd92e7e..ac28acd74 100644 --- a/cppapi/server/attribute.cpp +++ b/src/server/attribute.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //==================================================================================================================== // // file : Attribute.cpp @@ -39,9 +37,9 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include -#include -#include +#include +#include +#include #include #include @@ -1159,7 +1157,7 @@ void Attribute::init_enum_prop(vector &prop_list) stringstream ss; ss << "The attribute " << name << " has the DEV_ENUM data type but there is no enumeration label(s) defined"; - e.errors[0].desc = CORBA::string_dup(ss.str().c_str()); + e.errors[0].desc = Tango::string_dup(ss.str().c_str()); } add_startup_exception("enum_labels",e); } @@ -1628,16 +1626,16 @@ void Attribute::set_time() struct _timeb t; _ftime(&t); - when.tv_sec = (CORBA::Long)t.time; - when.tv_usec = (CORBA::Long)(t.millitm * 1000); + when.tv_sec = (DevLong)t.time; + when.tv_usec = (DevLong)(t.millitm * 1000); when.tv_nsec = 0; #else struct timezone tz; struct timeval tv; gettimeofday(&tv,&tz); - when.tv_sec = (CORBA::Long)tv.tv_sec; - when.tv_usec = (CORBA::Long)tv.tv_usec; + when.tv_sec = (DevLong)tv.tv_sec; + when.tv_usec = (DevLong)tv.tv_usec; when.tv_nsec = 0; #endif } @@ -3004,7 +3002,7 @@ void Attribute::add_write_value(Tango::DevVarStringArray *val_ptr) { char **strvec = Tango::DevVarStringArray::allocbuf(2); strvec[0] = tmp_str[0]; - strvec[1] = CORBA::string_dup((*val_ptr)[0]); + strvec[1] = Tango::string_dup((*val_ptr)[0]); value.str_seq = new Tango::DevVarStringArray(2,2,strvec,true); } else @@ -3018,7 +3016,7 @@ void Attribute::add_write_value(Tango::DevVarStringArray *val_ptr) long nb_read = value.str_seq->length(); value.str_seq->length(nb_read + val_ptr->length()); for (unsigned int k = 0;k < val_ptr->length();k++) - (*value.str_seq)[nb_read + k] = CORBA::string_dup((*val_ptr)[k]); + (*value.str_seq)[nb_read + k] = Tango::string_dup((*val_ptr)[k]); } } @@ -3172,7 +3170,7 @@ void Attribute::Attribute_2_AttributeValue(Tango::AttributeValue_3 *ptr,Tango::D { Tango::DevVarStringArray str_seq(1); str_seq.length(1); - str_seq[0] = CORBA::string_dup(d->get_status().c_str()); + str_seq[0] = Tango::string_dup(d->get_status().c_str()); a <<= str_seq; } @@ -3197,7 +3195,7 @@ void Attribute::Attribute_2_AttributeValue(Tango::AttributeValue_3 *ptr,Tango::D ptr->w_dim.dim_x = 0; ptr->w_dim.dim_y = 0; - ptr->name = CORBA::string_dup(name.c_str()); + ptr->name = Tango::string_dup(name.c_str()); } else @@ -3361,7 +3359,7 @@ void Attribute::Attribute_2_AttributeValue(Tango::AttributeValue_3 *ptr,Tango::D ptr->time = when; ptr->quality = quality; - ptr->name = CORBA::string_dup(name.c_str()); + ptr->name = Tango::string_dup(name.c_str()); } } diff --git a/cppapi/server/attrmanip.cpp b/src/server/attrmanip.cpp similarity index 97% rename from cppapi/server/attrmanip.cpp rename to src/server/attrmanip.cpp index 70bc08baa..5409b2321 100644 --- a/cppapi/server/attrmanip.cpp +++ b/src/server/attrmanip.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+=================================================================================================================== // // file : attrmanip.cpp @@ -37,7 +35,7 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include +#include namespace Tango { diff --git a/cppapi/server/attrsetval.cpp b/src/server/attrsetval.cpp similarity index 99% rename from cppapi/server/attrsetval.cpp rename to src/server/attrsetval.cpp index f3199e451..84518bafc 100644 --- a/cppapi/server/attrsetval.cpp +++ b/src/server/attrsetval.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //==================================================================================================================== // // file : attrsetval.cpp @@ -37,9 +35,9 @@ static const char *RcsId = "$Id$"; #endif #include -#include -#include -#include +#include +#include +#include #include #include @@ -751,7 +749,7 @@ void Attribute::set_value(Tango::DevString *p_data,long x, long y,bool release) value.str_seq = new Tango::DevVarStringArray(data_size); value.str_seq->length(data_size); for (int k = 0;k < data_size;k++) - (*value.str_seq)[k] = CORBA::string_dup(p_data[k]); + (*value.str_seq)[k] = Tango::string_dup(p_data[k]); if (release == true) { if (is_fwd_att() == true) @@ -773,7 +771,7 @@ void Attribute::set_value(Tango::DevString *p_data,long x, long y,bool release) if (is_fwd_att() == true) { for (int i = 0;i < data_size;i++) - strvec[i] = CORBA::string_dup(p_data[i]); + strvec[i] = Tango::string_dup(p_data[i]); } else { @@ -1597,7 +1595,7 @@ void Attribute::set_value(Tango::DevString *p_data_str,Tango::DevUChar *p_data,l if (release == false) { - enc_help.encoded_format = CORBA::string_dup(*p_data_str); + enc_help.encoded_format = Tango::string_dup(*p_data_str); enc_help.encoded_data.replace(size,size,p_data,false); set_value(&enc_help); @@ -1605,7 +1603,7 @@ void Attribute::set_value(Tango::DevString *p_data_str,Tango::DevUChar *p_data,l else { DevEncoded *enc_ptr = new DevEncoded; - enc_ptr->encoded_format = CORBA::string_dup(*p_data_str); + enc_ptr->encoded_format = Tango::string_dup(*p_data_str); delete [] *p_data_str; enc_ptr->encoded_data.replace(size,size,p_data,true); diff --git a/cppapi/server/basiccommand.cpp b/src/server/basiccommand.cpp similarity index 98% rename from cppapi/server/basiccommand.cpp rename to src/server/basiccommand.cpp index f3d9a4aca..b5432f3c4 100644 --- a/cppapi/server/basiccommand.cpp +++ b/src/server/basiccommand.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+================================================================================================================== // // file : BasicCommand.cpp @@ -39,9 +37,9 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include -#include -#include +#include +#include +#include extern omni_thread::key_t key_py_data; diff --git a/cppapi/server/blackbox.cpp b/src/server/blackbox.cpp similarity index 99% rename from cppapi/server/blackbox.cpp rename to src/server/blackbox.cpp index c3cb79007..ad20dd402 100644 --- a/cppapi/server/blackbox.cpp +++ b/src/server/blackbox.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+================================================================================================================== // // file : BlackBox.cpp @@ -40,7 +38,7 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include +#include #include @@ -76,7 +74,7 @@ extern omni_thread::key_t key; // The function called by the interceptor // -CORBA::Boolean get_client_addr(omni::omniInterceptors::serverReceiveRequest_T::info_T &info) +DevBoolean get_client_addr(omni::omniInterceptors::serverReceiveRequest_T::info_T &info) { omni_thread::self()->set_value(key,new client_addr(((omni::giopStrand &)info.giop_s.strand()).connection->peeraddress())); return true; @@ -1102,12 +1100,8 @@ void BlackBox::inc_indexes() void BlackBox::get_client_host() { omni_thread *th_id = omni_thread::self(); - bool dummy = false; if (th_id == NULL) - { th_id = omni_thread::create_dummy(); - dummy = true; - } omni_thread::value_t *ip = th_id->get_value(key); if (ip == NULL) @@ -1148,9 +1142,6 @@ void BlackBox::get_client_host() } else strcpy(box[insert_elt].host_ip_str,(static_cast(ip))->client_ip); - - if (dummy == true) - omni_thread::release_dummy(); } //+------------------------------------------------------------------------------------------------------------------- diff --git a/cppapi/server/class_factory.cpp b/src/server/class_factory.cpp similarity index 98% rename from cppapi/server/class_factory.cpp rename to src/server/class_factory.cpp index 5078e715e..356dacad9 100644 --- a/cppapi/server/class_factory.cpp +++ b/src/server/class_factory.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+=========================================================================== // // file : class_factory.cpp @@ -44,7 +42,7 @@ static const char *RcsId = "$Id$\n$Name$"; #include #endif -#include +#include namespace Tango { diff --git a/cppapi/server/classattribute.cpp b/src/server/classattribute.cpp similarity index 99% rename from cppapi/server/classattribute.cpp rename to src/server/classattribute.cpp index 0f83fcb90..e1c7295df 100644 --- a/cppapi/server/classattribute.cpp +++ b/src/server/classattribute.cpp @@ -1,6 +1,3 @@ - -static const char *RcsId = "$Id$\n$Name$"; - //+================================================================================================================= // // file : ClassAttribute.cpp @@ -44,7 +41,7 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include +#include #include namespace Tango diff --git a/cppapi/server/classpipe.cpp b/src/server/classpipe.cpp similarity index 98% rename from cppapi/server/classpipe.cpp rename to src/server/classpipe.cpp index 1a6b50330..1a6db4e7e 100644 --- a/cppapi/server/classpipe.cpp +++ b/src/server/classpipe.cpp @@ -1,6 +1,3 @@ - -static const char *RcsId = "$Id$\n$Name$"; - //+================================================================================================================= // // file : ClassPipe.cpp @@ -38,7 +35,7 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include +#include namespace Tango { diff --git a/cppapi/server/command.cpp b/src/server/command.cpp similarity index 99% rename from cppapi/server/command.cpp rename to src/server/command.cpp index 964d8408b..a9e61dae8 100644 --- a/cppapi/server/command.cpp +++ b/src/server/command.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================ // // file : Command.cpp diff --git a/cppapi/server/coutappender.cpp b/src/server/coutappender.cpp similarity index 97% rename from cppapi/server/coutappender.cpp rename to src/server/coutappender.cpp index e57edab03..fa1206d07 100644 --- a/cppapi/server/coutappender.cpp +++ b/src/server/coutappender.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================= // // file : coutappender.cpp @@ -80,7 +78,7 @@ static const char *RcsId = "$Id$\n$Name$"; #if defined(TANGO_HAS_LOG4TANGO) -#include +#include namespace Tango { diff --git a/cppapi/server/coutbuf.cpp b/src/server/coutbuf.cpp similarity index 99% rename from cppapi/server/coutbuf.cpp rename to src/server/coutbuf.cpp index b22af9ed1..6c4c7ebb4 100644 --- a/cppapi/server/coutbuf.cpp +++ b/src/server/coutbuf.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================= // // file : coutbuf.cpp @@ -40,7 +38,7 @@ static const char *RcsId = "$Id$\n$Name$"; #include #endif -#include +#include "../../include/tango/server/coutbuf.h" #include #include diff --git a/cppapi/server/dev_event.cpp b/src/server/dev_event.cpp similarity index 99% rename from cppapi/server/dev_event.cpp rename to src/server/dev_event.cpp index 89cabef76..808468765 100644 --- a/cppapi/server/dev_event.cpp +++ b/src/server/dev_event.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+================================================================================================================== // // file : dev_event.cpp @@ -37,7 +35,7 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include +#include #ifdef _TG_WINDOWS_ #include @@ -46,7 +44,7 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #ifdef TANGO_HAS_LOG4TANGO -#include +#include #endif namespace Tango diff --git a/cppapi/server/dev_poll.cpp b/src/server/dev_poll.cpp similarity index 98% rename from cppapi/server/dev_poll.cpp rename to src/server/dev_poll.cpp index 6487d2772..b8324715e 100644 --- a/cppapi/server/dev_poll.cpp +++ b/src/server/dev_poll.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //+=================================================================================================================== // // file : dev_poll.cpp @@ -533,15 +531,15 @@ void DeviceImpl::poll_object(const string &obj_name,int period,PollObjType type) send->lvalue.length(1); send->svalue.length(3); - send->svalue[0] = CORBA::string_dup(get_name().c_str()); + send->svalue[0] = Tango::string_dup(get_name().c_str()); string obj_type; if (type == POLL_ATTR) obj_type = "attribute"; else obj_type = "command"; obj_type = obj_type + LOCAL_POLL_REQUEST; - send->svalue[1] = CORBA::string_dup(obj_type.c_str()); - send->svalue[2] = CORBA::string_dup(obj_name.c_str()); + send->svalue[1] = Tango::string_dup(obj_type.c_str()); + send->svalue[2] = Tango::string_dup(obj_name.c_str()); send->lvalue[0] = period; the_any <<= send; @@ -689,15 +687,15 @@ void DeviceImpl::stop_poll_object(const string &obj_name,PollObjType type) DevVarStringArray *send = new DevVarStringArray(); send->length(3); - (*send)[0] = CORBA::string_dup(get_name().c_str()); + (*send)[0] = Tango::string_dup(get_name().c_str()); string str_type; if (type == POLL_CMD) str_type = "command"; else str_type = "attribute"; str_type = str_type + LOCAL_POLL_REQUEST; - (*send)[1] = CORBA::string_dup(str_type.c_str()); - (*send)[2] = CORBA::string_dup(obj_name.c_str()); + (*send)[1] = Tango::string_dup(str_type.c_str()); + (*send)[2] = Tango::string_dup(obj_name.c_str()); the_any <<= send; diff --git a/cppapi/server/device.cpp b/src/server/device.cpp similarity index 98% rename from cppapi/server/device.cpp rename to src/server/device.cpp index c09588b07..b0c17832d 100644 --- a/cppapi/server/device.cpp +++ b/src/server/device.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //+================================================================================================================== // // file : Device.cpp @@ -40,15 +38,15 @@ static const char *RcsId = "$Id$"; #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #ifdef TANGO_HAS_LOG4TANGO -#include +#include #endif namespace Tango @@ -1507,7 +1505,7 @@ char *DeviceImpl::name() // cout4 << "Leaving DeviceImpl::name" << endl; - return CORBA::string_dup(device_name.c_str()); + return Tango::string_dup(device_name.c_str()); } //+------------------------------------------------------------------------- @@ -1557,7 +1555,7 @@ char *DeviceImpl::adm_name() // cout4 << "Leaving DeviceImpl::adm_name" << endl; - return CORBA::string_dup(adm_device_name.c_str()); + return Tango::string_dup(adm_device_name.c_str()); } @@ -1609,7 +1607,7 @@ char *DeviceImpl::description() // cout4 << "Leaving DeviceImpl::description" << endl; - return CORBA::string_dup(desc.c_str()); + return Tango::string_dup(desc.c_str()); } //+------------------------------------------------------------------------- @@ -1744,7 +1742,7 @@ char *DeviceImpl::status() // always_executed_hook(); - tmp = CORBA::string_dup(dev_status()); + tmp = Tango::string_dup(dev_status()); } catch (Tango::DevFailed &e) { @@ -1755,9 +1753,9 @@ char *DeviceImpl::status() } if (strcmp(e.errors[0].reason,API_CommandTimedOut) == 0) - tmp = CORBA::string_dup("Not able to acquire device monitor"); + tmp = Tango::string_dup("Not able to acquire device monitor"); else - tmp = CORBA::string_dup("Got exception when trying to build device status"); + tmp = Tango::string_dup("Got exception when trying to build device status"); } catch (...) { @@ -1794,7 +1792,7 @@ char *DeviceImpl::status() //-------------------------------------------------------------------------- -Tango::DevVarStringArray* DeviceImpl::black_box(CORBA::Long n) +Tango::DevVarStringArray* DeviceImpl::black_box(DevLong n) { cout4 << "DeviceImpl::black_box arrived" << endl; @@ -1846,20 +1844,20 @@ Tango::DevCmdInfoList* DeviceImpl::command_list_query() for (long i = 0;i < nb_cmd;i++) { Tango::DevCmdInfo tmp; - tmp.cmd_name = CORBA::string_dup(((device_class->get_command_list())[i]->get_name()).c_str()); + tmp.cmd_name = Tango::string_dup(((device_class->get_command_list())[i]->get_name()).c_str()); tmp.cmd_tag = (long)((device_class->get_command_list())[i]->get_disp_level()); tmp.in_type = (long)((device_class->get_command_list())[i]->get_in_type()); tmp.out_type = (long)((device_class->get_command_list())[i]->get_out_type()); string &str_in = (device_class->get_command_list())[i]->get_in_type_desc(); if (str_in.size() != 0) - tmp.in_type_desc = CORBA::string_dup(str_in.c_str()); + tmp.in_type_desc = Tango::string_dup(str_in.c_str()); else - tmp.in_type_desc = CORBA::string_dup(NotSet); + tmp.in_type_desc = Tango::string_dup(NotSet); string &str_out = (device_class->get_command_list())[i]->get_out_type_desc(); if (str_out.size() != 0) - tmp.out_type_desc = CORBA::string_dup(str_out.c_str()); + tmp.out_type_desc = Tango::string_dup(str_out.c_str()); else - tmp.out_type_desc = CORBA::string_dup(NotSet); + tmp.out_type_desc = Tango::string_dup(NotSet); (*back)[i] = tmp; } @@ -1930,20 +1928,20 @@ Tango::DevCmdInfo *DeviceImpl::command_query(const char *command) { if (device_class->get_command_list()[i]->get_lower_name() == cmd) { - back->cmd_name = CORBA::string_dup(((device_class->get_command_list())[i]->get_name()).c_str()); + back->cmd_name = Tango::string_dup(((device_class->get_command_list())[i]->get_name()).c_str()); back->cmd_tag = (long)((device_class->get_command_list())[i]->get_disp_level()); back->in_type = (long)((device_class->get_command_list())[i]->get_in_type()); back->out_type = (long)((device_class->get_command_list())[i]->get_out_type()); string &str_in = (device_class->get_command_list())[i]->get_in_type_desc(); if (str_in.size() != 0) - back->in_type_desc = CORBA::string_dup(str_in.c_str()); + back->in_type_desc = Tango::string_dup(str_in.c_str()); else - back->in_type_desc = CORBA::string_dup(NotSet); + back->in_type_desc = Tango::string_dup(NotSet); string &str_out = (device_class->get_command_list())[i]->get_out_type_desc(); if (str_out.size() != 0) - back->out_type_desc = CORBA::string_dup(str_out.c_str()); + back->out_type_desc = Tango::string_dup(str_out.c_str()); else - back->out_type_desc = CORBA::string_dup(NotSet); + back->out_type_desc = Tango::string_dup(NotSet); break; } } @@ -2015,14 +2013,14 @@ Tango::DevInfo *DeviceImpl::info() // Tango::Util *tango_ptr = Tango::Util::instance(); - back->server_host = CORBA::string_dup(tango_ptr->get_host_name().c_str()); + back->server_host = Tango::string_dup(tango_ptr->get_host_name().c_str()); // // Fill-in remaining structure fields // - back->dev_class = CORBA::string_dup(device_class->get_name().c_str()); - back->server_id = CORBA::string_dup(tango_ptr->get_ds_name().c_str()); + back->dev_class = Tango::string_dup(device_class->get_name().c_str()); + back->server_id = Tango::string_dup(tango_ptr->get_ds_name().c_str()); back->server_version = DevVersion; // @@ -2072,7 +2070,7 @@ Tango::DevInfo *DeviceImpl::info() } } - back->doc_url = CORBA::string_dup(doc_url.c_str()); + back->doc_url = Tango::string_dup(doc_url.c_str()); // // Record operation request in black box @@ -2412,7 +2410,7 @@ void DeviceImpl::set_attribute_config(const Tango::AttributeConfigList& new_conf o << ends; string s = o.str(); - e.errors[0].reason = CORBA::string_dup(s.c_str()); + e.errors[0].reason = Tango::string_dup(s.c_str()); throw; } @@ -2862,7 +2860,7 @@ Tango::AttributeValueList *DeviceImpl::read_attributes(const Tango::DevVarString (*back)[i].time = att.get_when(); (*back)[i].quality = att.get_quality(); - (*back)[i].name = CORBA::string_dup(att.get_name().c_str()); + (*back)[i].name = Tango::string_dup(att.get_name().c_str()); (*back)[i].dim_x = att.get_x(); (*back)[i].dim_y = att.get_y(); } @@ -3354,9 +3352,9 @@ void DeviceImpl::remove_attribute(Tango::Attr *rem_attr, bool free_it,bool clean DevVarStringArray send; send.length(3); - send[0] = CORBA::string_dup(device_name.c_str()); - send[1] = CORBA::string_dup("attribute"); - send[2] = CORBA::string_dup(attr_name.c_str()); + send[0] = Tango::string_dup(device_name.c_str()); + send[1] = Tango::string_dup("attribute"); + send[2] = Tango::string_dup(attr_name.c_str()); if (tg->is_svr_shutting_down() == true) { @@ -3735,9 +3733,9 @@ void DeviceImpl::remove_command(Tango::Command *rem_cmd, bool free_it,bool clean DevVarStringArray send; send.length(3); - send[0] = CORBA::string_dup(device_name.c_str()); - send[1] = CORBA::string_dup("command"); - send[2] = CORBA::string_dup(cmd_name.c_str()); + send[0] = Tango::string_dup(device_name.c_str()); + send[1] = Tango::string_dup("command"); + send[2] = Tango::string_dup(cmd_name.c_str()); if (tg->is_svr_shutting_down() == true) { @@ -4686,10 +4684,10 @@ Tango::DevVarLongStringArray *DeviceImpl::lock_status() dvlsa->lvalue[0] = 1; dvlsa->lvalue[1] = locker_client->client_pid; const char *tmp = locker_client->client_ip; - dvlsa->svalue[1] = CORBA::string_dup(tmp); + dvlsa->svalue[1] = Tango::string_dup(tmp); if (locker_client->client_lang == Tango::JAVA) { - dvlsa->svalue[2] = CORBA::string_dup(locker_client->java_main_class.c_str()); + dvlsa->svalue[2] = Tango::string_dup(locker_client->java_main_class.c_str()); Tango::DevULong64 tmp_data = locker_client->java_ident[0]; dvlsa->lvalue[2] = (DevLong)((tmp_data & 0xFFFFFFFF00000000LL) >> 32); @@ -4701,7 +4699,7 @@ Tango::DevVarLongStringArray *DeviceImpl::lock_status() } else { - dvlsa->svalue[2] = CORBA::string_dup("Not defined"); + dvlsa->svalue[2] = Tango::string_dup("Not defined"); for (long loop = 2;loop < 6;loop++) dvlsa->lvalue[loop] = 0; } @@ -4710,8 +4708,8 @@ Tango::DevVarLongStringArray *DeviceImpl::lock_status() { basic_unlock(); lock_stat = "Device " + device_name + " is not locked"; - dvlsa->svalue[1] = CORBA::string_dup("Not defined"); - dvlsa->svalue[2] = CORBA::string_dup("Not defined"); + dvlsa->svalue[1] = Tango::string_dup("Not defined"); + dvlsa->svalue[2] = Tango::string_dup("Not defined"); for (long loop = 0;loop < 6;loop++) dvlsa->lvalue[loop] = 0; } @@ -4719,13 +4717,13 @@ Tango::DevVarLongStringArray *DeviceImpl::lock_status() else { lock_stat = "Device " + device_name + " is not locked"; - dvlsa->svalue[1] = CORBA::string_dup("Not defined"); - dvlsa->svalue[2] = CORBA::string_dup("Not defined"); + dvlsa->svalue[1] = Tango::string_dup("Not defined"); + dvlsa->svalue[2] = Tango::string_dup("Not defined"); for (long loop = 0;loop < 6;loop++) dvlsa->lvalue[loop] = 0; } - dvlsa->svalue[0] = CORBA::string_dup(lock_stat.c_str()); + dvlsa->svalue[0] = Tango::string_dup(lock_stat.c_str()); return dvlsa; } @@ -4974,11 +4972,11 @@ void DeviceImpl::data_into_net_object(Attribute &att,AttributeIdlData &aid, { (*aid.data_3)[index].err_list.length(1); (*aid.data_3)[index].err_list[0].severity = Tango::ERR; - (*aid.data_3)[index].err_list[0].reason = CORBA::string_dup(API_NotSupportedFeature); - (*aid.data_3)[index].err_list[0].origin = CORBA::string_dup("Device_3Impl::read_attributes_no_except"); - (*aid.data_3)[index].err_list[0].desc = CORBA::string_dup("The DevEncoded data type is available only for device implementing IDL 4 and above"); + (*aid.data_3)[index].err_list[0].reason = Tango::string_dup(API_NotSupportedFeature); + (*aid.data_3)[index].err_list[0].origin = Tango::string_dup("Device_3Impl::read_attributes_no_except"); + (*aid.data_3)[index].err_list[0].desc = Tango::string_dup("The DevEncoded data type is available only for device implementing IDL 4 and above"); (*aid.data_3)[index].quality = Tango::ATTR_INVALID; - (*aid.data_3)[index].name = CORBA::string_dup(att.get_name().c_str()); + (*aid.data_3)[index].name = Tango::string_dup(att.get_name().c_str()); clear_att_dim((*aid.data_3)[index]); } else @@ -4994,7 +4992,7 @@ void DeviceImpl::data_into_net_object(Attribute &att,AttributeIdlData &aid, else the_seq.length(2); - the_seq[0].encoded_format = CORBA::string_dup((*ptr)[0].encoded_format); + the_seq[0].encoded_format = Tango::string_dup((*ptr)[0].encoded_format); if (ptr->release() == true) { @@ -5007,7 +5005,7 @@ void DeviceImpl::data_into_net_object(Attribute &att,AttributeIdlData &aid, if ((w_type == Tango::READ_WRITE) || (w_type == Tango::READ_WITH_WRITE)) { - the_seq[1].encoded_format = CORBA::string_dup((*ptr)[1].encoded_format); + the_seq[1].encoded_format = Tango::string_dup((*ptr)[1].encoded_format); the_seq[1].encoded_data.replace((*ptr)[1].encoded_data.length(),(*ptr)[1].encoded_data.length(),(*ptr)[1].encoded_data.get_buffer()); } } @@ -5021,7 +5019,7 @@ void DeviceImpl::data_into_net_object(Attribute &att,AttributeIdlData &aid, else the_seq.length(2); - the_seq[0].encoded_format = CORBA::string_dup((*ptr)[0].encoded_format); + the_seq[0].encoded_format = Tango::string_dup((*ptr)[0].encoded_format); if (ptr->release() == true) { @@ -5034,7 +5032,7 @@ void DeviceImpl::data_into_net_object(Attribute &att,AttributeIdlData &aid, if ((w_type == Tango::READ_WRITE) || (w_type == Tango::READ_WITH_WRITE)) { - the_seq[1].encoded_format = CORBA::string_dup((*ptr)[1].encoded_format); + the_seq[1].encoded_format = Tango::string_dup((*ptr)[1].encoded_format); the_seq[1].encoded_data.replace((*ptr)[1].encoded_data.length(),(*ptr)[1].encoded_data.length(),(*ptr)[1].encoded_data.get_buffer()); } } @@ -5263,7 +5261,7 @@ void DeviceImpl::polled_data_into_net_object(AttributeIdlData &aid, the_seq.length(nb_encoded); for (unsigned int loop = 0;loop < nb_encoded;loop++) { - the_seq[loop].encoded_format = CORBA::string_dup(polled_seq[loop].encoded_format); + the_seq[loop].encoded_format = Tango::string_dup(polled_seq[loop].encoded_format); unsigned char *tmp_enc = polled_seq[loop].encoded_data.get_buffer(); unsigned int nb_data = polled_seq[loop].encoded_data.length(); the_seq[loop].encoded_data.replace(nb_data,nb_data,tmp_enc); @@ -5284,7 +5282,7 @@ void DeviceImpl::polled_data_into_net_object(AttributeIdlData &aid, the_seq.length(nb_encoded); for (unsigned int loop = 0;loop < nb_encoded;loop++) { - the_seq[loop].encoded_format = CORBA::string_dup(polled_seq[loop].encoded_format); + the_seq[loop].encoded_format = Tango::string_dup(polled_seq[loop].encoded_format); unsigned char *tmp_enc = polled_seq[loop].encoded_data.get_buffer(); unsigned int nb_data = polled_seq[loop].encoded_data.length(); the_seq[loop].encoded_data.replace(nb_data,nb_data,tmp_enc); @@ -5303,7 +5301,7 @@ void DeviceImpl::polled_data_into_net_object(AttributeIdlData &aid, the_seq.length(nb_encoded); for (unsigned int loop = 0;loop < nb_encoded;loop++) { - the_seq[loop].encoded_format = CORBA::string_dup(polled_seq[loop].encoded_format); + the_seq[loop].encoded_format = Tango::string_dup(polled_seq[loop].encoded_format); unsigned char *tmp_enc = polled_seq[loop].encoded_data.get_buffer(); unsigned int nb_data = polled_seq[loop].encoded_data.length(); the_seq[loop].encoded_data.replace(nb_data,nb_data,tmp_enc); @@ -5318,13 +5316,13 @@ void DeviceImpl::polled_data_into_net_object(AttributeIdlData &aid, (*aid.data_3)[index].err_list.length(1); (*aid.data_3)[index].err_list[0].severity = Tango::ERR; - (*aid.data_3)[index].err_list[0].reason = CORBA::string_dup(API_NotSupportedFeature); - (*aid.data_3)[index].err_list[0].origin = CORBA::string_dup("Device_3Impl::read_attributes_from_cache"); + (*aid.data_3)[index].err_list[0].reason = Tango::string_dup(API_NotSupportedFeature); + (*aid.data_3)[index].err_list[0].origin = Tango::string_dup("Device_3Impl::read_attributes_from_cache"); string s = o.str(); - (*aid.data_3)[index].err_list[0].desc = CORBA::string_dup(s.c_str()); + (*aid.data_3)[index].err_list[0].desc = Tango::string_dup(s.c_str()); (*aid.data_3)[index].quality = Tango::ATTR_INVALID; - (*aid.data_3)[index].name = CORBA::string_dup(names[index]); + (*aid.data_3)[index].name = Tango::string_dup(names[index]); clear_att_dim((*aid.data_3)[index]); } break; diff --git a/cppapi/server/device_2.cpp b/src/server/device_2.cpp similarity index 97% rename from cppapi/server/device_2.cpp rename to src/server/device_2.cpp index c1f0e1a29..ec91509f7 100644 --- a/cppapi/server/device_2.cpp +++ b/src/server/device_2.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================ // // file : Device_2.cpp @@ -44,7 +42,7 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include +#include #include #ifdef _TG_WINDOWS_ @@ -277,7 +275,7 @@ CORBA::Any *Device_2Impl::command_inout_2(const char *in_cmd, send->lvalue[0] = poll_period; send->svalue[0] = device_name.c_str(); - send->svalue[1] = CORBA::string_dup("command"); + send->svalue[1] = Tango::string_dup("command"); send->svalue[2] = in_cmd; get_poll_monitor().rel_monitor(); @@ -645,7 +643,7 @@ Tango::AttributeValueList* Device_2Impl::read_attributes_2(const Tango::DevVarSt send->lvalue.length(1); send->svalue.length(3); send->svalue[0] = device_name.c_str(); - send->svalue[1] = CORBA::string_dup("attribute"); + send->svalue[1] = Tango::string_dup("attribute"); for (i = 0;i < non_polled.size();i++) { @@ -848,7 +846,7 @@ Tango::AttributeValueList* Device_2Impl::read_attributes_2(const Tango::DevVarSt (*back)[i].time = att_val_4.time; (*back)[i].dim_x = att_val_4.r_dim.dim_x; (*back)[i].dim_y = att_val_4.r_dim.dim_y; - (*back)[i].name = CORBA::string_dup(att_val_4.name); + (*back)[i].name = Tango::string_dup(att_val_4.name); } } else if (vers == 3) @@ -875,7 +873,7 @@ Tango::AttributeValueList* Device_2Impl::read_attributes_2(const Tango::DevVarSt (*back)[i].time = att_val_3.time; (*back)[i].dim_x = att_val_3.r_dim.dim_x; (*back)[i].dim_y = att_val_3.r_dim.dim_y; - (*back)[i].name = CORBA::string_dup(att_val_3.name); + (*back)[i].name = Tango::string_dup(att_val_3.name); } } else @@ -903,7 +901,7 @@ Tango::AttributeValueList* Device_2Impl::read_attributes_2(const Tango::DevVarSt (*back)[i].time = att_val.time; (*back)[i].dim_x = att_val.dim_x; (*back)[i].dim_y = att_val.dim_y; - (*back)[i].name = CORBA::string_dup(att_val.name); + (*back)[i].name = Tango::string_dup(att_val.name); } } @@ -1018,21 +1016,21 @@ Tango::DevCmdInfoList_2 *Device_2Impl::command_list_query_2() for (long i = 0;i < nb_cmd_class;i++) { Tango::DevCmdInfo_2 tmp; - tmp.cmd_name = CORBA::string_dup(((device_class->get_command_list())[i]->get_name()).c_str()); + tmp.cmd_name = Tango::string_dup(((device_class->get_command_list())[i]->get_name()).c_str()); tmp.cmd_tag = 0; tmp.level = (device_class->get_command_list())[i]->get_disp_level(); tmp.in_type = (long)((device_class->get_command_list())[i]->get_in_type()); tmp.out_type = (long)((device_class->get_command_list())[i]->get_out_type()); string &str_in = (device_class->get_command_list())[i]->get_in_type_desc(); if (str_in.size() != 0) - tmp.in_type_desc = CORBA::string_dup(str_in.c_str()); + tmp.in_type_desc = Tango::string_dup(str_in.c_str()); else - tmp.in_type_desc = CORBA::string_dup(NotSet); + tmp.in_type_desc = Tango::string_dup(NotSet); string &str_out = (device_class->get_command_list())[i]->get_out_type_desc(); if (str_out.size() != 0) - tmp.out_type_desc = CORBA::string_dup(str_out.c_str()); + tmp.out_type_desc = Tango::string_dup(str_out.c_str()); else - tmp.out_type_desc = CORBA::string_dup(NotSet); + tmp.out_type_desc = Tango::string_dup(NotSet); (*back)[i] = tmp; } @@ -1041,21 +1039,21 @@ Tango::DevCmdInfoList_2 *Device_2Impl::command_list_query_2() { Command *cmd_ptr = get_local_command_list()[i]; Tango::DevCmdInfo_2 tmp; - tmp.cmd_name = CORBA::string_dup(cmd_ptr->get_name().c_str()); + tmp.cmd_name = Tango::string_dup(cmd_ptr->get_name().c_str()); tmp.cmd_tag = 0; tmp.level = cmd_ptr->get_disp_level(); tmp.in_type = (long)(cmd_ptr->get_in_type()); tmp.out_type = (long)(cmd_ptr->get_out_type()); string &str_in = cmd_ptr->get_in_type_desc(); if (str_in.size() != 0) - tmp.in_type_desc = CORBA::string_dup(str_in.c_str()); + tmp.in_type_desc = Tango::string_dup(str_in.c_str()); else - tmp.in_type_desc = CORBA::string_dup(NotSet); + tmp.in_type_desc = Tango::string_dup(NotSet); string &str_out = cmd_ptr->get_out_type_desc(); if (str_out.size() != 0) - tmp.out_type_desc = CORBA::string_dup(str_out.c_str()); + tmp.out_type_desc = Tango::string_dup(str_out.c_str()); else - tmp.out_type_desc = CORBA::string_dup(NotSet); + tmp.out_type_desc = Tango::string_dup(NotSet); (*back)[i + nb_cmd_class] = tmp; } @@ -1157,21 +1155,21 @@ Tango::DevCmdInfo_2 *Device_2Impl::command_query_2(const char *command) if (found == true) { - back->cmd_name = CORBA::string_dup(cmd_ptr->get_name().c_str()); + back->cmd_name = Tango::string_dup(cmd_ptr->get_name().c_str()); back->cmd_tag = 0; back->level = cmd_ptr->get_disp_level(); back->in_type = (long)(cmd_ptr->get_in_type()); back->out_type = (long)(cmd_ptr->get_out_type()); string &str_in = cmd_ptr->get_in_type_desc(); if (str_in.size() != 0) - back->in_type_desc = CORBA::string_dup(str_in.c_str()); + back->in_type_desc = Tango::string_dup(str_in.c_str()); else - back->in_type_desc = CORBA::string_dup(NotSet); + back->in_type_desc = Tango::string_dup(NotSet); string &str_out = cmd_ptr->get_out_type_desc(); if (str_out.size() != 0) - back->out_type_desc = CORBA::string_dup(str_out.c_str()); + back->out_type_desc = Tango::string_dup(str_out.c_str()); else - back->out_type_desc = CORBA::string_dup(NotSet); + back->out_type_desc = Tango::string_dup(NotSet); } else { @@ -1336,7 +1334,7 @@ throw(Tango::DevFailed, CORBA::SystemException) //-------------------------------------------------------------------------- Tango::DevCmdHistoryList *Device_2Impl::command_inout_history_2(const char* command, - CORBA::Long n) + DevLong n) throw(Tango::DevFailed, CORBA::SystemException) { TangoMonitor &mon = get_poll_monitor(); @@ -1533,7 +1531,7 @@ throw(Tango::DevFailed, CORBA::SystemException) //-------------------------------------------------------------------------- Tango::DevAttrHistoryList *Device_2Impl::read_attribute_history_2(const char* name, - CORBA::Long n) + DevLong n) throw(Tango::DevFailed, CORBA::SystemException) { TangoMonitor &mon = get_poll_monitor(); diff --git a/cppapi/server/device_3.cpp b/src/server/device_3.cpp similarity index 98% rename from cppapi/server/device_3.cpp rename to src/server/device_3.cpp index 3e989bba4..225d8cdfd 100644 --- a/cppapi/server/device_3.cpp +++ b/src/server/device_3.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //==================================================================================================================== // // file : Device_3.cpp @@ -38,9 +36,9 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include -#include -#include +#include +#include +#include #include @@ -604,9 +602,9 @@ void Device_3Impl::read_attributes_no_except(const Tango::DevVarStringArray& nam del.length(1); del[0].severity = Tango::ERR; - del[0].origin = CORBA::string_dup("Device_3Impl::read_attributes_no_except"); - del[0].reason = CORBA::string_dup("API_CorbaSysException "); - del[0].desc = CORBA::string_dup("Unforseen exception when trying to read attribute. It was even not a Tango DevFailed exception"); + del[0].origin = Tango::string_dup("Device_3Impl::read_attributes_no_except"); + del[0].reason = Tango::string_dup("API_CorbaSysException "); + del[0].desc = Tango::string_dup("Unforseen exception when trying to read attribute. It was even not a Tango DevFailed exception"); if (aid.data_5 != Tango_nullptr) { @@ -1595,7 +1593,7 @@ void Device_3Impl::write_attributes_34(const Tango::AttributeValueList *values_3 { nb_failed++; errs.length(nb_failed); - errs[nb_failed - 1].name = CORBA::string_dup(single_att_name); + errs[nb_failed - 1].name = Tango::string_dup(single_att_name); errs[nb_failed - 1].index_in_call = i; errs[nb_failed - 1].err_list = e.errors; } @@ -1647,7 +1645,7 @@ void Device_3Impl::write_attributes_34(const Tango::AttributeValueList *values_3 { nb_failed++; errs.length(nb_failed); - errs[nb_failed - 1].name = CORBA::string_dup(single_att_name); + errs[nb_failed - 1].name = Tango::string_dup(single_att_name); errs[nb_failed - 1].index_in_call = ctr->idx_in_names; errs[nb_failed - 1].err_list = e.errors; ctr = updated_attr.erase(ctr); @@ -1718,9 +1716,9 @@ void Device_3Impl::write_attributes_34(const Tango::AttributeValueList *values_3 att.rollback(); errs.length(nb_failed); if (values_3 != NULL) - errs[nb_failed - 1].name = CORBA::string_dup((*values_3)[(*ite).idx_in_names].name); + errs[nb_failed - 1].name = Tango::string_dup((*values_3)[(*ite).idx_in_names].name); else - errs[nb_failed - 1].name = CORBA::string_dup((*values_4)[(*ite).idx_in_names].name); + errs[nb_failed - 1].name = Tango::string_dup((*values_4)[(*ite).idx_in_names].name); errs[nb_failed - 1].index_in_call = (*ite).idx_in_names; errs[nb_failed - 1].err_list = e.errors[0].err_list; ite = updated_attr.erase(ite); @@ -1733,9 +1731,9 @@ void Device_3Impl::write_attributes_34(const Tango::AttributeValueList *values_3 att.rollback(); errs.length(nb_failed); if (values_3 != NULL) - errs[nb_failed - 1].name = CORBA::string_dup((*values_3)[(*ite).idx_in_names].name); + errs[nb_failed - 1].name = Tango::string_dup((*values_3)[(*ite).idx_in_names].name); else - errs[nb_failed - 1].name = CORBA::string_dup((*values_4)[(*ite).idx_in_names].name); + errs[nb_failed - 1].name = Tango::string_dup((*values_4)[(*ite).idx_in_names].name); errs[nb_failed - 1].index_in_call = (*ite).idx_in_names; errs[nb_failed - 1].err_list = e.errors; ite = updated_attr.erase(ite); @@ -1770,7 +1768,7 @@ void Device_3Impl::write_attributes_34(const Tango::AttributeValueList *values_3 if (TG_strcasecmp(dev_attr->get_w_attr_by_ind(ite_att->idx_in_multi_attr).get_name().c_str(),e.errors[loop].name) == 0) { errs[nb_failed - 1].index_in_call = ite_att->idx_in_names; - errs[nb_failed - 1].name = CORBA::string_dup(e.errors[loop].name); + errs[nb_failed - 1].name = Tango::string_dup(e.errors[loop].name); errs[nb_failed - 1].err_list = e.errors[loop].err_list; WAttribute &att = dev_attr->get_w_attr_by_ind(ite_att->idx_in_multi_attr); @@ -1792,7 +1790,7 @@ void Device_3Impl::write_attributes_34(const Tango::AttributeValueList *values_3 if (att.get_data_format() == SCALAR) att.rollback(); errs.length(nb_failed); - errs[nb_failed - 1].name = CORBA::string_dup(att.get_name().c_str()); + errs[nb_failed - 1].name = Tango::string_dup(att.get_name().c_str()); vector::iterator ite_att; for(ite_att = updated_attr.begin();ite_att != updated_attr.end();++ite_att) @@ -1866,7 +1864,7 @@ void Device_3Impl::write_attributes_34(const Tango::AttributeValueList *values_3 else single_att_name = (*values_4)[updated_attr[att_in_db[i]].idx_in_names].name; - errs[nb_failed + i].name = CORBA::string_dup(single_att_name); + errs[nb_failed + i].name = Tango::string_dup(single_att_name); errs[nb_failed + i].index_in_call = updated_attr[att_in_db[i]].idx_in_names; errs[nb_failed + i].err_list = e.errors; } @@ -1925,7 +1923,7 @@ void Device_3Impl::write_attributes_34(const Tango::AttributeValueList *values_3 //-------------------------------------------------------------------------------------------------------------------- Tango::DevAttrHistoryList_3 *Device_3Impl::read_attribute_history_3(const char* name, - CORBA::Long n) + DevLong n) { TangoMonitor &mon = get_poll_monitor(); AutoTangoMonitor sync(&mon); @@ -2065,14 +2063,14 @@ Tango::DevInfo_3 *Device_3Impl::info_3() // Tango::Util *tango_ptr = Tango::Util::instance(); - back->server_host = CORBA::string_dup(tango_ptr->get_host_name().c_str()); + back->server_host = Tango::string_dup(tango_ptr->get_host_name().c_str()); // // Fill-in remaining structure fields // - back->dev_class = CORBA::string_dup(device_class->get_name().c_str()); - back->server_id = CORBA::string_dup(tango_ptr->get_ds_name().c_str()); + back->dev_class = Tango::string_dup(device_class->get_name().c_str()); + back->server_id = Tango::string_dup(tango_ptr->get_ds_name().c_str()); back->server_version = DevVersion; // @@ -2093,13 +2091,13 @@ Tango::DevInfo_3 *Device_3Impl::info_3() doc_url = doc_url + "\nCVS Location = "; doc_url = doc_url + cvs_location; } - back->doc_url = CORBA::string_dup(doc_url.c_str()); + back->doc_url = Tango::string_dup(doc_url.c_str()); // // Set the device type // - back->dev_type = CORBA::string_dup(device_class->get_type().c_str()); + back->dev_type = Tango::string_dup(device_class->get_type().c_str()); // // Record operation request in black box @@ -2711,7 +2709,7 @@ void Device_3Impl::status2attr(Tango::ConstDevString status,Tango::AttributeValu Tango::DevVarStringArray str_seq(1); str_seq.length(1); - str_seq[0] = CORBA::string_dup(status); + str_seq[0] = Tango::string_dup(status); back.value <<= str_seq; } @@ -2721,7 +2719,7 @@ void Device_3Impl::status2attr(Tango::ConstDevString status,Tango::AttributeValu Tango::DevVarStringArray str_seq(1); str_seq.length(1); - str_seq[0] = CORBA::string_dup(status); + str_seq[0] = Tango::string_dup(status); back.value.string_att_value(str_seq); back.data_format = Tango::SCALAR; @@ -2733,7 +2731,7 @@ void Device_3Impl::status2attr(Tango::ConstDevString status,Tango::AttributeValu Tango::DevVarStringArray str_seq(1); str_seq.length(1); - str_seq[0] = CORBA::string_dup(status); + str_seq[0] = Tango::string_dup(status); back.value.string_att_value(str_seq); back.data_format = Tango::SCALAR; diff --git a/cppapi/server/device_4.cpp b/src/server/device_4.cpp similarity index 98% rename from cppapi/server/device_4.cpp rename to src/server/device_4.cpp index 6691b17f7..ca03a0aa8 100644 --- a/cppapi/server/device_4.cpp +++ b/src/server/device_4.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //+============================================================================ // // file : Device_4.cpp @@ -44,9 +42,9 @@ static const char *RcsId = "$Id$"; #endif #include -#include -#include -#include +#include +#include +#include namespace Tango @@ -112,7 +110,7 @@ Device_3Impl(device_class,dev_name,desc,dev_state,dev_status),ext_4(Tango_nullpt // //-------------------------------------------------------------------------- -Tango::DevAttrHistory_4 *Device_4Impl::read_attribute_history_4(const char* name,CORBA::Long n) +Tango::DevAttrHistory_4 *Device_4Impl::read_attribute_history_4(const char* name,DevLong n) { TangoMonitor &mon = get_poll_monitor(); AutoTangoMonitor sync(&mon); @@ -200,7 +198,7 @@ Tango::DevAttrHistory_4 *Device_4Impl::read_attribute_history_4(const char* name // Init attribute name in the returned structure // - back->name = CORBA::string_dup(name); + back->name = Tango::string_dup(name); // // Get attribute value history @@ -233,7 +231,7 @@ Tango::DevAttrHistory_4 *Device_4Impl::read_attribute_history_4(const char* name // //-------------------------------------------------------------------------- -Tango::DevCmdHistory_4 *Device_4Impl::command_inout_history_4(const char* command,CORBA::Long n) +Tango::DevCmdHistory_4 *Device_4Impl::command_inout_history_4(const char* command,DevLong n) { TangoMonitor &mon = get_poll_monitor(); AutoTangoMonitor sync(&mon); @@ -849,7 +847,7 @@ Tango::AttributeValueList_4* Device_4Impl::write_read_attributes_4(const Tango:: Tango::DevVarStringArray dvsa; dvsa.length(1); - dvsa[0] = CORBA::string_dup(values[0].name); + dvsa[0] = Tango::string_dup(values[0].name); blackbox_ptr->insert_wr_attr(values,dvsa,cl_id,4); @@ -889,7 +887,7 @@ Tango::AttributeValueList_4* Device_4Impl::write_read_attributes_4(const Tango:: Tango::DevVarStringArray att_name(1); att_name.length(1); - att_name[0] = CORBA::string_dup(values[0].name); + att_name[0] = Tango::string_dup(values[0].name); Tango::ClntIdent dummy_cl_id; Tango::CppClntIdent cci = 0; dummy_cl_id.cpp_clnt(cci); diff --git a/cppapi/server/device_5.cpp b/src/server/device_5.cpp similarity index 98% rename from cppapi/server/device_5.cpp rename to src/server/device_5.cpp index ede8a7cbc..7bbd5f625 100644 --- a/cppapi/server/device_5.cpp +++ b/src/server/device_5.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id: device_4.cpp 20742 2012-06-21 14:20:20Z taurel $"; - //+=================================================================================================================== // // file : Device_5.cpp @@ -38,9 +36,9 @@ static const char *RcsId = "$Id: device_4.cpp 20742 2012-06-21 14:20:20Z taurel #endif #include -#include -#include -#include +#include +#include +#include namespace Tango @@ -681,7 +679,7 @@ void Device_5Impl::set_attribute_config_5(const Tango::AttributeConfigList_5& ne // //------------------------------------------------------------------------------------------------------------------- -Tango::DevAttrHistory_5 *Device_5Impl::read_attribute_history_5(const char* name,CORBA::Long n) +Tango::DevAttrHistory_5 *Device_5Impl::read_attribute_history_5(const char* name,DevLong n) { TangoMonitor &mon = get_poll_monitor(); AutoTangoMonitor sync(&mon); @@ -790,7 +788,7 @@ Tango::DevAttrHistory_5 *Device_5Impl::read_attribute_history_5(const char* name // Init attribute name in the returned structure // - back->name = CORBA::string_dup(name); + back->name = Tango::string_dup(name); // // Get attribute value history @@ -999,7 +997,7 @@ void Device_5Impl::set_pipe_config_5(const Tango::PipeConfigList& new_conf, o << ends; string s = o.str(); - e.errors[0].reason = CORBA::string_dup(s.c_str()); + e.errors[0].reason = Tango::string_dup(s.c_str()); throw; } @@ -1182,14 +1180,14 @@ Tango::DevPipeData *Device_5Impl::read_pipe_5(const char* name,const Tango::Clnt // back->time = pi.get_when(); - back->name = CORBA::string_dup(pipe_name.c_str()); - back->data_blob.name = CORBA::string_dup(pi.get_blob().get_name().c_str()); + back->name = Tango::string_dup(pipe_name.c_str()); + back->data_blob.name = Tango::string_dup(pi.get_blob().get_name().c_str()); DevVarPipeDataEltArray *dvpdea = pi.get_blob().get_insert_data(); - CORBA::ULong max,len; + DevULong max,len; max = dvpdea->maximum(); len = dvpdea->length(); - back->data_blob.blob_data.replace(max,len,dvpdea->get_buffer((CORBA::Boolean)true),true); + back->data_blob.blob_data.replace(max,len,dvpdea->get_buffer((DevBoolean)true),true); delete dvpdea; pi.get_blob().reset_insert_data_ptr(); diff --git a/cppapi/server/deviceclass.cpp b/src/server/deviceclass.cpp similarity index 98% rename from cppapi/server/deviceclass.cpp rename to src/server/deviceclass.cpp index 4582133fb..9ad740d23 100644 --- a/cppapi/server/deviceclass.cpp +++ b/src/server/deviceclass.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+================================================================================================================= // // file : Deviceclass.cpp @@ -41,17 +39,17 @@ static const char *RcsId = "$Id$\n$Name$"; #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include +#include #ifdef TANGO_HAS_LOG4TANGO -#include +#include #endif extern omni_thread::key_t key_py_data; @@ -419,12 +417,12 @@ void DeviceClass::set_memorized_values(bool all,long idx,bool from_init) { att.set_write_value(mem_value); - str_seq[0] = CORBA::string_dup(mem_value.c_str()); + str_seq[0] = Tango::string_dup(mem_value.c_str()); } else { att.get_write_value(tmp_str); - str_seq[0] = CORBA::string_dup(tmp_str); + str_seq[0] = Tango::string_dup(tmp_str); } att_val[nb_wr - 1].value <<= str_seq; break; @@ -549,7 +547,7 @@ void DeviceClass::set_memorized_values(bool all,long idx,bool from_init) // Init the AttributeValue structure // - att_val[nb_wr - 1].name = CORBA::string_dup(att.get_name().c_str()); + att_val[nb_wr - 1].name = Tango::string_dup(att.get_name().c_str()); att_val[nb_wr - 1].dim_x = 1; att_val[nb_wr - 1].dim_y = 0; att_val[nb_wr - 1].quality = Tango::ATTR_VALID; diff --git a/cppapi/server/devicelog.cpp b/src/server/devicelog.cpp similarity index 99% rename from cppapi/server/devicelog.cpp rename to src/server/devicelog.cpp index 73259c651..306c00ccf 100644 --- a/cppapi/server/devicelog.cpp +++ b/src/server/devicelog.cpp @@ -106,7 +106,7 @@ #ifdef TANGO_HAS_LOG4TANGO -#include +#include namespace Tango { diff --git a/cppapi/server/devintr.cpp b/src/server/devintr.cpp similarity index 99% rename from cppapi/server/devintr.cpp rename to src/server/devintr.cpp index 57fb33324..082a0e2cb 100644 --- a/cppapi/server/devintr.cpp +++ b/src/server/devintr.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //+================================================================================================================== // // file : devintr.cpp diff --git a/cppapi/server/dintrthread.cpp b/src/server/dintrthread.cpp similarity index 98% rename from cppapi/server/dintrthread.cpp rename to src/server/dintrthread.cpp index 554f4686b..9976d944c 100644 --- a/cppapi/server/dintrthread.cpp +++ b/src/server/dintrthread.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //+================================================================================================================= // // file : dintrthread.cpp @@ -40,8 +38,8 @@ static const char *RcsId = "$Id$"; #endif #include -#include -#include +#include +#include namespace Tango { diff --git a/cppapi/server/dserver.cpp b/src/server/dserver.cpp similarity index 99% rename from cppapi/server/dserver.cpp rename to src/server/dserver.cpp index 5d1dedac2..0fc349cd5 100644 --- a/cppapi/server/dserver.cpp +++ b/src/server/dserver.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+================================================================================================================== // // file : DServer.cpp @@ -39,8 +37,8 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include -#include +#include +#include #include #include @@ -332,7 +330,7 @@ void DServer::init_device() if (list.empty() == true) { dev_list_nodb->length(1); - (*dev_list_nodb)[0] = CORBA::string_dup("NoName"); + (*dev_list_nodb)[0] = Tango::string_dup("NoName"); } else { @@ -708,7 +706,7 @@ Tango::DevVarStringArray *DServer::query_device() int nb_dev = vs.size(); ret->length(nb_dev); for (int k = 0;k < nb_dev;k++) - (*ret)[k] = CORBA::string_dup(vs[k].c_str()); + (*ret)[k] = Tango::string_dup(vs[k].c_str()); return(ret); } @@ -995,12 +993,12 @@ void DServer::restart(string &d_name) // send->lvalue[0] = dev_pol[i].upd; - send->svalue[0] = CORBA::string_dup(name[0]); + send->svalue[0] = Tango::string_dup(name[0]); if (dev_pol[i].type == Tango::POLL_CMD) - send->svalue[1] = CORBA::string_dup("command"); + send->svalue[1] = Tango::string_dup("command"); else - send->svalue[1] = CORBA::string_dup("attribute"); - send->svalue[2] = CORBA::string_dup(dev_pol[i].name.c_str()); + send->svalue[1] = Tango::string_dup("attribute"); + send->svalue[2] = Tango::string_dup(dev_pol[i].name.c_str()); try { @@ -1291,7 +1289,7 @@ Tango::DevVarStringArray *DServer::query_class_prop(string &class_name) for (int i = 0;i < nb_prop;i++) { - (*ret)[i] = CORBA::string_dup(wiz[i].c_str()); + (*ret)[i] = Tango::string_dup(wiz[i].c_str()); } } catch (bad_alloc &) @@ -1362,7 +1360,7 @@ Tango::DevVarStringArray *DServer::query_dev_prop(string &class_name) for (int i = 0;i < nb_prop;i++) { - (*ret)[i] = CORBA::string_dup(wiz[i].c_str()); + (*ret)[i] = Tango::string_dup(wiz[i].c_str()); } } catch (bad_alloc &) diff --git a/cppapi/server/dserverclass.cpp b/src/server/dserverclass.cpp similarity index 99% rename from cppapi/server/dserverclass.cpp rename to src/server/dserverclass.cpp index dee60f630..4ae6f7fd3 100644 --- a/cppapi/server/dserverclass.cpp +++ b/src/server/dserverclass.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================= // // file : DServerClass.cpp @@ -45,12 +43,12 @@ static const char *RcsId = "$Id$\n$Name$"; #include #include -#include -#include +#include +#include #ifdef TANGO_HAS_LOG4TANGO -#include +#include #endif -#include +#include namespace Tango { diff --git a/cppapi/server/dserverlock.cpp b/src/server/dserverlock.cpp similarity index 94% rename from cppapi/server/dserverlock.cpp rename to src/server/dserverlock.cpp index 749171cd4..6d69cd6be 100644 --- a/cppapi/server/dserverlock.cpp +++ b/src/server/dserverlock.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================= // // file : dserverlock.cpp @@ -219,8 +217,8 @@ void DServer::re_lock_devices(const Tango::DevVarStringArray *dev_name_list) NoSyncModelTangoMonitor mon(this); cout4 << "In re_lock_devices command" << endl; - CORBA::ULong loop; - CORBA::ULong nb_dev = dev_name_list->length(); + DevULong loop; + DevULong nb_dev = dev_name_list->length(); for (loop = 0;loop < nb_dev;loop++) cout4 << "Device to re-lock: " << (*dev_name_list)[loop] << endl; @@ -273,9 +271,9 @@ void DServer::re_lock_devices(const Tango::DevVarStringArray *dev_name_list) catch (Tango::DevFailed &e) { errors.length(nb_error + 1); - errors[nb_error].desc = CORBA::string_dup(e.errors[0].desc.in()); - errors[nb_error].reason = CORBA::string_dup(e.errors[0].reason.in()); - errors[nb_error].origin = CORBA::string_dup(e.errors[0].origin.in()); + errors[nb_error].desc = Tango::string_dup(e.errors[0].desc.in()); + errors[nb_error].reason = Tango::string_dup(e.errors[0].reason.in()); + errors[nb_error].origin = Tango::string_dup(e.errors[0].origin.in()); errors[nb_error].severity = e.errors[0].severity; nb_error++; } @@ -291,9 +289,9 @@ void DServer::re_lock_devices(const Tango::DevVarStringArray *dev_name_list) catch (Tango::DevFailed &e) { errors.length(nb_error + 1); - errors[nb_error].desc = CORBA::string_dup(e.errors[0].desc.in()); - errors[nb_error].reason = CORBA::string_dup(e.errors[0].reason.in()); - errors[nb_error].origin = CORBA::string_dup(e.errors[0].origin.in()); + errors[nb_error].desc = Tango::string_dup(e.errors[0].desc.in()); + errors[nb_error].reason = Tango::string_dup(e.errors[0].reason.in()); + errors[nb_error].origin = Tango::string_dup(e.errors[0].origin.in()); errors[nb_error].severity = e.errors[0].severity; nb_error++; } diff --git a/cppapi/server/dserverlog.cpp b/src/server/dserverlog.cpp similarity index 99% rename from cppapi/server/dserverlog.cpp rename to src/server/dserverlog.cpp index 881506045..01104b498 100644 --- a/cppapi/server/dserverlog.cpp +++ b/src/server/dserverlog.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================= // // file : DServerLog.cpp diff --git a/cppapi/server/dserverpoll.cpp b/src/server/dserverpoll.cpp similarity index 99% rename from cppapi/server/dserverpoll.cpp rename to src/server/dserverpoll.cpp index d54804f99..58fcf9da1 100644 --- a/cppapi/server/dserverpoll.cpp +++ b/src/server/dserverpoll.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+================================================================================================================== // // file : DServer.cpp @@ -535,12 +533,12 @@ Tango::DevVarStringArray *DServer::dev_poll_status(string &dev_name) if (type == Tango::POLL_CMD) { - (*ret)[cmd_ind] = CORBA::string_dup(returned_info.c_str()); + (*ret)[cmd_ind] = Tango::string_dup(returned_info.c_str()); cmd_ind++; } else { - (*ret)[attr_ind] = CORBA::string_dup(returned_info.c_str()); + (*ret)[attr_ind] = Tango::string_dup(returned_info.c_str()); attr_ind++; // @@ -558,7 +556,7 @@ Tango::DevVarStringArray *DServer::dev_poll_status(string &dev_name) npos = returned_info.find("attribute",pos); pos = npos; } - (*ret)[cmd_ind] = CORBA::string_dup(returned_info.c_str()); + (*ret)[cmd_ind] = Tango::string_dup(returned_info.c_str()); cmd_ind++; } } @@ -1748,11 +1746,11 @@ void DServer::rem_obj_polling(const Tango::DevVarStringArray *argin,bool with_db ex.errors.length(1); ex.errors[0].severity = ERR; - ex.errors[0].reason = CORBA::string_dup(API_PollObjNotFound); - ex.errors[0].origin = CORBA::string_dup("DServer::rem_obj_polling"); + ex.errors[0].reason = Tango::string_dup(API_PollObjNotFound); + ex.errors[0].origin = Tango::string_dup("DServer::rem_obj_polling"); stringstream ss; ss << "No event possible on attribute " << obj_name << ". Polling has just being stopped!"; - ex.errors[0].desc = CORBA::string_dup(ss.str().c_str()); + ex.errors[0].desc = Tango::string_dup(ss.str().c_str()); if (att.periodic_event_subscribed() == true) att.fire_error_periodic_event(&ex); diff --git a/cppapi/server/dserversignal.cpp b/src/server/dserversignal.cpp similarity index 99% rename from cppapi/server/dserversignal.cpp rename to src/server/dserversignal.cpp index 3e06f4dda..8651aac41 100644 --- a/cppapi/server/dserversignal.cpp +++ b/src/server/dserversignal.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+================================================================================================================== // // file : DServerSignal.cpp @@ -40,7 +38,7 @@ static const char *RcsId = "$Id$\n$Name$"; #include #include -#include +#include #ifndef _TG_WINDOWS_ extern int errno; diff --git a/cppapi/server/encoded_attribute.cpp b/src/server/encoded_attribute.cpp similarity index 99% rename from cppapi/server/encoded_attribute.cpp rename to src/server/encoded_attribute.cpp index 9201b58a0..9c793b601 100644 --- a/cppapi/server/encoded_attribute.cpp +++ b/src/server/encoded_attribute.cpp @@ -33,8 +33,8 @@ // //============================================================================= -#include -#include +#include +#include "jpeg/jpeg_lib.h" using namespace Tango; diff --git a/cppapi/server/eventcmds.cpp b/src/server/eventcmds.cpp similarity index 97% rename from cppapi/server/eventcmds.cpp rename to src/server/eventcmds.cpp index f9bf4cfbd..b81d68088 100644 --- a/cppapi/server/eventcmds.cpp +++ b/src/server/eventcmds.cpp @@ -1,4 +1,3 @@ -static const char *RcsId = "$Id$"; //+=================================================================================================================== // // file : eventcmds.cpp @@ -32,7 +31,7 @@ static const char *RcsId = "$Id$"; //-================================================================================================================= #include -#include +#include namespace Tango { @@ -706,7 +705,7 @@ DevVarLongStringArray *DServer::zmq_event_subscription_change(const Tango::DevVa { string tmp_str("Heartbeat: "); tmp_str = tmp_str + ev->get_heartbeat_endpoint(); - ret_data->svalue[0] = CORBA::string_dup(tmp_str.c_str()); + ret_data->svalue[0] = Tango::string_dup(tmp_str.c_str()); tmp_str = "Event: "; string ev_end = ev->get_event_endpoint(); @@ -719,7 +718,7 @@ DevVarLongStringArray *DServer::zmq_event_subscription_change(const Tango::DevVa tmp_str = tmp_str + "\n"; tmp_str = tmp_str + "Some event(s) sent using multicast protocol"; } - ret_data->svalue[1] = CORBA::string_dup(tmp_str.c_str()); + ret_data->svalue[1] = Tango::string_dup(tmp_str.c_str()); size_t nb_alt = ev->get_alternate_heartbeat_endpoint().size(); if (nb_alt != 0) @@ -730,7 +729,7 @@ DevVarLongStringArray *DServer::zmq_event_subscription_change(const Tango::DevVa { string tmp_str("Alternate heartbeat: "); tmp_str = tmp_str + ev->get_alternate_heartbeat_endpoint()[loop]; - ret_data->svalue[(loop + 1) << 1] = CORBA::string_dup(tmp_str.c_str()); + ret_data->svalue[(loop + 1) << 1] = Tango::string_dup(tmp_str.c_str()); tmp_str = "Alternate event: "; if (ev->get_alternate_event_endpoint().size() != 0) @@ -739,13 +738,13 @@ DevVarLongStringArray *DServer::zmq_event_subscription_change(const Tango::DevVa if (ev_end.empty() == false) tmp_str = "Alternate event: " + ev_end; } - ret_data->svalue[((loop + 1) << 1) + 1] = CORBA::string_dup(tmp_str.c_str()); + ret_data->svalue[((loop + 1) << 1) + 1] = Tango::string_dup(tmp_str.c_str()); } } } else { - ret_data->svalue[0] = CORBA::string_dup("No ZMQ event yet!"); + ret_data->svalue[0] = Tango::string_dup("No ZMQ event yet!"); } } else @@ -1004,23 +1003,23 @@ DevVarLongStringArray *DServer::zmq_event_subscription_change(const Tango::DevVa ret_data->lvalue[5] = ev->get_zmq_release(); string &heartbeat_endpoint = ev->get_heartbeat_endpoint(); - ret_data->svalue[0] = CORBA::string_dup(heartbeat_endpoint.c_str()); + ret_data->svalue[0] = Tango::string_dup(heartbeat_endpoint.c_str()); if (mcast.empty() == true) { string &event_endpoint = ev->get_event_endpoint(); - ret_data->svalue[1] = CORBA::string_dup(event_endpoint.c_str()); + ret_data->svalue[1] = Tango::string_dup(event_endpoint.c_str()); } else { if (local_call == true) { string &event_endpoint = ev->get_event_endpoint(); - ret_data->svalue[1] = CORBA::string_dup(event_endpoint.c_str()); + ret_data->svalue[1] = Tango::string_dup(event_endpoint.c_str()); } else { string &event_endpoint = ev->get_mcast_event_endpoint(ev_name); - ret_data->svalue[1] = CORBA::string_dup(event_endpoint.c_str()); + ret_data->svalue[1] = Tango::string_dup(event_endpoint.c_str()); } } @@ -1032,10 +1031,10 @@ DevVarLongStringArray *DServer::zmq_event_subscription_change(const Tango::DevVa for (size_t loop = 0;loop < nb_alt;loop++) { string tmp_str = ev->get_alternate_heartbeat_endpoint()[loop]; - ret_data->svalue[(loop + 1) << 1] = CORBA::string_dup(tmp_str.c_str()); + ret_data->svalue[(loop + 1) << 1] = Tango::string_dup(tmp_str.c_str()); tmp_str = ev->get_alternate_event_endpoint()[loop]; - ret_data->svalue[((loop + 1) << 1) + 1] = CORBA::string_dup(tmp_str.c_str()); + ret_data->svalue[((loop + 1) << 1) + 1] = Tango::string_dup(tmp_str.c_str()); } } diff --git a/cppapi/server/eventsupplier.cpp b/src/server/eventsupplier.cpp similarity index 99% rename from cppapi/server/eventsupplier.cpp rename to src/server/eventsupplier.cpp index 5d41acfd6..99d470b02 100644 --- a/cppapi/server/eventsupplier.cpp +++ b/src/server/eventsupplier.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //==================================================================================================================== // // file : eventsupplier.cpp @@ -35,7 +33,7 @@ static const char *RcsId = "$Id$"; //==================================================================================================================== #include -#include +#include #ifdef _TG_WINDOWS_ #include diff --git a/cppapi/server/except.cpp b/src/server/except.cpp similarity index 97% rename from cppapi/server/except.cpp rename to src/server/except.cpp index beec212cd..0b431916f 100644 --- a/cppapi/server/except.cpp +++ b/src/server/except.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================= // // file : except.cpp @@ -753,11 +751,11 @@ void Except::throw_exception(const CORBA::SystemException &c_ex,const char *orig errors.length(1); errors[0].severity = Tango::ERR; - errors[0].origin = CORBA::string_dup(origin); - errors[0].reason = CORBA::string_dup(API_CorbaSysException); + errors[0].origin = Tango::string_dup(origin); + errors[0].reason = Tango::string_dup(API_CorbaSysException); Tango::Except::the_mutex.lock(); char *tmp = print_CORBA_SystemException(&c_ex); - errors[0].desc = CORBA::string_dup(tmp); + errors[0].desc = Tango::string_dup(tmp); Tango::Except::the_mutex.unlock(); throw Tango::DevFailed(errors); @@ -769,12 +767,12 @@ void Except::throw_exception(const CORBA::SystemException &c_ex,char *origin) errors.length(1); errors[0].severity = Tango::ERR; - errors[0].origin = CORBA::string_dup(origin); + errors[0].origin = Tango::string_dup(origin); delete [] origin; - errors[0].reason = CORBA::string_dup(API_CorbaSysException); + errors[0].reason = Tango::string_dup(API_CorbaSysException); Tango::Except::the_mutex.lock(); char *tmp = print_CORBA_SystemException(&c_ex); - errors[0].desc = CORBA::string_dup(tmp); + errors[0].desc = Tango::string_dup(tmp); Tango::Except::the_mutex.unlock(); throw Tango::DevFailed(errors); @@ -786,11 +784,11 @@ void Except::throw_exception(const CORBA::SystemException &c_ex,const string &or errors.length(1); errors[0].severity = Tango::ERR; - errors[0].origin = CORBA::string_dup(origin.c_str()); - errors[0].reason = CORBA::string_dup(API_CorbaSysException); + errors[0].origin = Tango::string_dup(origin.c_str()); + errors[0].reason = Tango::string_dup(API_CorbaSysException); Tango::Except::the_mutex.lock(); char *tmp = print_CORBA_SystemException(&c_ex); - errors[0].desc = CORBA::string_dup(tmp); + errors[0].desc = Tango::string_dup(tmp); Tango::Except::the_mutex.unlock(); throw Tango::DevFailed(errors); diff --git a/cppapi/server/fwdattrdesc.cpp b/src/server/fwdattrdesc.cpp similarity index 99% rename from cppapi/server/fwdattrdesc.cpp rename to src/server/fwdattrdesc.cpp index 1c019f576..a70c410dd 100644 --- a/cppapi/server/fwdattrdesc.cpp +++ b/src/server/fwdattrdesc.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //+================================================================================================================== // // file : fwdattrdesc.cpp @@ -37,10 +35,10 @@ static const char *RcsId = "$Id$"; #endif #include -#include +#include -#include -#include +#include +#include namespace Tango { diff --git a/cppapi/server/fwdattribute.cpp b/src/server/fwdattribute.cpp similarity index 99% rename from cppapi/server/fwdattribute.cpp rename to src/server/fwdattribute.cpp index a37e83be7..173ad9883 100644 --- a/cppapi/server/fwdattribute.cpp +++ b/src/server/fwdattribute.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //==================================================================================================================== // // file : fwdattribute.cpp @@ -39,8 +37,8 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include -#include +#include +#include namespace Tango { @@ -1013,7 +1011,7 @@ AttributeValueList_5 *FwdAttribute::write_read_root_att(Tango::AttributeValueLis Tango::DevVarStringArray dvsa; dvsa.length(1); - dvsa[0] = CORBA::string_dup(get_fwd_att_name().c_str()); + dvsa[0] = Tango::string_dup(get_fwd_att_name().c_str()); int ctr = 0; AttributeValueList_5 *attr_value_list_5; diff --git a/src/server/jpeg/CMakeLists.txt b/src/server/jpeg/CMakeLists.txt new file mode 100644 index 000000000..0406ee95b --- /dev/null +++ b/src/server/jpeg/CMakeLists.txt @@ -0,0 +1,15 @@ +set(SOURCES jpeg_bitstream.cpp + jpeg_color.cpp + jpeg_dct.cpp + jpeg_decoder.cpp + jpeg_encoder.cpp + jpeg_memory.cpp) + +set(HEADERS jpeg_bitstream.h + jpeg_const.h + jpeg_lib.h + jpeg_memory.h) + +add_library(jpeg_objects OBJECT ${SOURCES} ${HEADERS}) +target_compile_options(jpeg_objects PRIVATE -fPIC) +target_include_directories(jpeg_objects PRIVATE .) diff --git a/cppapi/server/jpeg/jpeg_bitstream.cpp b/src/server/jpeg/jpeg_bitstream.cpp similarity index 100% rename from cppapi/server/jpeg/jpeg_bitstream.cpp rename to src/server/jpeg/jpeg_bitstream.cpp diff --git a/cppapi/server/jpeg/jpeg_bitstream.h b/src/server/jpeg/jpeg_bitstream.h similarity index 100% rename from cppapi/server/jpeg/jpeg_bitstream.h rename to src/server/jpeg/jpeg_bitstream.h diff --git a/cppapi/server/jpeg/jpeg_color.cpp b/src/server/jpeg/jpeg_color.cpp similarity index 100% rename from cppapi/server/jpeg/jpeg_color.cpp rename to src/server/jpeg/jpeg_color.cpp diff --git a/cppapi/server/jpeg/jpeg_const.h b/src/server/jpeg/jpeg_const.h similarity index 100% rename from cppapi/server/jpeg/jpeg_const.h rename to src/server/jpeg/jpeg_const.h diff --git a/cppapi/server/jpeg/jpeg_dct.cpp b/src/server/jpeg/jpeg_dct.cpp similarity index 100% rename from cppapi/server/jpeg/jpeg_dct.cpp rename to src/server/jpeg/jpeg_dct.cpp diff --git a/cppapi/server/jpeg/jpeg_decoder.cpp b/src/server/jpeg/jpeg_decoder.cpp similarity index 100% rename from cppapi/server/jpeg/jpeg_decoder.cpp rename to src/server/jpeg/jpeg_decoder.cpp diff --git a/cppapi/server/jpeg/jpeg_encoder.cpp b/src/server/jpeg/jpeg_encoder.cpp similarity index 100% rename from cppapi/server/jpeg/jpeg_encoder.cpp rename to src/server/jpeg/jpeg_encoder.cpp diff --git a/cppapi/server/jpeg/jpeg_lib.h b/src/server/jpeg/jpeg_lib.h similarity index 100% rename from cppapi/server/jpeg/jpeg_lib.h rename to src/server/jpeg/jpeg_lib.h diff --git a/cppapi/server/jpeg/jpeg_memory.cpp b/src/server/jpeg/jpeg_memory.cpp similarity index 100% rename from cppapi/server/jpeg/jpeg_memory.cpp rename to src/server/jpeg/jpeg_memory.cpp diff --git a/cppapi/server/jpeg/jpeg_memory.h b/src/server/jpeg/jpeg_memory.h similarity index 100% rename from cppapi/server/jpeg/jpeg_memory.h rename to src/server/jpeg/jpeg_memory.h diff --git a/cppapi/server/jpeg_mmx/CMakeLists.txt b/src/server/jpeg_mmx/CMakeLists.txt similarity index 86% rename from cppapi/server/jpeg_mmx/CMakeLists.txt rename to src/server/jpeg_mmx/CMakeLists.txt index c47647119..30480be05 100644 --- a/cppapi/server/jpeg_mmx/CMakeLists.txt +++ b/src/server/jpeg_mmx/CMakeLists.txt @@ -1,11 +1,10 @@ -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../jpeg) - set(SOURCES jpeg_color_mmx.cpp jpeg_dct_mmx.cpp) add_library(jpeg_mmx_objects OBJECT ${SOURCES}) target_compile_options(jpeg_mmx_objects PRIVATE -mmmx -fPIC) +target_include_directories(jpeg_mmx_objects PRIVATE ../jpeg) if(${PLATFORM} EQUAL 64) target_compile_definitions(jpeg_mmx_objects PRIVATE _64BITS) else() diff --git a/cppapi/server/jpeg_mmx/jpeg_color_mmx.cpp b/src/server/jpeg_mmx/jpeg_color_mmx.cpp similarity index 100% rename from cppapi/server/jpeg_mmx/jpeg_color_mmx.cpp rename to src/server/jpeg_mmx/jpeg_color_mmx.cpp diff --git a/cppapi/server/jpeg_mmx/jpeg_dct_mmx.cpp b/src/server/jpeg_mmx/jpeg_dct_mmx.cpp similarity index 100% rename from cppapi/server/jpeg_mmx/jpeg_dct_mmx.cpp rename to src/server/jpeg_mmx/jpeg_dct_mmx.cpp diff --git a/cppapi/server/logcmds.cpp b/src/server/logcmds.cpp similarity index 99% rename from cppapi/server/logcmds.cpp rename to src/server/logcmds.cpp index c2562fba5..a6339d998 100644 --- a/cppapi/server/logcmds.cpp +++ b/src/server/logcmds.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================= // // file : LogCmds.cpp @@ -81,7 +79,7 @@ static const char *RcsId = "$Id$\n$Name$"; #ifdef TANGO_HAS_LOG4TANGO -#include +#include namespace Tango { diff --git a/cppapi/server/logging.cpp b/src/server/logging.cpp similarity index 99% rename from cppapi/server/logging.cpp rename to src/server/logging.cpp index c28ef546b..30701da84 100644 --- a/cppapi/server/logging.cpp +++ b/src/server/logging.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================= // // file : Logging.cpp @@ -55,9 +53,9 @@ static const char *RcsId = "$Id$\n$Name$"; # include #endif -#include -#include -#include +#include +#include +#include namespace Tango { @@ -708,7 +706,7 @@ Tango::DevVarStringArray* Logging::get_logging_target (const std::string& dev_na // populate the CORBA::sequence for (unsigned int i = 0; i != al.size(); i++) { cout4 << "\tadding " << al[i]->get_name() << " to the returned target list" << endl; - (*ret)[i] = CORBA::string_dup(al[i]->get_name().c_str()); + (*ret)[i] = Tango::string_dup(al[i]->get_name().c_str()); } // for i // trace cout4 << "Leaving Logging::get_logging_target " << endl; @@ -851,7 +849,7 @@ DevVarLongStringArray* Logging::get_logging_level (const DevVarStringArray *argi ret->lvalue.length(ret->lvalue.length() + 1); ret->svalue.length(ret->svalue.length() + 1); // populate ret - ret->svalue[ret->svalue.length() - 1] = CORBA::string_dup(dl[j]->get_name().c_str()); + ret->svalue[ret->svalue.length() - 1] = Tango::string_dup(dl[j]->get_name().c_str()); ret->lvalue[ret->lvalue.length() - 1] = tango_level; } // for j } // for i diff --git a/cppapi/server/logstream.cpp b/src/server/logstream.cpp similarity index 100% rename from cppapi/server/logstream.cpp rename to src/server/logstream.cpp diff --git a/cppapi/server/multiattribute.cpp b/src/server/multiattribute.cpp similarity index 99% rename from cppapi/server/multiattribute.cpp rename to src/server/multiattribute.cpp index 932cae42d..8a3f90afc 100644 --- a/cppapi/server/multiattribute.cpp +++ b/src/server/multiattribute.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+================================================================================================================== // // file : MultiAttribute.cpp @@ -39,9 +37,9 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cppapi/server/notifdeventsupplier.cpp b/src/server/notifdeventsupplier.cpp similarity index 95% rename from cppapi/server/notifdeventsupplier.cpp rename to src/server/notifdeventsupplier.cpp index 93986ce13..1642ba904 100644 --- a/cppapi/server/notifdeventsupplier.cpp +++ b/src/server/notifdeventsupplier.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //////////////////////////////////////////////////////////////////////////////// // // file notifdeventsupplier.cpp @@ -39,7 +37,7 @@ static const char *RcsId = "$Id$"; //////////////////////////////////////////////////////////////////////////////// #include -#include +#include #include #include @@ -474,13 +472,13 @@ void NotifdEventSupplier::connect_to_notifd(NotifService &ns,CORBA::ORB_var &_or { Tango::DevVarStringArray *eve_export_list = new Tango::DevVarStringArray; eve_export_list->length(5); - (*eve_export_list)[0] = CORBA::string_dup(d_name.c_str()); - (*eve_export_list)[1] = CORBA::string_dup(ior_string.c_str()); - (*eve_export_list)[2] = CORBA::string_dup(host_name.c_str()); + (*eve_export_list)[0] = Tango::string_dup(d_name.c_str()); + (*eve_export_list)[1] = Tango::string_dup(ior_string.c_str()); + (*eve_export_list)[2] = Tango::string_dup(host_name.c_str()); ostringstream ostream; ostream << getpid() << ends; - (*eve_export_list)[3] = CORBA::string_dup(ostream.str().c_str()); - (*eve_export_list)[4] = CORBA::string_dup("1"); + (*eve_export_list)[3] = Tango::string_dup(ostream.str().c_str()); + (*eve_export_list)[4] = Tango::string_dup("1"); bool retry = true; int ctr = 0; @@ -684,19 +682,19 @@ void NotifdEventSupplier::push_heartbeat_event() { domain_name = "dserver/" + adm_dev->get_full_name(); - struct_event.header.fixed_header.event_type.domain_name = CORBA::string_dup(domain_name.c_str()); - struct_event.header.fixed_header.event_type.type_name = CORBA::string_dup(fqdn_prefix.c_str()); + struct_event.header.fixed_header.event_type.domain_name = Tango::string_dup(domain_name.c_str()); + struct_event.header.fixed_header.event_type.type_name = Tango::string_dup(fqdn_prefix.c_str()); struct_event.header.variable_header.length( 0 ); cout3 << "NotifdEventSupplier::push_heartbeat_event(): detected heartbeat event for " << domain_name << endl; cout3 << "NotifdEventSupplier::push_heartbeat_event(): delta _time " << delta_time << endl; - struct_event.header.fixed_header.event_name = CORBA::string_dup("heartbeat"); + struct_event.header.fixed_header.event_name = Tango::string_dup("heartbeat"); struct_event.filterable_data.length(1); - struct_event.filterable_data[0].name = CORBA::string_dup("heartbeat_counter"); - struct_event.filterable_data[0].value <<= (CORBA::Long) heartbeat_counter++; + struct_event.filterable_data[0].name = Tango::string_dup("heartbeat_counter"); + struct_event.filterable_data[0].value <<= (DevLong) heartbeat_counter++; adm_dev->last_heartbeat = now_time; - struct_event.remainder_of_body <<= (CORBA::Long)adm_dev->last_heartbeat; + struct_event.remainder_of_body <<= (DevLong)adm_dev->last_heartbeat; // // Push the event @@ -868,8 +866,8 @@ void NotifdEventSupplier::push_event(DeviceImpl *device_impl,string event_type, if (pos != string::npos) event_type.erase(0,EVENT_COMPAT_IDL5_SIZE); - struct_event.header.fixed_header.event_type.domain_name = CORBA::string_dup(domain_name.c_str()); - struct_event.header.fixed_header.event_type.type_name = CORBA::string_dup(fqdn_prefix.c_str()); + struct_event.header.fixed_header.event_type.domain_name = Tango::string_dup(domain_name.c_str()); + struct_event.header.fixed_header.event_type.type_name = Tango::string_dup(fqdn_prefix.c_str()); struct_event.header.variable_header.length( 0 ); @@ -884,8 +882,8 @@ void NotifdEventSupplier::push_event(DeviceImpl *device_impl,string event_type, { for (unsigned long i = 0; i < nb_filter; i++) { - struct_event.filterable_data[i].name = CORBA::string_dup(filterable_names[i].c_str()); - struct_event.filterable_data[i].value <<= (CORBA::Double) filterable_data[i]; + struct_event.filterable_data[i].name = Tango::string_dup(filterable_names[i].c_str()); + struct_event.filterable_data[i].value <<= (DevDouble) filterable_data[i]; } } } @@ -896,8 +894,8 @@ void NotifdEventSupplier::push_event(DeviceImpl *device_impl,string event_type, { for (unsigned long i = 0; i < nb_filter_lg; i++) { - struct_event.filterable_data[i + nb_filter].name = CORBA::string_dup(filterable_names_lg[i].c_str()); - struct_event.filterable_data[i + nb_filter].value <<= (CORBA::Long) filterable_data_lg[i]; + struct_event.filterable_data[i + nb_filter].name = Tango::string_dup(filterable_names_lg[i].c_str()); + struct_event.filterable_data[i + nb_filter].value <<= (DevLong) filterable_data_lg[i]; } } } @@ -942,7 +940,7 @@ void NotifdEventSupplier::push_event(DeviceImpl *device_impl,string event_type, } else struct_event.remainder_of_body <<= except->errors; - struct_event.header.fixed_header.event_name = CORBA::string_dup(event_type.c_str()); + struct_event.header.fixed_header.event_name = Tango::string_dup(event_type.c_str()); cout3 << "EventSupplier::push_event(): push event " << event_type << " for " << device_impl->get_name() + "/" + attr_name << endl; diff --git a/cppapi/server/ntservice.cpp b/src/server/ntservice.cpp similarity index 99% rename from cppapi/server/ntservice.cpp rename to src/server/ntservice.cpp index 83858b399..6c4847d3e 100644 --- a/cppapi/server/ntservice.cpp +++ b/src/server/ntservice.cpp @@ -23,9 +23,9 @@ #include #endif -#include +#include "../../include/tango/server/ntservice.h" -#include +#include "../../include/tango.h" namespace Tango { @@ -46,12 +46,12 @@ static char* GetErrorText() 0, GetLastError(), LANG_NEUTRAL, (char*)&str, 0, 0); if(str) { - cstr = CORBA::string_dup(str); + cstr = Tango::string_dup(str); ::LocalFree((HLOCAL)str); } else { - cstr = CORBA::string_dup("FormatMessage failed"); + cstr = Tango::string_dup("FormatMessage failed"); } return cstr; } diff --git a/cppapi/server/pipe.cpp b/src/server/pipe.cpp similarity index 97% rename from cppapi/server/pipe.cpp rename to src/server/pipe.cpp index a081c242d..d36762fab 100644 --- a/cppapi/server/pipe.cpp +++ b/src/server/pipe.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+================================================================================================================== // // file : Pipe.cpp @@ -38,7 +36,7 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include +#include namespace Tango { @@ -142,8 +140,8 @@ void Pipe::set_upd_properties(const PipeConfig &new_conf,DeviceImpl *dev) // PipeConfig old_conf = new_conf; - old_conf.label = CORBA::string_dup(label.c_str()); - old_conf.description = CORBA::string_dup(desc.c_str()); + old_conf.label = Tango::string_dup(label.c_str()); + old_conf.description = Tango::string_dup(desc.c_str()); try { @@ -642,16 +640,16 @@ void Pipe::set_time() struct _timeb t; _ftime(&t); - when.tv_sec = (CORBA::Long)t.time; - when.tv_usec = (CORBA::Long)(t.millitm * 1000); + when.tv_sec = (DevLong)t.time; + when.tv_usec = (DevLong)(t.millitm * 1000); when.tv_nsec = 0; #else struct timezone tz; struct timeval tv; gettimeofday(&tv,&tz); - when.tv_sec = (CORBA::Long)tv.tv_sec; - when.tv_usec = (CORBA::Long)tv.tv_usec; + when.tv_sec = (DevLong)tv.tv_sec; + when.tv_usec = (DevLong)tv.tv_usec; when.tv_nsec = 0; #endif } @@ -818,7 +816,7 @@ void Pipe::fire_event(DeviceImpl *dev,DevicePipeBlob *p_data,struct timeval &t,b // ad.pipe_val = new DevPipeData(); - ad.pipe_val->name = CORBA::string_dup(name.c_str()); + ad.pipe_val->name = Tango::string_dup(name.c_str()); ::memset(&(ad.pipe_val->time),0,sizeof(ad.pipe_val->time)); ad.pipe_val->time.tv_sec = t.tv_sec; @@ -835,10 +833,10 @@ void Pipe::fire_event(DeviceImpl *dev,DevicePipeBlob *p_data,struct timeval &t,b Except::throw_exception(API_PipeNoDataElement,"No data in DevicePipeBlob!","Pipe::fire_event()"); } - CORBA::ULong max,len; + DevULong max,len; max = tmp_ptr->maximum(); len = tmp_ptr->length(); - ad.pipe_val->data_blob.blob_data.replace(max,len,tmp_ptr->get_buffer((CORBA::Boolean)true),true); + ad.pipe_val->data_blob.blob_data.replace(max,len,tmp_ptr->get_buffer((DevBoolean)true),true); // // Fire event diff --git a/cppapi/server/pollcmds.cpp b/src/server/pollcmds.cpp similarity index 99% rename from cppapi/server/pollcmds.cpp rename to src/server/pollcmds.cpp index fbdfa3d07..84459ecc7 100644 --- a/cppapi/server/pollcmds.cpp +++ b/src/server/pollcmds.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================= // // file : PollCmds.cpp @@ -45,7 +43,7 @@ static const char *RcsId = "$Id$\n$Name$"; #include #include -#include +#include namespace Tango { diff --git a/cppapi/server/pollobj.cpp b/src/server/pollobj.cpp similarity index 98% rename from cppapi/server/pollobj.cpp rename to src/server/pollobj.cpp index ad275007f..02e1d6e7e 100644 --- a/cppapi/server/pollobj.cpp +++ b/src/server/pollobj.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+================================================================================================================== // // file : PollObj.cpp @@ -38,9 +36,9 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include -#include -#include +#include +#include +#include #ifdef _TG_WINDOWS_ @@ -365,7 +363,7 @@ void PollObj::get_attr_history(long n,Tango::DevAttrHistoryList_3 *ptr,long attr { if ((*ptr)[i].attr_failed == true) { - (*ptr)[i].value.name = CORBA::string_dup(name.c_str()); + (*ptr)[i].value.name = Tango::string_dup(name.c_str()); } } } diff --git a/cppapi/server/pollring.cpp b/src/server/pollring.cpp similarity index 99% rename from cppapi/server/pollring.cpp rename to src/server/pollring.cpp index a5eb9054d..92bcd2e46 100644 --- a/cppapi/server/pollring.cpp +++ b/src/server/pollring.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================ // // file : PollRing.cpp @@ -43,8 +41,8 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include -#include +#include +#include #ifdef _TG_WINDOWS_ @@ -1370,7 +1368,7 @@ void PollRing::get_cmd_history(long n,Tango::DevCmdHistory_4 *ptr,Tango::CmdArgT tmp_buffer.length(buffer_data_length); for (unsigned int k = 0;k < buffer_data_length;k++) tmp_buffer[k] = enc->encoded_data[k]; - (*new_tmp_enc)[ind_in_seq].encoded_format = CORBA::string_dup(enc->encoded_format); + (*new_tmp_enc)[ind_in_seq].encoded_format = Tango::string_dup(enc->encoded_format); ind_in_seq = ind_in_seq + 1; } MANAGE_DIM_SIMPLE(); @@ -1536,7 +1534,7 @@ void PollRing::get_attr_history(long n,Tango::DevAttrHistoryList *ptr,long type) (*ptr)[seq_index].value.quality = (*ring[index].attr_value)[0].quality; (*ptr)[seq_index].value.dim_x = (*ring[index].attr_value)[0].dim_x; (*ptr)[seq_index].value.dim_y = (*ring[index].attr_value)[0].dim_y; - (*ptr)[seq_index].value.name = CORBA::string_dup((*ring[index].attr_value)[0].name); + (*ptr)[seq_index].value.name = Tango::string_dup((*ring[index].attr_value)[0].name); if ((*ptr)[seq_index].value.quality != Tango::ATTR_INVALID) { @@ -1726,7 +1724,7 @@ void PollRing::get_attr_history(long n,Tango::DevAttrHistoryList_3 *ptr,long typ (*ptr)[seq_index].value.quality = (*ring[index].attr_value_3)[0].quality; (*ptr)[seq_index].value.r_dim = (*ring[index].attr_value_3)[0].r_dim; (*ptr)[seq_index].value.w_dim = (*ring[index].attr_value_3)[0].w_dim; - (*ptr)[seq_index].value.name = CORBA::string_dup((*ring[index].attr_value_3)[0].name); + (*ptr)[seq_index].value.name = Tango::string_dup((*ring[index].attr_value_3)[0].name); (*ptr)[seq_index].attr_failed = false; @@ -1932,7 +1930,7 @@ void PollRing::get_attr_history_43(long n,Tango::DevAttrHistoryList_3 *ptr,long (*ptr)[seq_index].value.quality = (*ring[index].attr_value_4)[0].quality; (*ptr)[seq_index].value.r_dim = (*ring[index].attr_value_4)[0].r_dim; (*ptr)[seq_index].value.w_dim = (*ring[index].attr_value_4)[0].w_dim; - (*ptr)[seq_index].value.name = CORBA::string_dup((*ring[index].attr_value_4)[0].name); + (*ptr)[seq_index].value.name = Tango::string_dup((*ring[index].attr_value_4)[0].name); (*ptr)[seq_index].attr_failed = false; diff --git a/cppapi/server/pollthread.cpp b/src/server/pollthread.cpp similarity index 99% rename from cppapi/server/pollthread.cpp rename to src/server/pollthread.cpp index c4a92f123..a9748f26c 100644 --- a/cppapi/server/pollthread.cpp +++ b/src/server/pollthread.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+================================================================================================================= // // file : PollThread.cpp @@ -38,8 +36,8 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include -#include +#include +#include #ifdef _TG_WINDOWS_ #include @@ -1481,9 +1479,9 @@ void PollThread::err_out_of_sync(WorkItem &to_do) errs.length(1); errs[0].severity = Tango::ERR; - errs[0].reason = CORBA::string_dup("API_PollThreadOutOfSync"); - errs[0].origin = CORBA::string_dup("PollThread::err_out_of_sync"); - errs[0].desc = CORBA::string_dup("The polling thread is late and discard this object polling.\nAdvice: Tune device server polling"); + errs[0].reason = Tango::string_dup("API_PollThreadOutOfSync"); + errs[0].origin = Tango::string_dup("PollThread::err_out_of_sync"); + errs[0].desc = Tango::string_dup("The polling thread is late and discard this object polling.\nAdvice: Tune device server polling"); Tango::DevFailed except(errs); long idl_vers = to_do.dev->get_dev_idl_version(); diff --git a/cppapi/server/rootattreg.cpp b/src/server/rootattreg.cpp similarity index 99% rename from cppapi/server/rootattreg.cpp rename to src/server/rootattreg.cpp index 4f9569408..7376a036b 100644 --- a/cppapi/server/rootattreg.cpp +++ b/src/server/rootattreg.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //+================================================================================================================== // // file : rootattreg.cpp @@ -37,8 +35,8 @@ static const char *RcsId = "$Id$"; #endif #include -#include -#include +#include +#include namespace Tango { @@ -187,9 +185,9 @@ void RootAttRegistry::RootAttConfCallBack::push_event(Tango::AttrConfEventData * send.lvalue.length(1); send.svalue.length(3); - send.svalue[0] = CORBA::string_dup(the_dev->get_name().c_str()); - send.svalue[1] = CORBA::string_dup("attribute"); - send.svalue[2] = CORBA::string_dup((*pos).c_str()); + send.svalue[0] = Tango::string_dup(the_dev->get_name().c_str()); + send.svalue[1] = Tango::string_dup("attribute"); + send.svalue[2] = Tango::string_dup((*pos).c_str()); stringstream ss; long upd; diff --git a/cppapi/server/seqvec.cpp b/src/server/seqvec.cpp similarity index 99% rename from cppapi/server/seqvec.cpp rename to src/server/seqvec.cpp index 1c58ace66..8887486ad 100644 --- a/cppapi/server/seqvec.cpp +++ b/src/server/seqvec.cpp @@ -36,7 +36,7 @@ #include #endif -#include +#include namespace Tango { diff --git a/cppapi/server/subdev_diag.cpp b/src/server/subdev_diag.cpp similarity index 99% rename from cppapi/server/subdev_diag.cpp rename to src/server/subdev_diag.cpp index c5275dddf..c522d1d8d 100644 --- a/cppapi/server/subdev_diag.cpp +++ b/src/server/subdev_diag.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================= // // file : subdev_diag.cpp @@ -279,7 +277,7 @@ Tango::DevVarStringArray *SubDevDiag::get_sub_devices() ret = new Tango::DevVarStringArray(DefaultMaxSeq); ret->length(sub_dev_list.size()); for (unsigned int k = 0; k +#include #define USE_ASYNC_CALL @@ -116,21 +114,21 @@ namespace Tango << ts_ms << ends; string st = ts_ms_str.str(); - (*dvsa)[0] = CORBA::string_dup(st.c_str()); + (*dvsa)[0] = Tango::string_dup(st.c_str()); - (*dvsa)[1] = CORBA::string_dup(log4tango::Level::get_name(event.level).c_str()); - (*dvsa)[2] = CORBA::string_dup(event.logger_name.c_str()); - (*dvsa)[3] = CORBA::string_dup(event.message.c_str()); - (*dvsa)[4] = CORBA::string_dup(""); + (*dvsa)[1] = Tango::string_dup(log4tango::Level::get_name(event.level).c_str()); + (*dvsa)[2] = Tango::string_dup(event.logger_name.c_str()); + (*dvsa)[3] = Tango::string_dup(event.message.c_str()); + (*dvsa)[4] = Tango::string_dup(""); omni_thread* ct = omni_thread::self(); if (ct) { TangoSys_OMemStream ctstr; ctstr << "@" << hex << event.thread_id << " [" << ct->id() << "]"<< ends; string st = ctstr.str(); - (*dvsa)[5] = CORBA::string_dup(st.c_str()); + (*dvsa)[5] = Tango::string_dup(st.c_str()); } else { - (*dvsa)[5] = CORBA::string_dup("unknown"); + (*dvsa)[5] = Tango::string_dup("unknown"); } DeviceData argin; argin << dvsa; diff --git a/cppapi/server/tangorollingfileappender.cpp b/src/server/tangorollingfileappender.cpp similarity index 95% rename from cppapi/server/tangorollingfileappender.cpp rename to src/server/tangorollingfileappender.cpp index e936a5b46..0d408c2c9 100644 --- a/cppapi/server/tangorollingfileappender.cpp +++ b/src/server/tangorollingfileappender.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================= // // file : tangorollingfileappender.cpp @@ -42,7 +40,7 @@ static const char *RcsId = "$Id$\n$Name$"; #ifdef TANGO_HAS_LOG4TANGO -#include +#include namespace Tango { diff --git a/cppapi/server/templ_inst.cpp b/src/server/templ_inst.cpp similarity index 99% rename from cppapi/server/templ_inst.cpp rename to src/server/templ_inst.cpp index c8b8114a7..48a5c0c25 100644 --- a/cppapi/server/templ_inst.cpp +++ b/src/server/templ_inst.cpp @@ -46,13 +46,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace Tango { diff --git a/cppapi/server/thsig.cpp b/src/server/thsig.cpp similarity index 98% rename from cppapi/server/thsig.cpp rename to src/server/thsig.cpp index 628a882f8..e298e2953 100644 --- a/cppapi/server/thsig.cpp +++ b/src/server/thsig.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================= // // file : thsig.cpp @@ -43,7 +41,7 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include +#include extern omni_thread::key_t key_py_data; diff --git a/cppapi/server/utils.cpp b/src/server/utils.cpp similarity index 99% rename from cppapi/server/utils.cpp rename to src/server/utils.cpp index 8d4a06555..477682a5a 100644 --- a/cppapi/server/utils.cpp +++ b/src/server/utils.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+=================================================================================================================== // // file : Tango_utils.cpp @@ -41,9 +39,9 @@ static const char *RcsId = "$Id$\n$Name$"; #include #include -#include -#include -#include +#include +#include +#include #ifndef _TG_WINDOWS_ #include @@ -291,7 +289,7 @@ void Util::effective_job(int argc,char *argv[]) // bool omni_42_compat = false; - CORBA::ULong omni_vers_hex = omniORB::versionHex(); + DevULong omni_vers_hex = omniORB::versionHex(); if (omni_vers_hex > 0x04020000) omni_42_compat = true; diff --git a/cppapi/server/utils_polling.cpp b/src/server/utils_polling.cpp similarity index 99% rename from cppapi/server/utils_polling.cpp rename to src/server/utils_polling.cpp index 63c511d5b..6edb0c03f 100644 --- a/cppapi/server/utils_polling.cpp +++ b/src/server/utils_polling.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //+================================================================================================================== // // file : utils_polling.cpp @@ -156,9 +154,9 @@ void Util::polling_configure() send->lvalue.length(1); send->svalue.length(3); - send->svalue[0] = CORBA::string_dup(dev_list[j]->get_name().c_str()); - send->svalue[1] = CORBA::string_dup("command"); - send->svalue[2] = CORBA::string_dup(poll_cmd_list[k].c_str()); + send->svalue[0] = Tango::string_dup(dev_list[j]->get_name().c_str()); + send->svalue[1] = Tango::string_dup("command"); + send->svalue[2] = Tango::string_dup(poll_cmd_list[k].c_str()); // // Convert polling period to a number and store polling thread command params @@ -198,9 +196,9 @@ void Util::polling_configure() send->lvalue.length(1); send->svalue.length(3); - send->svalue[0] = CORBA::string_dup(dev_list[j]->get_name().c_str()); - send->svalue[1] = CORBA::string_dup("attribute"); - send->svalue[2] = CORBA::string_dup(poll_attr_list[k].c_str()); + send->svalue[0] = Tango::string_dup(dev_list[j]->get_name().c_str()); + send->svalue[1] = Tango::string_dup("attribute"); + send->svalue[2] = Tango::string_dup(poll_attr_list[k].c_str()); // // Convert polling period to a number and store polling thread command params diff --git a/cppapi/server/utils_shut.cpp b/src/server/utils_shut.cpp similarity index 98% rename from cppapi/server/utils_shut.cpp rename to src/server/utils_shut.cpp index 7b4f8c10d..e0333f6b6 100644 --- a/cppapi/server/utils_shut.cpp +++ b/src/server/utils_shut.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //+============================================================================= // // file : utils_shut.cpp @@ -40,8 +38,8 @@ static const char *RcsId = "$Id$"; #endif #include -#include -#include +#include +#include extern omni_thread::key_t key_py_data; diff --git a/cppapi/server/w32win.cpp b/src/server/w32win.cpp similarity index 99% rename from cppapi/server/w32win.cpp rename to src/server/w32win.cpp index c941dd872..9fa143dcb 100644 --- a/cppapi/server/w32win.cpp +++ b/src/server/w32win.cpp @@ -40,7 +40,7 @@ static const char *Vers = "$Revision$"; #include #endif -#include +#include "../../include/tango/server/w32win.h" #include namespace Tango diff --git a/cppapi/server/w_attribute.cpp b/src/server/w_attribute.cpp similarity index 98% rename from cppapi/server/w_attribute.cpp rename to src/server/w_attribute.cpp index c4022c98e..568e801d0 100644 --- a/cppapi/server/w_attribute.cpp +++ b/src/server/w_attribute.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+============================================================================ // // file : w_attribute.cpp @@ -44,9 +42,9 @@ static const char *RcsId = "$Id$\n$Name$"; #endif #include -#include -#include -#include +#include +#include +#include #include #include @@ -101,12 +99,12 @@ long64_ptr(NULL),ulong_ptr(NULL),ulong64_ptr(NULL),state_ptr(NULL),uswv(false),m ulong_val = old_ulong_val = 0; ulong64_val = old_ulong64_val = 0; dev_state_val = old_dev_state_val = Tango::UNKNOWN; - str_val = CORBA::string_dup("Not initialised"); - old_str_val = CORBA::string_dup("Not initialised"); + str_val = Tango::string_dup("Not initialised"); + old_str_val = Tango::string_dup("Not initialised"); encoded_val.encoded_data.length(0); - encoded_val.encoded_format = CORBA::string_dup("Not initialised"); + encoded_val.encoded_format = Tango::string_dup("Not initialised"); old_encoded_val.encoded_data.length(0); - old_encoded_val.encoded_format = CORBA::string_dup("Not initialised"); + old_encoded_val.encoded_format = Tango::string_dup("Not initialised"); short_array_val.length(1); short_array_val[0] = 0; @@ -115,7 +113,7 @@ long64_ptr(NULL),ulong_ptr(NULL),ulong64_ptr(NULL),state_ptr(NULL),uswv(false),m double_array_val.length(1); double_array_val[0] = 0.0; str_array_val.length(1); - str_array_val[0] = CORBA::string_dup("Not initialised"); + str_array_val[0] = Tango::string_dup("Not initialised"); float_array_val.length(1); float_array_val[0] = 0.0; boolean_array_val.length(1); @@ -299,7 +297,7 @@ void WAttribute::set_rvalue() void WAttribute::check_written_value(const CORBA::Any &any,unsigned long x,unsigned long y) { - CORBA::ULong nb_data; + DevULong nb_data; unsigned long i; // @@ -661,10 +659,10 @@ void WAttribute::check_written_value(const CORBA::Any &any,unsigned long x,unsig if (data_format == Tango::SCALAR) { CORBA::string_free(old_str_val); - old_str_val = CORBA::string_dup(str_val); + old_str_val = Tango::string_dup(str_val); CORBA::string_free(str_val); - str_val = CORBA::string_dup((*string_ptr)[0]); + str_val = Tango::string_dup((*string_ptr)[0]); w_dim_x = 1; w_dim_y = 0; } @@ -1431,10 +1429,10 @@ void WAttribute::check_written_value(const Tango::AttrValUnion &att_union,unsign if (data_format == Tango::SCALAR) { CORBA::string_free(old_str_val); - old_str_val = CORBA::string_dup(str_val); + old_str_val = Tango::string_dup(str_val); CORBA::string_free(str_val); - str_val = CORBA::string_dup(string_seq[0]); + str_val = Tango::string_dup(string_seq[0]); w_dim_x = 1; w_dim_y = 0; } @@ -1817,7 +1815,7 @@ void WAttribute::check_written_value(const Tango::AttrValUnion &att_union,unsign { for (i = 0;i < nb_data;i++) { - CORBA::ULong nb_data_elt = enc_seq[i].encoded_data.length(); + DevULong nb_data_elt = enc_seq[i].encoded_data.length(); for (j = 0;j < nb_data_elt;j++) { if (enc_seq[i].encoded_data[j] < min_value.uch) @@ -1837,7 +1835,7 @@ void WAttribute::check_written_value(const Tango::AttrValUnion &att_union,unsign { for (i = 0;i < nb_data;i++) { - CORBA::ULong nb_data_elt = enc_seq[i].encoded_data.length(); + DevULong nb_data_elt = enc_seq[i].encoded_data.length(); for (j = 0;j < nb_data_elt;j++) { if (enc_seq[i].encoded_data[j] > max_value.uch) @@ -2095,7 +2093,7 @@ void WAttribute::set_write_value(Tango::DevString val) { Tango::DevVarStringArray tmp_seq(1); tmp_seq.length(1); - tmp_seq[0] = CORBA::string_dup(val); + tmp_seq[0] = Tango::string_dup(val); CORBA::Any tmp_any; tmp_any <<= tmp_seq; @@ -2502,7 +2500,7 @@ void WAttribute::rollback() case Tango::DEV_STRING : CORBA::string_free(str_val); - str_val = CORBA::string_dup(old_str_val); + str_val = Tango::string_dup(old_str_val); break; case Tango::DEV_FLOAT : @@ -2694,15 +2692,15 @@ void WAttribute::set_written_date() struct _timeb t; _ftime(&t); - write_date.tv_sec = (CORBA::Long)t.time; - write_date.tv_usec = (CORBA::Long)(t.millitm * 1000); + write_date.tv_sec = (DevLong)t.time; + write_date.tv_usec = (DevLong)(t.millitm * 1000); #else struct timezone tz; struct timeval tv; gettimeofday(&tv,&tz); - write_date.tv_sec = (CORBA::Long)tv.tv_sec; - write_date.tv_usec = (CORBA::Long)tv.tv_usec; + write_date.tv_sec = (DevLong)tv.tv_sec; + write_date.tv_usec = (DevLong)tv.tv_usec; #endif } @@ -2739,8 +2737,8 @@ bool WAttribute::check_rds_alarm() struct _timeb t; _ftime(&t); - tv.tv_sec = (CORBA::Long)t.time; - tv.tv_usec = (CORBA::Long)(t.millitm * 1000); + tv.tv_sec = (DevLong)t.time; + tv.tv_usec = (DevLong)(t.millitm * 1000); #else struct timezone tz; gettimeofday(&tv,&tz); diff --git a/cppapi/server/w_pipe.cpp b/src/server/w_pipe.cpp similarity index 98% rename from cppapi/server/w_pipe.cpp rename to src/server/w_pipe.cpp index 8393a70a8..d04836743 100644 --- a/cppapi/server/w_pipe.cpp +++ b/src/server/w_pipe.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$\n$Name$"; - //+================================================================================================================== // // file : W_pipe.cpp diff --git a/cppapi/server/zmqeventsupplier.cpp b/src/server/zmqeventsupplier.cpp similarity index 99% rename from cppapi/server/zmqeventsupplier.cpp rename to src/server/zmqeventsupplier.cpp index 9efbcb34e..1ce087adf 100644 --- a/cppapi/server/zmqeventsupplier.cpp +++ b/src/server/zmqeventsupplier.cpp @@ -1,5 +1,3 @@ -static const char *RcsId = "$Id$"; - //+================================================================================================================== // // zmqeventsupplier.cpp : C++ classes for implementing the event server and client singleton classes -ZmqEventSupplier @@ -33,7 +31,7 @@ static const char *RcsId = "$Id$"; //+================================================================================================================== #include -#include +#include #include @@ -1183,7 +1181,7 @@ void ZmqEventSupplier::push_event(DeviceImpl *device_impl,string event_type, // Marshall the event data // - CORBA::Long padding = 0XDEC0DEC0; + DevLong padding = 0XDEC0DEC0; data_call_cdr.rewindPtrs(); padding >>= data_call_cdr; @@ -1210,7 +1208,7 @@ void ZmqEventSupplier::push_event(DeviceImpl *device_impl,string event_type, *(ev_value.attr_val_4) >>= data_call_cdr; mess_ptr = data_call_cdr.bufPtr(); - mess_ptr = (char *)mess_ptr + (sizeof(CORBA::Long) << 1); + mess_ptr = (char *)mess_ptr + (sizeof(DevLong) << 1); int nb_data; int data_discr = ((int *)mess_ptr)[0]; @@ -1239,7 +1237,7 @@ void ZmqEventSupplier::push_event(DeviceImpl *device_impl,string event_type, *(ev_value.attr_val_5) >>= data_call_cdr; mess_ptr = data_call_cdr.bufPtr(); - mess_ptr = (char *)mess_ptr + (sizeof(CORBA::Long) << 1); + mess_ptr = (char *)mess_ptr + (sizeof(DevLong) << 1); int nb_data; int data_discr = ((int *)mess_ptr)[0]; @@ -1299,8 +1297,8 @@ void ZmqEventSupplier::push_event(DeviceImpl *device_impl,string event_type, if (pipe_event == false) { - mess_size = data_call_cdr.bufSize() - sizeof(CORBA::Long); - mess_ptr = (char *)data_call_cdr.bufPtr() + sizeof(CORBA::Long); + mess_size = data_call_cdr.bufSize() - sizeof(DevLong); + mess_ptr = (char *)data_call_cdr.bufPtr() + sizeof(DevLong); } else { diff --git a/tango.pc.cmake b/tango.pc.cmake index 1260febd4..865ec56ad 100644 --- a/tango.pc.cmake +++ b/tango.pc.cmake @@ -4,8 +4,8 @@ includedir = ${prefix}/include libdir = ${prefix}/@CMAKE_INSTALL_LIBDIR@ Name: @CMAKE_PROJECT_NAME@ -Description: Tango client/server API library +Description: TANGO client/server API library Version: @LIBRARY_VERSION@ -Cflags: -I${includedir} -Requires: libzmq omniORB4 omniCOS4 omniDynamic4 -Libs: -L${libdir} -ltango -lzmq -lomniORB4 -lomnithread -lCOS4 -lomniDynamic4 \ No newline at end of file +Cflags: -std=c++11 -I${includedir} +Requires: omniDynamic4 >= 4.1.6, omniCOS4, libzmq +Libs: -L${libdir} -ltango \ No newline at end of file diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt new file mode 100644 index 000000000..8e5765cb2 --- /dev/null +++ b/test/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory(log4tango) +add_subdirectory(cpp_test_suite) \ No newline at end of file diff --git a/cppapi/ci/ALBA/build.sh b/test/ci/ALBA/build.sh old mode 100755 new mode 100644 similarity index 100% rename from cppapi/ci/ALBA/build.sh rename to test/ci/ALBA/build.sh diff --git a/cppapi/ci/ALBA/ct32suse11 b/test/ci/ALBA/ct32suse11 similarity index 100% rename from cppapi/ci/ALBA/ct32suse11 rename to test/ci/ALBA/ct32suse11 diff --git a/cppapi/ci/ALBA/ct64suse11 b/test/ci/ALBA/ct64suse11 similarity index 100% rename from cppapi/ci/ALBA/ct64suse11 rename to test/ci/ALBA/ct64suse11 diff --git a/cppapi/ci/ALBA/ct64suse121 b/test/ci/ALBA/ct64suse121 similarity index 100% rename from cppapi/ci/ALBA/ct64suse121 rename to test/ci/ALBA/ct64suse121 diff --git a/cppapi/ci/ESRF/build.sh b/test/ci/ESRF/build.sh old mode 100755 new mode 100644 similarity index 100% rename from cppapi/ci/ESRF/build.sh rename to test/ci/ESRF/build.sh diff --git a/cppapi/ci/build.sh b/test/ci/build.sh old mode 100755 new mode 100644 similarity index 100% rename from cppapi/ci/build.sh rename to test/ci/build.sh diff --git a/cpp_test_suite/CMakeLists.txt b/test/cpp_test_suite/CMakeLists.txt similarity index 95% rename from cpp_test_suite/CMakeLists.txt rename to test/cpp_test_suite/CMakeLists.txt index 2a361527f..3633ab6a0 100644 --- a/cpp_test_suite/CMakeLists.txt +++ b/test/cpp_test_suite/CMakeLists.txt @@ -24,7 +24,7 @@ macro(TEST_SUITE_ADD_TEST test) message("Add executable ${test}") add_executable(${test} ${test}.cpp) target_compile_definitions(${test} PUBLIC "-DVALGRIND -D_PTHREADS -D_REENTRANT") - target_link_libraries(${test} tango ${CMAKE_DL_LIBS}) + target_link_libraries(${test} tango) #TODO generalize tests # add_test(NAME "CPP::${test}" COMMAND $ ${DEV1} ${DEV2} ${DEV3} ${DEV1_ALIAS}) endmacro() diff --git a/cpp_test_suite/CTestCustom.cmake b/test/cpp_test_suite/CTestCustom.cmake similarity index 100% rename from cpp_test_suite/CTestCustom.cmake rename to test/cpp_test_suite/CTestCustom.cmake diff --git a/cpp_test_suite/asyn/CMakeLists.txt b/test/cpp_test_suite/asyn/CMakeLists.txt similarity index 100% rename from cpp_test_suite/asyn/CMakeLists.txt rename to test/cpp_test_suite/asyn/CMakeLists.txt diff --git a/cpp_test_suite/asyn/asyn_attr.cpp b/test/cpp_test_suite/asyn/asyn_attr.cpp similarity index 100% rename from cpp_test_suite/asyn/asyn_attr.cpp rename to test/cpp_test_suite/asyn/asyn_attr.cpp diff --git a/cpp_test_suite/asyn/asyn_attr_cb.cpp b/test/cpp_test_suite/asyn/asyn_attr_cb.cpp similarity index 100% rename from cpp_test_suite/asyn/asyn_attr_cb.cpp rename to test/cpp_test_suite/asyn/asyn_attr_cb.cpp diff --git a/cpp_test_suite/asyn/asyn_attr_multi.cpp b/test/cpp_test_suite/asyn/asyn_attr_multi.cpp similarity index 100% rename from cpp_test_suite/asyn/asyn_attr_multi.cpp rename to test/cpp_test_suite/asyn/asyn_attr_multi.cpp diff --git a/cpp_test_suite/asyn/asyn_cb.cpp b/test/cpp_test_suite/asyn/asyn_cb.cpp similarity index 100% rename from cpp_test_suite/asyn/asyn_cb.cpp rename to test/cpp_test_suite/asyn/asyn_cb.cpp diff --git a/cpp_test_suite/asyn/asyn_cb2.cpp b/test/cpp_test_suite/asyn/asyn_cb2.cpp similarity index 100% rename from cpp_test_suite/asyn/asyn_cb2.cpp rename to test/cpp_test_suite/asyn/asyn_cb2.cpp diff --git a/cpp_test_suite/asyn/asyn_cb_cmd.cpp b/test/cpp_test_suite/asyn/asyn_cb_cmd.cpp similarity index 100% rename from cpp_test_suite/asyn/asyn_cb_cmd.cpp rename to test/cpp_test_suite/asyn/asyn_cb_cmd.cpp diff --git a/cpp_test_suite/asyn/asyn_cmd.cpp b/test/cpp_test_suite/asyn/asyn_cmd.cpp similarity index 100% rename from cpp_test_suite/asyn/asyn_cmd.cpp rename to test/cpp_test_suite/asyn/asyn_cmd.cpp diff --git a/cpp_test_suite/asyn/asyn_faf.cpp b/test/cpp_test_suite/asyn/asyn_faf.cpp similarity index 100% rename from cpp_test_suite/asyn/asyn_faf.cpp rename to test/cpp_test_suite/asyn/asyn_faf.cpp diff --git a/cpp_test_suite/asyn/asyn_thread.cpp b/test/cpp_test_suite/asyn/asyn_thread.cpp similarity index 100% rename from cpp_test_suite/asyn/asyn_thread.cpp rename to test/cpp_test_suite/asyn/asyn_thread.cpp diff --git a/cpp_test_suite/asyn/asyn_write_attr.cpp b/test/cpp_test_suite/asyn/asyn_write_attr.cpp similarity index 100% rename from cpp_test_suite/asyn/asyn_write_attr.cpp rename to test/cpp_test_suite/asyn/asyn_write_attr.cpp diff --git a/cpp_test_suite/asyn/asyn_write_attr_multi.cpp b/test/cpp_test_suite/asyn/asyn_write_attr_multi.cpp similarity index 100% rename from cpp_test_suite/asyn/asyn_write_attr_multi.cpp rename to test/cpp_test_suite/asyn/asyn_write_attr_multi.cpp diff --git a/cpp_test_suite/asyn/asyn_write_cb.cpp b/test/cpp_test_suite/asyn/asyn_write_cb.cpp similarity index 100% rename from cpp_test_suite/asyn/asyn_write_cb.cpp rename to test/cpp_test_suite/asyn/asyn_write_cb.cpp diff --git a/cpp_test_suite/asyn/auto_asyn_cmd.cpp b/test/cpp_test_suite/asyn/auto_asyn_cmd.cpp similarity index 100% rename from cpp_test_suite/asyn/auto_asyn_cmd.cpp rename to test/cpp_test_suite/asyn/auto_asyn_cmd.cpp diff --git a/cpp_test_suite/asyn/runtest b/test/cpp_test_suite/asyn/runtest old mode 100755 new mode 100644 similarity index 100% rename from cpp_test_suite/asyn/runtest rename to test/cpp_test_suite/asyn/runtest diff --git a/cpp_test_suite/cpp_test_ds/.ddehist b/test/cpp_test_suite/cpp_test_ds/.ddehist similarity index 100% rename from cpp_test_suite/cpp_test_ds/.ddehist rename to test/cpp_test_suite/cpp_test_ds/.ddehist diff --git a/cpp_test_suite/cpp_test_ds/.pure b/test/cpp_test_suite/cpp_test_ds/.pure similarity index 100% rename from cpp_test_suite/cpp_test_ds/.pure rename to test/cpp_test_suite/cpp_test_ds/.pure diff --git a/cpp_test_suite/cpp_test_ds/CMakeLists.txt b/test/cpp_test_suite/cpp_test_ds/CMakeLists.txt similarity index 88% rename from cpp_test_suite/cpp_test_ds/CMakeLists.txt rename to test/cpp_test_suite/cpp_test_ds/CMakeLists.txt index 7cb3f7cd1..ea51fcdc0 100644 --- a/cpp_test_suite/cpp_test_ds/CMakeLists.txt +++ b/test/cpp_test_suite/cpp_test_ds/CMakeLists.txt @@ -20,4 +20,4 @@ add_subdirectory(fwd_ds) add_executable(DevTest ${SOURCES}) target_include_directories(DevTest PUBLIC .) -target_link_libraries(DevTest PUBLIC tango ${CMAKE_DL_LIBS}) +target_link_libraries(DevTest PUBLIC tango) diff --git a/cpp_test_suite/cpp_test_ds/DevTest.cpp b/test/cpp_test_suite/cpp_test_ds/DevTest.cpp similarity index 97% rename from cpp_test_suite/cpp_test_ds/DevTest.cpp rename to test/cpp_test_suite/cpp_test_ds/DevTest.cpp index 12f5e6958..0dd5661da 100644 --- a/cpp_test_suite/cpp_test_ds/DevTest.cpp +++ b/test/cpp_test_suite/cpp_test_ds/DevTest.cpp @@ -162,7 +162,7 @@ void DevTest::init_device() attr_slow = 3.3; #ifndef COMPAT - enc_attr.encoded_format = CORBA::string_dup("Which format?"); + enc_attr.encoded_format = Tango::string_dup("Which format?"); /* enc_attr.encoded_data.length(200 * 1024 * 1024); for (int i = 0;i < (200 * 1024 * 1024);i++) enc_attr.encoded_data[i] = (unsigned char)(i % 256);*/ @@ -405,10 +405,10 @@ void DevTest::IOFillPollBuffAttr() string att_name("Poll_buff"); Tango::DevString *array_1 = new Tango::DevString [4]; -// array_1[0] = CORBA::string_dup("One_1"); -// array_1[1] = CORBA::string_dup("Two_1"); -// array_1[2] = CORBA::string_dup("Three_1"); -// array_1[3] = CORBA::string_dup("Four_1"); +// array_1[0] = Tango::string_dup("One_1"); +// array_1[1] = Tango::string_dup("Two_1"); +// array_1[2] = Tango::string_dup("Three_1"); +// array_1[3] = Tango::string_dup("Four_1"); array_1[0] = Tango::string_dup("One_1"); array_1[1] = Tango::string_dup("Two_1"); array_1[2] = Tango::string_dup("Three_1"); @@ -416,17 +416,17 @@ void DevTest::IOFillPollBuffAttr() main_array[0] = array_1; Tango::DevString *array_2 = new Tango::DevString [4]; - array_2[0] = CORBA::string_dup("One_2"); - array_2[1] = CORBA::string_dup("Two_2"); - array_2[2] = CORBA::string_dup("Three_2"); - array_2[3] = CORBA::string_dup("Four_2"); + array_2[0] = Tango::string_dup("One_2"); + array_2[1] = Tango::string_dup("Two_2"); + array_2[2] = Tango::string_dup("Three_2"); + array_2[3] = Tango::string_dup("Four_2"); main_array[1] = array_2; Tango::DevString *array_3 = new Tango::DevString [4]; - array_3[0] = CORBA::string_dup("One_3"); - array_3[1] = CORBA::string_dup("Two_3"); - array_3[2] = CORBA::string_dup("Three_3"); - array_3[3] = CORBA::string_dup("Four_3"); + array_3[0] = Tango::string_dup("One_3"); + array_3[1] = Tango::string_dup("Two_3"); + array_3[2] = Tango::string_dup("Three_3"); + array_3[3] = Tango::string_dup("Four_3"); main_array[2] = array_3; ahs.clear(); @@ -446,13 +446,13 @@ void DevTest::IOFillPollBuffAttr() Tango::DevString *rd_array_1 = new Tango::DevString[4]; Tango::DevString *wr_array_1 = new Tango::DevString[2]; - rd_array_1[0] = CORBA::string_dup("One_rd_1"); - rd_array_1[1] = CORBA::string_dup("Two_rd_1"); - rd_array_1[2] = CORBA::string_dup("Three_rd_1"); - rd_array_1[3] = CORBA::string_dup("Four_rd_1"); + rd_array_1[0] = Tango::string_dup("One_rd_1"); + rd_array_1[1] = Tango::string_dup("Two_rd_1"); + rd_array_1[2] = Tango::string_dup("Three_rd_1"); + rd_array_1[3] = Tango::string_dup("Four_rd_1"); - wr_array_1[0] = CORBA::string_dup("One_wr_1"); - wr_array_1[1] = CORBA::string_dup("Two_wr_1"); + wr_array_1[0] = Tango::string_dup("One_wr_1"); + wr_array_1[1] = Tango::string_dup("Two_wr_1"); Tango::TimedAttrData tad_1(rd_array_1,2,2,wr_array_1,2,1,Tango::ATTR_VALID,true,when); ahs.push(tad_1); @@ -460,13 +460,13 @@ void DevTest::IOFillPollBuffAttr() Tango::DevString *rd_array_2 = new Tango::DevString[4]; Tango::DevString *wr_array_2 = new Tango::DevString[2]; - rd_array_2[0] = CORBA::string_dup("One_rd_2"); - rd_array_2[1] = CORBA::string_dup("Two_rd_2"); - rd_array_2[2] = CORBA::string_dup("Three_rd_2"); - rd_array_2[3] = CORBA::string_dup("Four_rd_2"); + rd_array_2[0] = Tango::string_dup("One_rd_2"); + rd_array_2[1] = Tango::string_dup("Two_rd_2"); + rd_array_2[2] = Tango::string_dup("Three_rd_2"); + rd_array_2[3] = Tango::string_dup("Four_rd_2"); - wr_array_2[0] = CORBA::string_dup("One_wr_2"); - wr_array_2[1] = CORBA::string_dup("Two_wr_2"); + wr_array_2[0] = Tango::string_dup("One_wr_2"); + wr_array_2[1] = Tango::string_dup("Two_wr_2"); Tango::TimedAttrData tad_2(rd_array_2,2,2,wr_array_2,2,1,Tango::ATTR_VALID,true,when); ahs.push(tad_2); @@ -474,13 +474,13 @@ void DevTest::IOFillPollBuffAttr() Tango::DevString *rd_array_3 = new Tango::DevString[4]; Tango::DevString *wr_array_3 = new Tango::DevString[2]; - rd_array_3[0] = CORBA::string_dup("One_rd_3"); - rd_array_3[1] = CORBA::string_dup("Two_rd_3"); - rd_array_3[2] = CORBA::string_dup("Three_rd_3"); - rd_array_3[3] = CORBA::string_dup("Four_rd_3"); + rd_array_3[0] = Tango::string_dup("One_rd_3"); + rd_array_3[1] = Tango::string_dup("Two_rd_3"); + rd_array_3[2] = Tango::string_dup("Three_rd_3"); + rd_array_3[3] = Tango::string_dup("Four_rd_3"); - wr_array_3[0] = CORBA::string_dup("One_wr_3"); - wr_array_3[1] = CORBA::string_dup("Two_wr_3"); + wr_array_3[0] = Tango::string_dup("One_wr_3"); + wr_array_3[1] = Tango::string_dup("Two_wr_3"); Tango::TimedAttrData tad_3(rd_array_3,2,2,wr_array_3,2,1,Tango::ATTR_VALID,true,when); ahs.push(tad_3); @@ -503,7 +503,7 @@ void DevTest::IOFillPollBuffEncodedAttr() Tango::DevEncoded the_enc1; Tango::DevEncoded the_enc2; - the_enc.encoded_format = CORBA::string_dup("First value"); + the_enc.encoded_format = Tango::string_dup("First value"); the_enc.encoded_data.length(2); the_enc.encoded_data[0] = 22; the_enc.encoded_data[1] = 33; @@ -512,7 +512,7 @@ void DevTest::IOFillPollBuffEncodedAttr() Tango::TimedAttrData tad(&the_enc,when); ahs.push(tad); - the_enc1.encoded_format = CORBA::string_dup("Second value"); + the_enc1.encoded_format = Tango::string_dup("Second value"); the_enc1.encoded_data.length(2); the_enc1.encoded_data[0] = 33; the_enc1.encoded_data[1] = 44; @@ -521,7 +521,7 @@ void DevTest::IOFillPollBuffEncodedAttr() Tango::TimedAttrData tad1(&the_enc1,when); ahs.push(tad1); - the_enc2.encoded_format = CORBA::string_dup("Third value"); + the_enc2.encoded_format = Tango::string_dup("Third value"); the_enc2.encoded_data.length(2); the_enc2.encoded_data[0] = 44; the_enc2.encoded_data[1] = 55; @@ -1296,7 +1296,7 @@ void DevTest::read_String_attr(Tango::Attribute &att) cout << "[DevTest::read_attr] attribute name String_attr" << endl; if (s == NULL) - s = CORBA::string_dup("test_string"); + s = Tango::string_dup("test_string"); att.set_value(&s); } @@ -1940,12 +1940,12 @@ void DevTest::read_Encoded_attr_rw(Tango::Attribute &att) /* if ((count % 2) == 0) { - enc_attr.encoded_format = CORBA::string_dup("First string"); + enc_attr.encoded_format = Tango::string_dup("First string"); enc_attr.encoded_data[0] = 11; } else { - enc_attr.encoded_format = CORBA::string_dup("Second string"); + enc_attr.encoded_format = Tango::string_dup("Second string"); enc_attr.encoded_data[0] = 22; }*/ @@ -1953,7 +1953,7 @@ void DevTest::read_Encoded_attr_rw(Tango::Attribute &att) // count++; /* enc_attr_ptr = new Tango::DevEncoded; - enc_attr_ptr->encoded_format = CORBA::string_dup("Which format?"); + enc_attr_ptr->encoded_format = Tango::string_dup("Which format?"); enc_attr_ptr->encoded_data.length(4); enc_attr_ptr->encoded_data[0] = (unsigned char)97; enc_attr_ptr->encoded_data[1] = (unsigned char)98; @@ -2566,9 +2566,9 @@ void DevTest::cmd_push_pipe_event(Tango::DevShort in) { Tango::DevErrorList del; del.length(1); - del[0].reason = CORBA::string_dup("aaa"); - del[0].desc = CORBA::string_dup("bbb"); - del[0].origin = CORBA::string_dup("ccc"); + del[0].reason = Tango::string_dup("aaa"); + del[0].desc = Tango::string_dup("bbb"); + del[0].origin = Tango::string_dup("ccc"); Tango::DevFailed df(del); this->push_pipe_event("RWPipe",&df); } diff --git a/cpp_test_suite/cpp_test_ds/DevTest.h b/test/cpp_test_suite/cpp_test_ds/DevTest.h similarity index 100% rename from cpp_test_suite/cpp_test_ds/DevTest.h rename to test/cpp_test_suite/cpp_test_ds/DevTest.h diff --git a/cpp_test_suite/cpp_test_ds/DevTestClass.cpp b/test/cpp_test_suite/cpp_test_ds/DevTestClass.cpp similarity index 100% rename from cpp_test_suite/cpp_test_ds/DevTestClass.cpp rename to test/cpp_test_suite/cpp_test_ds/DevTestClass.cpp diff --git a/cpp_test_suite/cpp_test_ds/DevTestClass.h b/test/cpp_test_suite/cpp_test_ds/DevTestClass.h similarity index 100% rename from cpp_test_suite/cpp_test_ds/DevTestClass.h rename to test/cpp_test_suite/cpp_test_ds/DevTestClass.h diff --git a/cpp_test_suite/cpp_test_ds/FileDb.cpp b/test/cpp_test_suite/cpp_test_ds/FileDb.cpp similarity index 100% rename from cpp_test_suite/cpp_test_ds/FileDb.cpp rename to test/cpp_test_suite/cpp_test_ds/FileDb.cpp diff --git a/cpp_test_suite/cpp_test_ds/IOAddAttribute.cpp b/test/cpp_test_suite/cpp_test_ds/IOAddAttribute.cpp similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOAddAttribute.cpp rename to test/cpp_test_suite/cpp_test_ds/IOAddAttribute.cpp diff --git a/cpp_test_suite/cpp_test_ds/IOAddAttribute.h b/test/cpp_test_suite/cpp_test_ds/IOAddAttribute.h similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOAddAttribute.h rename to test/cpp_test_suite/cpp_test_ds/IOAddAttribute.h diff --git a/cpp_test_suite/cpp_test_ds/IOArray1.cpp b/test/cpp_test_suite/cpp_test_ds/IOArray1.cpp similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOArray1.cpp rename to test/cpp_test_suite/cpp_test_ds/IOArray1.cpp diff --git a/cpp_test_suite/cpp_test_ds/IOArray1.h b/test/cpp_test_suite/cpp_test_ds/IOArray1.h similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOArray1.h rename to test/cpp_test_suite/cpp_test_ds/IOArray1.h diff --git a/cpp_test_suite/cpp_test_ds/IOArray2.cpp b/test/cpp_test_suite/cpp_test_ds/IOArray2.cpp similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOArray2.cpp rename to test/cpp_test_suite/cpp_test_ds/IOArray2.cpp diff --git a/cpp_test_suite/cpp_test_ds/IOArray2.h b/test/cpp_test_suite/cpp_test_ds/IOArray2.h similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOArray2.h rename to test/cpp_test_suite/cpp_test_ds/IOArray2.h diff --git a/cpp_test_suite/cpp_test_ds/IOMisc.cpp b/test/cpp_test_suite/cpp_test_ds/IOMisc.cpp similarity index 99% rename from cpp_test_suite/cpp_test_ds/IOMisc.cpp rename to test/cpp_test_suite/cpp_test_ds/IOMisc.cpp index 545be324c..df83b4118 100644 --- a/cpp_test_suite/cpp_test_ds/IOMisc.cpp +++ b/test/cpp_test_suite/cpp_test_ds/IOMisc.cpp @@ -1397,12 +1397,12 @@ CORBA::Any *ChangeEncodedFormat::execute(Tango::DeviceImpl *device, const CORBA: #ifndef COMPAT if (togle == false) { - (static_cast(device))->enc_attr.encoded_format = CORBA::string_dup("This format"); + (static_cast(device))->enc_attr.encoded_format = Tango::string_dup("This format"); togle = true; } else { - (static_cast(device))->enc_attr.encoded_format = CORBA::string_dup("Another format"); + (static_cast(device))->enc_attr.encoded_format = Tango::string_dup("Another format"); togle = false; } #endif diff --git a/cpp_test_suite/cpp_test_ds/IOMisc.h b/test/cpp_test_suite/cpp_test_ds/IOMisc.h similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOMisc.h rename to test/cpp_test_suite/cpp_test_ds/IOMisc.h diff --git a/cpp_test_suite/cpp_test_ds/IOSeqVec.cpp b/test/cpp_test_suite/cpp_test_ds/IOSeqVec.cpp similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOSeqVec.cpp rename to test/cpp_test_suite/cpp_test_ds/IOSeqVec.cpp diff --git a/cpp_test_suite/cpp_test_ds/IOSeqVec.h b/test/cpp_test_suite/cpp_test_ds/IOSeqVec.h similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOSeqVec.h rename to test/cpp_test_suite/cpp_test_ds/IOSeqVec.h diff --git a/cpp_test_suite/cpp_test_ds/IOSetAttr.cpp b/test/cpp_test_suite/cpp_test_ds/IOSetAttr.cpp similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOSetAttr.cpp rename to test/cpp_test_suite/cpp_test_ds/IOSetAttr.cpp diff --git a/cpp_test_suite/cpp_test_ds/IOSetAttr.h b/test/cpp_test_suite/cpp_test_ds/IOSetAttr.h similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOSetAttr.h rename to test/cpp_test_suite/cpp_test_ds/IOSetAttr.h diff --git a/cpp_test_suite/cpp_test_ds/IOStr1.cpp b/test/cpp_test_suite/cpp_test_ds/IOStr1.cpp similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOStr1.cpp rename to test/cpp_test_suite/cpp_test_ds/IOStr1.cpp diff --git a/cpp_test_suite/cpp_test_ds/IOStr1.h b/test/cpp_test_suite/cpp_test_ds/IOStr1.h similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOStr1.h rename to test/cpp_test_suite/cpp_test_ds/IOStr1.h diff --git a/cpp_test_suite/cpp_test_ds/IOStr2.cpp b/test/cpp_test_suite/cpp_test_ds/IOStr2.cpp similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOStr2.cpp rename to test/cpp_test_suite/cpp_test_ds/IOStr2.cpp diff --git a/cpp_test_suite/cpp_test_ds/IOStr2.h b/test/cpp_test_suite/cpp_test_ds/IOStr2.h similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOStr2.h rename to test/cpp_test_suite/cpp_test_ds/IOStr2.h diff --git a/cpp_test_suite/cpp_test_ds/IOStrArray.cpp b/test/cpp_test_suite/cpp_test_ds/IOStrArray.cpp similarity index 94% rename from cpp_test_suite/cpp_test_ds/IOStrArray.cpp rename to test/cpp_test_suite/cpp_test_ds/IOStrArray.cpp index 419de7414..3a13e934e 100644 --- a/cpp_test_suite/cpp_test_ds/IOStrArray.cpp +++ b/test/cpp_test_suite/cpp_test_ds/IOStrArray.cpp @@ -71,8 +71,8 @@ CORBA::Any *IOStrArray::execute(Tango::DeviceImpl *device,const CORBA::Any &in_a Tango::DevVarStringArray *argout = new Tango::DevVarStringArray(); argout->length(2); - (*argout)[0] = CORBA::string_dup("First string from dev_string_array"); - (*argout)[1] = CORBA::string_dup("Second string from dev_string_array"); + (*argout)[0] = Tango::string_dup("First string from dev_string_array"); + (*argout)[1] = Tango::string_dup("Second string from dev_string_array"); return insert(argout); } diff --git a/cpp_test_suite/cpp_test_ds/IOStrArray.h b/test/cpp_test_suite/cpp_test_ds/IOStrArray.h similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOStrArray.h rename to test/cpp_test_suite/cpp_test_ds/IOStrArray.h diff --git a/cpp_test_suite/cpp_test_ds/IOStruct.cpp b/test/cpp_test_suite/cpp_test_ds/IOStruct.cpp similarity index 94% rename from cpp_test_suite/cpp_test_ds/IOStruct.cpp rename to test/cpp_test_suite/cpp_test_ds/IOStruct.cpp index 235510a59..8932471e9 100644 --- a/cpp_test_suite/cpp_test_ds/IOStruct.cpp +++ b/test/cpp_test_suite/cpp_test_ds/IOStruct.cpp @@ -77,8 +77,8 @@ CORBA::Any *IOStruct::execute(Tango::DeviceImpl *device,const CORBA::Any &in_any argout->lvalue[1] = 2000; argout->svalue.length(2); - argout->svalue[0] = CORBA::string_dup("First string from dev_struct"); - argout->svalue[1] = CORBA::string_dup("Second string from dev_struct"); + argout->svalue[0] = Tango::string_dup("First string from dev_struct"); + argout->svalue[1] = Tango::string_dup("Second string from dev_struct"); return insert(argout); } diff --git a/cpp_test_suite/cpp_test_ds/IOStruct.h b/test/cpp_test_suite/cpp_test_ds/IOStruct.h similarity index 100% rename from cpp_test_suite/cpp_test_ds/IOStruct.h rename to test/cpp_test_suite/cpp_test_ds/IOStruct.h diff --git a/cpp_test_suite/cpp_test_ds/SigThrow.cpp b/test/cpp_test_suite/cpp_test_ds/SigThrow.cpp similarity index 100% rename from cpp_test_suite/cpp_test_ds/SigThrow.cpp rename to test/cpp_test_suite/cpp_test_ds/SigThrow.cpp diff --git a/cpp_test_suite/cpp_test_ds/SigThrow.h b/test/cpp_test_suite/cpp_test_ds/SigThrow.h similarity index 100% rename from cpp_test_suite/cpp_test_ds/SigThrow.h rename to test/cpp_test_suite/cpp_test_ds/SigThrow.h diff --git a/cpp_test_suite/cpp_test_ds/TypeCmds.cpp b/test/cpp_test_suite/cpp_test_ds/TypeCmds.cpp similarity index 99% rename from cpp_test_suite/cpp_test_ds/TypeCmds.cpp rename to test/cpp_test_suite/cpp_test_ds/TypeCmds.cpp index 6a3f284c3..6f73013a7 100644 --- a/cpp_test_suite/cpp_test_ds/TypeCmds.cpp +++ b/test/cpp_test_suite/cpp_test_ds/TypeCmds.cpp @@ -1138,7 +1138,7 @@ CORBA::Any *IOLongString::execute(Tango::DeviceImpl *device,const CORBA::Any &in ((*theReturned).svalue).length(((*theReceived).svalue).length()); for (i=0; i<((*theReceived).svalue).length(); i++) { cout << "[IOLongString::execute] received string " << (*theReceived).svalue[i].in() << endl; - (*theReturned).svalue[i] = CORBA::string_dup((*theReceived).svalue[i]); + (*theReturned).svalue[i] = Tango::string_dup((*theReceived).svalue[i]); cout << "[IOLongString::execute] return string " << (*theReturned).svalue[i].in() << endl; } return insert(theReturned); @@ -1549,7 +1549,7 @@ CORBA::Any *IOEncoded::execute(Tango::DeviceImpl *device,const CORBA::Any &in_an theReturned_enc->encoded_data[i] = the_enc->encoded_data[i] * 2; cout << "[IOEncoded::execute] returned number " << (int)theReturned_enc->encoded_data[i] << endl; } - theReturned_enc->encoded_format = CORBA::string_dup("Returned string"); + theReturned_enc->encoded_format = Tango::string_dup("Returned string"); return insert(theReturned_enc); } catch (CORBA::Exception &e) @@ -1605,14 +1605,14 @@ CORBA::Any *OEncoded::execute(Tango::DeviceImpl *device,const CORBA::Any &in_any encoded_cmd_ctr++; if ((encoded_cmd_ctr % 2) == 0) { - theReturned->encoded_format = CORBA::string_dup("Odd - OEncoded format"); + theReturned->encoded_format = Tango::string_dup("Odd - OEncoded format"); theReturned->encoded_data.length(2); theReturned->encoded_data[0] = 11; theReturned->encoded_data[1] = 21; } else { - theReturned->encoded_format = CORBA::string_dup("Even - OEncoded format"); + theReturned->encoded_format = Tango::string_dup("Even - OEncoded format"); theReturned->encoded_data.length(4); theReturned->encoded_data[0] = 10; theReturned->encoded_data[1] = 20; diff --git a/cpp_test_suite/cpp_test_ds/TypeCmds.h b/test/cpp_test_suite/cpp_test_ds/TypeCmds.h similarity index 100% rename from cpp_test_suite/cpp_test_ds/TypeCmds.h rename to test/cpp_test_suite/cpp_test_ds/TypeCmds.h diff --git a/cpp_test_suite/cpp_test_ds/build_scr b/test/cpp_test_suite/cpp_test_ds/build_scr similarity index 100% rename from cpp_test_suite/cpp_test_ds/build_scr rename to test/cpp_test_suite/cpp_test_ds/build_scr diff --git a/cpp_test_suite/cpp_test_ds/classfactory.cpp b/test/cpp_test_suite/cpp_test_ds/classfactory.cpp similarity index 95% rename from cpp_test_suite/cpp_test_ds/classfactory.cpp rename to test/cpp_test_suite/cpp_test_ds/classfactory.cpp index 3a3750559..52e717225 100644 --- a/cpp_test_suite/cpp_test_ds/classfactory.cpp +++ b/test/cpp_test_suite/cpp_test_ds/classfactory.cpp @@ -1,4 +1,3 @@ -static const char *RcsId = "$Header$"; //+============================================================================= // // file : ClassFactory.cpp diff --git a/cpp_test_suite/cpp_test_ds/fwd_ds/CMakeLists.txt b/test/cpp_test_suite/cpp_test_ds/fwd_ds/CMakeLists.txt similarity index 77% rename from cpp_test_suite/cpp_test_ds/fwd_ds/CMakeLists.txt rename to test/cpp_test_suite/cpp_test_ds/fwd_ds/CMakeLists.txt index c95e4ec16..d9548b118 100644 --- a/cpp_test_suite/cpp_test_ds/fwd_ds/CMakeLists.txt +++ b/test/cpp_test_suite/cpp_test_ds/fwd_ds/CMakeLists.txt @@ -6,4 +6,4 @@ set(SOURCES ClassFactory.cpp add_executable(FwdTest ${SOURCES}) target_include_directories(FwdTest PUBLIC .) -target_link_libraries(FwdTest PUBLIC tango ${CMAKE_DL_LIBS}) +target_link_libraries(FwdTest PUBLIC tango) diff --git a/cpp_test_suite/cpp_test_ds/fwd_ds/ClassFactory.cpp b/test/cpp_test_suite/cpp_test_ds/fwd_ds/ClassFactory.cpp similarity index 98% rename from cpp_test_suite/cpp_test_ds/fwd_ds/ClassFactory.cpp rename to test/cpp_test_suite/cpp_test_ds/fwd_ds/ClassFactory.cpp index b6db6f376..57cd570bc 100644 --- a/cpp_test_suite/cpp_test_ds/fwd_ds/ClassFactory.cpp +++ b/test/cpp_test_suite/cpp_test_ds/fwd_ds/ClassFactory.cpp @@ -1,5 +1,4 @@ /*----- PROTECTED REGION ID(FwdTest::ClassFactory.cpp) ENABLED START -----*/ -static const char *RcsId = "$Id$"; //============================================================================= // // file : ClassFactory.cpp diff --git a/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTest.cpp b/test/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTest.cpp similarity index 99% rename from cpp_test_suite/cpp_test_ds/fwd_ds/FwdTest.cpp rename to test/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTest.cpp index 3bb694ce5..f8b1a4e78 100644 --- a/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTest.cpp +++ b/test/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTest.cpp @@ -1,5 +1,4 @@ /*----- PROTECTED REGION ID(FwdTest.cpp) ENABLED START -----*/ -static const char *RcsId = "$Id$"; //============================================================================= // // file : FwdTest.cpp diff --git a/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTest.h b/test/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTest.h similarity index 100% rename from cpp_test_suite/cpp_test_ds/fwd_ds/FwdTest.h rename to test/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTest.h diff --git a/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTest.xmi b/test/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTest.xmi similarity index 100% rename from cpp_test_suite/cpp_test_ds/fwd_ds/FwdTest.xmi rename to test/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTest.xmi diff --git a/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTestClass.cpp b/test/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTestClass.cpp similarity index 99% rename from cpp_test_suite/cpp_test_ds/fwd_ds/FwdTestClass.cpp rename to test/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTestClass.cpp index f04ca2eb2..d3eec38ce 100644 --- a/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTestClass.cpp +++ b/test/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTestClass.cpp @@ -1,5 +1,4 @@ /*----- PROTECTED REGION ID(FwdTestClass.cpp) ENABLED START -----*/ -static const char *RcsId = "$Id$"; static const char *TagName = "$Name: $"; static const char *CvsPath = "$Source: $"; static const char *SvnPath = "$HeadURL$"; diff --git a/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTestClass.h b/test/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTestClass.h similarity index 100% rename from cpp_test_suite/cpp_test_ds/fwd_ds/FwdTestClass.h rename to test/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTestClass.h diff --git a/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTestStateMachine.cpp b/test/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTestStateMachine.cpp similarity index 98% rename from cpp_test_suite/cpp_test_ds/fwd_ds/FwdTestStateMachine.cpp rename to test/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTestStateMachine.cpp index 021dcc46c..b59ed06b1 100644 --- a/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTestStateMachine.cpp +++ b/test/cpp_test_suite/cpp_test_ds/fwd_ds/FwdTestStateMachine.cpp @@ -1,5 +1,4 @@ /*----- PROTECTED REGION ID(FwdTestStateMachine.cpp) ENABLED START -----*/ -static const char *RcsId = "$Id$"; //============================================================================= // // file : FwdTestStateMachine.cpp diff --git a/cpp_test_suite/cpp_test_ds/fwd_ds/main.cpp b/test/cpp_test_suite/cpp_test_ds/fwd_ds/main.cpp similarity index 98% rename from cpp_test_suite/cpp_test_ds/fwd_ds/main.cpp rename to test/cpp_test_suite/cpp_test_ds/fwd_ds/main.cpp index 7c5df6ef5..c6a2a855e 100644 --- a/cpp_test_suite/cpp_test_ds/fwd_ds/main.cpp +++ b/test/cpp_test_suite/cpp_test_ds/fwd_ds/main.cpp @@ -1,5 +1,4 @@ /*----- PROTECTED REGION ID(FwdTest::main.cpp) ENABLED START -----*/ -static const char *RcsId = "$Id$"; //============================================================================= // // file : main.cpp diff --git a/cpp_test_suite/cpp_test_ds/main.cpp b/test/cpp_test_suite/cpp_test_ds/main.cpp similarity index 93% rename from cpp_test_suite/cpp_test_ds/main.cpp rename to test/cpp_test_suite/cpp_test_ds/main.cpp index cbf61fc5e..3d6790c3f 100644 --- a/cpp_test_suite/cpp_test_ds/main.cpp +++ b/test/cpp_test_suite/cpp_test_ds/main.cpp @@ -1,4 +1,3 @@ -static const char *RcsId = "$Header$"; //+============================================================================= // // file : main.cpp @@ -23,8 +22,8 @@ static const char *RcsId = "$Header$"; //-============================================================================= #include -#include -#include +#include +#include int main(int argc,char *argv[]) diff --git a/cpp_test_suite/cpp_test_ds/main_win.cpp b/test/cpp_test_suite/cpp_test_ds/main_win.cpp similarity index 97% rename from cpp_test_suite/cpp_test_ds/main_win.cpp rename to test/cpp_test_suite/cpp_test_ds/main_win.cpp index 4df06aeee..209a09214 100644 --- a/cpp_test_suite/cpp_test_ds/main_win.cpp +++ b/test/cpp_test_suite/cpp_test_ds/main_win.cpp @@ -1,4 +1,3 @@ -static const char *RcsId = "$Header$"; //+============================================================================= // // file : main.cpp diff --git a/cpp_test_suite/cpp_test_ds/serv.res b/test/cpp_test_suite/cpp_test_ds/serv.res similarity index 100% rename from cpp_test_suite/cpp_test_ds/serv.res rename to test/cpp_test_suite/cpp_test_ds/serv.res diff --git a/test/cpp_test_suite/cxxtest/CMakeLists.txt b/test/cpp_test_suite/cxxtest/CMakeLists.txt new file mode 100644 index 000000000..aaf4d9c2e --- /dev/null +++ b/test/cpp_test_suite/cxxtest/CMakeLists.txt @@ -0,0 +1,97 @@ +find_package (Threads REQUIRED) + +macro(CXX_GENERATE_TEST name) + message("Generate ${name}.cpp") + execute_process(COMMAND python cxxtestgen.py --template=${CMAKE_CURRENT_SOURCE_DIR}/template/tango_template.tpl + -o ${CMAKE_CURRENT_SOURCE_DIR}/${name}.cpp + ../../new_tests/${name}.cpp + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin + RESULT_VARIABLE FAILED) + + if(${FAILED}) + message(SEND_ERROR " Failed to generate ${name}.cpp. rv=${FAILED}") + endif() + + add_executable(${name} $ ${name}.cpp) + target_include_directories(${name} PRIVATE include ${CMAKE_CURRENT_BINARY_DIR}/include) + target_link_libraries(${name} PRIVATE tango ${CMAKE_THREAD_LIBS_INIT}) + target_compile_definitions(${name} PRIVATE "-DVALGRIND -D_PTHREADS -D_REENTRANT") + + add_test(NAME "CXX::${name}" COMMAND $ + --device1=${DEV1} + --device2=${DEV2} + --device3=${DEV3} + --device20=${DEV20} + --fwd_device=${FWD_DEV} + --loop=1 + --fulldsname=${SERV_NAME}/${INST_NAME} + --serverhost=${HOST_NAME} + --clienthost=${HOST_NAME} + --serverversion=5 + --docurl=http://www.tango-controls.org + --devtype=TestDevice + --dbserver=sys/database/2 + --outpath=/tmp/ + --refpath=${CMAKE_CURRENT_SOURCE_DIR}/../new_tests/out/ + --loglevel=0 + --dsloglevel=5 + --suiteloop=1 + --devicealias=${DEV1_ALIAS} + --attributealias=${ATTR_ALIAS} + --verbose=true) +endmacro() + +CXX_GENERATE_TEST(cxx_syntax) +CXX_GENERATE_TEST(cxx_poll) +CXX_GENERATE_TEST(cxx_poll_admin) +CXX_GENERATE_TEST(cxx_dserver_cmd) +CXX_GENERATE_TEST(cxx_dserver_misc) +CXX_GENERATE_TEST(cxx_always_hook) +CXX_GENERATE_TEST(cxx_blackbox) +CXX_GENERATE_TEST(cxx_class_dev_signal) +CXX_GENERATE_TEST(cxx_class_signal) +CXX_GENERATE_TEST(cxx_attr_misc) +CXX_GENERATE_TEST(cxx_attrprop) +CXX_GENERATE_TEST(cxx_attr_write) +CXX_GENERATE_TEST(cxx_attr_conf) +CXX_GENERATE_TEST(cxx_attr) +CXX_GENERATE_TEST(cxx_misc_util) +CXX_GENERATE_TEST(cxx_templ_cmd) +CXX_GENERATE_TEST(cxx_exception) +CXX_GENERATE_TEST(cxx_cmd_query) +CXX_GENERATE_TEST(cxx_seq_vec) +CXX_GENERATE_TEST(cxx_signal)#TODO Windows +CXX_GENERATE_TEST(cxx_test_state_on) +CXX_GENERATE_TEST(cxx_misc) +CXX_GENERATE_TEST(cxx_cmd_types) +CXX_GENERATE_TEST(cxx_group) +CXX_GENERATE_TEST(cxx_encoded) +CXX_GENERATE_TEST(cxx_database) +CXX_GENERATE_TEST(cxx_mem_attr) +CXX_GENERATE_TEST(cxx_enum_att) +CXX_GENERATE_TEST(cxx_write_attr_hard) +CXX_GENERATE_TEST(cxx_fwd_att) +CXX_GENERATE_TEST(cxx_pipe_conf) +CXX_GENERATE_TEST(cxx_pipe) +CXX_GENERATE_TEST(cxx_z00_dyn_cmd) +CXX_GENERATE_TEST(cxx_old_poll) +CXX_GENERATE_TEST(cxx_server_event) +CXX_GENERATE_TEST(cxx_reconnection_zmq) +CXX_GENERATE_TEST(cxx_stateless_subscription) + + +#utilities +configure_file(bin/start_server.sh.cmake ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/start_server.sh @ONLY) +configure_file(bin/kill_server.sh.cmake ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/kill_server.sh @ONLY) + +# now copy the temporary into the final destination, setting the permissions +file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/start_server.sh + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin + FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ + GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) +file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/kill_server.sh + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin + FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ + GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + +configure_file(include/config.h.cmake include/config.h @ONLY) diff --git a/cpp_test_suite/cxxtest/README.txt b/test/cpp_test_suite/cxxtest/README.txt similarity index 100% rename from cpp_test_suite/cxxtest/README.txt rename to test/cpp_test_suite/cxxtest/README.txt diff --git a/cpp_test_suite/cxxtest/bin/cxxtestgen.pl b/test/cpp_test_suite/cxxtest/bin/cxxtestgen.pl old mode 100755 new mode 100644 similarity index 100% rename from cpp_test_suite/cxxtest/bin/cxxtestgen.pl rename to test/cpp_test_suite/cxxtest/bin/cxxtestgen.pl diff --git a/cpp_test_suite/cxxtest/bin/cxxtestgen.py b/test/cpp_test_suite/cxxtest/bin/cxxtestgen.py old mode 100755 new mode 100644 similarity index 100% rename from cpp_test_suite/cxxtest/bin/cxxtestgen.py rename to test/cpp_test_suite/cxxtest/bin/cxxtestgen.py diff --git a/test/cpp_test_suite/cxxtest/bin/kill_server.sh.cmake b/test/cpp_test_suite/cxxtest/bin/kill_server.sh.cmake new file mode 100644 index 000000000..84ab8a367 --- /dev/null +++ b/test/cpp_test_suite/cxxtest/bin/kill_server.sh.cmake @@ -0,0 +1,15 @@ +#!/bin/bash + +kill_servers(){ + PIDS=`ps -e | grep DevTest | grep -v grep | awk '{print $1}'` + echo "PIDS = $PIDS" + for pid in $PIDS + do + echo "Killing process with PID $pid" + kill $pid + done + + sleep 2 +} + +kill_servers \ No newline at end of file diff --git a/test/cpp_test_suite/cxxtest/bin/start_server.sh.cmake b/test/cpp_test_suite/cxxtest/bin/start_server.sh.cmake new file mode 100644 index 000000000..da026e55b --- /dev/null +++ b/test/cpp_test_suite/cxxtest/bin/start_server.sh.cmake @@ -0,0 +1,12 @@ +#!/bin/bash + +start_server(){ + echo "Starting DevTest $1" + @PROJECT_BINARY_DIR@/cpp_test_ds/DevTest $1 -v5 1>@PROJECT_BINARY_DIR@/cpp_test_ds/DevTest_$1.out 2>&1 & + echo $! > @PROJECT_BINARY_DIR@/cpp_test_ds/DevTest_$1.pid + + sleep 7 + echo "Done. PID="`cat @PROJECT_BINARY_DIR@/cpp_test_ds/DevTest_$1.pid` +} + +start_server $1 \ No newline at end of file diff --git a/test/cpp_test_suite/cxxtest/include/config.h.cmake b/test/cpp_test_suite/cxxtest/include/config.h.cmake new file mode 100644 index 000000000..e01262334 --- /dev/null +++ b/test/cpp_test_suite/cxxtest/include/config.h.cmake @@ -0,0 +1,12 @@ +#ifndef Config_h +#define Config_h + +#include + +namespace Tango { + const std::string kProjectBinaryDir{"@PROJECT_BINARY_DIR@"}; + const std::string kStartServerCmd{"@CMAKE_CURRENT_BINARY_DIR@/bin/start_server.sh "}; + const std::string kKillServerCmd{"@CMAKE_CURRENT_BINARY_DIR@/bin/kill_server.sh"}; +} + +#endif \ No newline at end of file diff --git a/cpp_test_suite/cxxtest/include/cxxtest/Descriptions.cpp b/test/cpp_test_suite/cxxtest/include/cxxtest/Descriptions.cpp similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/Descriptions.cpp rename to test/cpp_test_suite/cxxtest/include/cxxtest/Descriptions.cpp diff --git a/cpp_test_suite/cxxtest/include/cxxtest/Descriptions.h b/test/cpp_test_suite/cxxtest/include/cxxtest/Descriptions.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/Descriptions.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/Descriptions.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/DummyDescriptions.cpp b/test/cpp_test_suite/cxxtest/include/cxxtest/DummyDescriptions.cpp similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/DummyDescriptions.cpp rename to test/cpp_test_suite/cxxtest/include/cxxtest/DummyDescriptions.cpp diff --git a/cpp_test_suite/cxxtest/include/cxxtest/DummyDescriptions.h b/test/cpp_test_suite/cxxtest/include/cxxtest/DummyDescriptions.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/DummyDescriptions.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/DummyDescriptions.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/ErrorFormatter.h b/test/cpp_test_suite/cxxtest/include/cxxtest/ErrorFormatter.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/ErrorFormatter.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/ErrorFormatter.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/ErrorPrinter.h b/test/cpp_test_suite/cxxtest/include/cxxtest/ErrorPrinter.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/ErrorPrinter.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/ErrorPrinter.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/Flags.h b/test/cpp_test_suite/cxxtest/include/cxxtest/Flags.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/Flags.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/Flags.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/GlobalFixture.cpp b/test/cpp_test_suite/cxxtest/include/cxxtest/GlobalFixture.cpp similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/GlobalFixture.cpp rename to test/cpp_test_suite/cxxtest/include/cxxtest/GlobalFixture.cpp diff --git a/cpp_test_suite/cxxtest/include/cxxtest/GlobalFixture.h b/test/cpp_test_suite/cxxtest/include/cxxtest/GlobalFixture.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/GlobalFixture.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/GlobalFixture.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/Gui.h b/test/cpp_test_suite/cxxtest/include/cxxtest/Gui.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/Gui.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/Gui.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/LinkedList.cpp b/test/cpp_test_suite/cxxtest/include/cxxtest/LinkedList.cpp similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/LinkedList.cpp rename to test/cpp_test_suite/cxxtest/include/cxxtest/LinkedList.cpp diff --git a/cpp_test_suite/cxxtest/include/cxxtest/LinkedList.h b/test/cpp_test_suite/cxxtest/include/cxxtest/LinkedList.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/LinkedList.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/LinkedList.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/Mock.h b/test/cpp_test_suite/cxxtest/include/cxxtest/Mock.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/Mock.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/Mock.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/ParenPrinter.h b/test/cpp_test_suite/cxxtest/include/cxxtest/ParenPrinter.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/ParenPrinter.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/ParenPrinter.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/QtGui.h b/test/cpp_test_suite/cxxtest/include/cxxtest/QtGui.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/QtGui.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/QtGui.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/RealDescriptions.cpp b/test/cpp_test_suite/cxxtest/include/cxxtest/RealDescriptions.cpp similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/RealDescriptions.cpp rename to test/cpp_test_suite/cxxtest/include/cxxtest/RealDescriptions.cpp diff --git a/cpp_test_suite/cxxtest/include/cxxtest/RealDescriptions.h b/test/cpp_test_suite/cxxtest/include/cxxtest/RealDescriptions.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/RealDescriptions.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/RealDescriptions.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/Root.cpp b/test/cpp_test_suite/cxxtest/include/cxxtest/Root.cpp similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/Root.cpp rename to test/cpp_test_suite/cxxtest/include/cxxtest/Root.cpp diff --git a/cpp_test_suite/cxxtest/include/cxxtest/SelfTest.h b/test/cpp_test_suite/cxxtest/include/cxxtest/SelfTest.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/SelfTest.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/SelfTest.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/StdHeaders.h b/test/cpp_test_suite/cxxtest/include/cxxtest/StdHeaders.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/StdHeaders.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/StdHeaders.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/StdValueTraits.h b/test/cpp_test_suite/cxxtest/include/cxxtest/StdValueTraits.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/StdValueTraits.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/StdValueTraits.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/StdioFilePrinter.h b/test/cpp_test_suite/cxxtest/include/cxxtest/StdioFilePrinter.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/StdioFilePrinter.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/StdioFilePrinter.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/StdioPrinter.h b/test/cpp_test_suite/cxxtest/include/cxxtest/StdioPrinter.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/StdioPrinter.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/StdioPrinter.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/TangoPrinter.h b/test/cpp_test_suite/cxxtest/include/cxxtest/TangoPrinter.h similarity index 98% rename from cpp_test_suite/cxxtest/include/cxxtest/TangoPrinter.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/TangoPrinter.h index 7fc7645cd..9f650fcdf 100644 --- a/cpp_test_suite/cxxtest/include/cxxtest/TangoPrinter.h +++ b/test/cpp_test_suite/cxxtest/include/cxxtest/TangoPrinter.h @@ -27,6 +27,8 @@ #include #include #include +#include +#include // Tango exceptions handling //#undef _TS_CATCH_ABORT @@ -130,7 +132,6 @@ namespace CxxTest * in case a test case fails before restoring these settings by itself */ static set restore_points; - public: TangoPrinter( CXXTEST_STD(ostream) &o = CXXTEST_STD(cout), const char *preLine = ":", const char *postLine = "" ) : ErrorFormatter( new Adapter(o), preLine, postLine ) {} @@ -748,6 +749,7 @@ namespace CxxTest params_tmp["device1"] = param_desc("--device1=", "device1 name, e.g. test/device/1"); params_tmp["device2"] = param_desc("--device2=", "device2 name, e.g. test/device/2"); params_tmp["device3"] = param_desc("--device3=", "device3 name, e.g. test/device/3"); + params_tmp["device20"] = param_desc("--device20=", "device20 name, e.g. test2/debian8/20"); params_tmp["fulldsname"] = param_desc("--fulldsname=", "full device server name, e.g. devTest/myserver"); params_tmp["clienthost"] = param_desc("--clienthost=", "client host's fully qualified domain name, e.g. mypc.myinstitute.com (small caps)"); params_tmp["serverhost"] = param_desc("--serverhost=", "fully qualified domain name of the host on which the server is running, e.g. myserver.myinstitute.com (small caps)"); @@ -764,6 +766,16 @@ namespace CxxTest return params_tmp; } + static void start_server(const std::string& instance){ + std::string command = Tango::kStartServerCmd; + command += instance; + system(command.c_str()); + } + + static void kill_server() { + system(Tango::kKillServerCmd.c_str()); + } + private: class Adapter : public OutputStream { diff --git a/cpp_test_suite/cxxtest/include/cxxtest/TeeListener.h b/test/cpp_test_suite/cxxtest/include/cxxtest/TeeListener.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/TeeListener.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/TeeListener.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/TestListener.h b/test/cpp_test_suite/cxxtest/include/cxxtest/TestListener.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/TestListener.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/TestListener.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/TestRunner.h b/test/cpp_test_suite/cxxtest/include/cxxtest/TestRunner.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/TestRunner.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/TestRunner.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/TestSuite.cpp b/test/cpp_test_suite/cxxtest/include/cxxtest/TestSuite.cpp similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/TestSuite.cpp rename to test/cpp_test_suite/cxxtest/include/cxxtest/TestSuite.cpp diff --git a/cpp_test_suite/cxxtest/include/cxxtest/TestSuite.h b/test/cpp_test_suite/cxxtest/include/cxxtest/TestSuite.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/TestSuite.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/TestSuite.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/TestTracker.cpp b/test/cpp_test_suite/cxxtest/include/cxxtest/TestTracker.cpp similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/TestTracker.cpp rename to test/cpp_test_suite/cxxtest/include/cxxtest/TestTracker.cpp diff --git a/cpp_test_suite/cxxtest/include/cxxtest/TestTracker.h b/test/cpp_test_suite/cxxtest/include/cxxtest/TestTracker.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/TestTracker.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/TestTracker.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/ValueTraits.cpp b/test/cpp_test_suite/cxxtest/include/cxxtest/ValueTraits.cpp similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/ValueTraits.cpp rename to test/cpp_test_suite/cxxtest/include/cxxtest/ValueTraits.cpp diff --git a/cpp_test_suite/cxxtest/include/cxxtest/ValueTraits.h b/test/cpp_test_suite/cxxtest/include/cxxtest/ValueTraits.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/ValueTraits.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/ValueTraits.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/Win32Gui.h b/test/cpp_test_suite/cxxtest/include/cxxtest/Win32Gui.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/Win32Gui.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/Win32Gui.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/X11Gui.h b/test/cpp_test_suite/cxxtest/include/cxxtest/X11Gui.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/X11Gui.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/X11Gui.h diff --git a/cpp_test_suite/cxxtest/include/cxxtest/YesNoRunner.h b/test/cpp_test_suite/cxxtest/include/cxxtest/YesNoRunner.h similarity index 100% rename from cpp_test_suite/cxxtest/include/cxxtest/YesNoRunner.h rename to test/cpp_test_suite/cxxtest/include/cxxtest/YesNoRunner.h diff --git a/cpp_test_suite/cxxtest/template/tango_template.tpl b/test/cpp_test_suite/cxxtest/template/tango_template.tpl similarity index 100% rename from cpp_test_suite/cxxtest/template/tango_template.tpl rename to test/cpp_test_suite/cxxtest/template/tango_template.tpl diff --git a/cpp_test_suite/environment/CMakeLists.txt b/test/cpp_test_suite/environment/CMakeLists.txt similarity index 85% rename from cpp_test_suite/environment/CMakeLists.txt rename to test/cpp_test_suite/environment/CMakeLists.txt index 242455373..4ccab1f55 100644 --- a/cpp_test_suite/environment/CMakeLists.txt +++ b/test/cpp_test_suite/environment/CMakeLists.txt @@ -6,7 +6,7 @@ execute_process(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/pre_test.sh) configure_file(post_test.sh.cmake post_test.sh @ONLY) execute_process(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/post_test.sh) -execute_process(COMMAND chmod +x setup.sh) +execute_process(COMMAND chmod +x ${CMAKE_CURRENT_SOURCE_DIR}/setup.sh) add_custom_target(start-tango ${CMAKE_CURRENT_SOURCE_DIR}/setup.sh WORKING_DIRECTORY ${PROJECT_BINARY_DIR} SOURCES setup.sh) @@ -17,7 +17,7 @@ add_custom_target(run-tests ${CMAKE_CURRENT_BINARY_DIR}/run.sh WORKING_DIRECTORY ${PROJECT_BINARY_DIR} SOURCES run.sh.cmake) -execute_process(COMMAND chmod +x shutdown.sh) +execute_process(COMMAND chmod +x ${CMAKE_CURRENT_SOURCE_DIR}/shutdown.sh) add_custom_target(stop-tango ${CMAKE_CURRENT_SOURCE_DIR}/shutdown.sh WORKING_DIRECTORY ${PROJECT_BINARY_DIR} SOURCES shutdown.sh) \ No newline at end of file diff --git a/cpp_test_suite/environment/post_test.sh.cmake b/test/cpp_test_suite/environment/post_test.sh.cmake similarity index 100% rename from cpp_test_suite/environment/post_test.sh.cmake rename to test/cpp_test_suite/environment/post_test.sh.cmake diff --git a/cpp_test_suite/environment/pre_test.sh.cmake b/test/cpp_test_suite/environment/pre_test.sh.cmake similarity index 100% rename from cpp_test_suite/environment/pre_test.sh.cmake rename to test/cpp_test_suite/environment/pre_test.sh.cmake diff --git a/cpp_test_suite/environment/run.sh.cmake b/test/cpp_test_suite/environment/run.sh.cmake similarity index 100% rename from cpp_test_suite/environment/run.sh.cmake rename to test/cpp_test_suite/environment/run.sh.cmake diff --git a/cpp_test_suite/environment/setup.sh b/test/cpp_test_suite/environment/setup.sh old mode 100644 new mode 100755 similarity index 100% rename from cpp_test_suite/environment/setup.sh rename to test/cpp_test_suite/environment/setup.sh diff --git a/cpp_test_suite/environment/shutdown.sh b/test/cpp_test_suite/environment/shutdown.sh old mode 100644 new mode 100755 similarity index 100% rename from cpp_test_suite/environment/shutdown.sh rename to test/cpp_test_suite/environment/shutdown.sh diff --git a/cpp_test_suite/environment/tango_host.cmake b/test/cpp_test_suite/environment/tango_host.cmake similarity index 100% rename from cpp_test_suite/environment/tango_host.cmake rename to test/cpp_test_suite/environment/tango_host.cmake diff --git a/cpp_test_suite/event/CMakeLists.txt b/test/cpp_test_suite/event/CMakeLists.txt similarity index 79% rename from cpp_test_suite/event/CMakeLists.txt rename to test/cpp_test_suite/event/CMakeLists.txt index fbb1a34ec..073556010 100644 --- a/cpp_test_suite/event/CMakeLists.txt +++ b/test/cpp_test_suite/event/CMakeLists.txt @@ -18,11 +18,7 @@ set(TESTS archive_event data_ready_event_buffer dev_intr_event multi_dev_event - per_event -# reco_event - reco_zmq - server_event - stateless_sub) + per_event) foreach(TEST ${TESTS}) TEST_SUITE_ADD_TEST(${TEST}) @@ -44,11 +40,4 @@ add_test(NAME "event::data_ready_event_buffer" COMMAND $ ${DEV1} ${DEV2} ${DEV3}) add_test(NAME "event::dev_intr_event" COMMAND $ ${DEV1}) add_test(NAME "event::pipe_event" COMMAND $ ${DEV1}) -add_test(NAME "event::event_lock" COMMAND $ ${DEV1}) - - -#the following test performs several kill/start sequences, but must keep DEV1 alive in the end -configure_file(test_reconnection.sh.cmake test_reconnection.sh @ONLY) -execute_process(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/test_reconnection.sh) -add_test(NAME "event::reconnect" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test_reconnection.sh - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) \ No newline at end of file +add_test(NAME "event::event_lock" COMMAND $ ${DEV1}) \ No newline at end of file diff --git a/cpp_test_suite/event/README b/test/cpp_test_suite/event/README similarity index 100% rename from cpp_test_suite/event/README rename to test/cpp_test_suite/event/README diff --git a/cpp_test_suite/event/archive_event.cpp b/test/cpp_test_suite/event/archive_event.cpp similarity index 100% rename from cpp_test_suite/event/archive_event.cpp rename to test/cpp_test_suite/event/archive_event.cpp diff --git a/cpp_test_suite/event/att_conf_event.cpp b/test/cpp_test_suite/event/att_conf_event.cpp similarity index 100% rename from cpp_test_suite/event/att_conf_event.cpp rename to test/cpp_test_suite/event/att_conf_event.cpp diff --git a/cpp_test_suite/event/att_conf_event_buffer.cpp b/test/cpp_test_suite/event/att_conf_event_buffer.cpp similarity index 100% rename from cpp_test_suite/event/att_conf_event_buffer.cpp rename to test/cpp_test_suite/event/att_conf_event_buffer.cpp diff --git a/cpp_test_suite/event/att_type_event.cpp b/test/cpp_test_suite/event/att_type_event.cpp similarity index 100% rename from cpp_test_suite/event/att_type_event.cpp rename to test/cpp_test_suite/event/att_type_event.cpp diff --git a/cpp_test_suite/event/back_ch_event.cpp b/test/cpp_test_suite/event/back_ch_event.cpp similarity index 100% rename from cpp_test_suite/event/back_ch_event.cpp rename to test/cpp_test_suite/event/back_ch_event.cpp diff --git a/cpp_test_suite/event/back_per_event.cpp b/test/cpp_test_suite/event/back_per_event.cpp similarity index 100% rename from cpp_test_suite/event/back_per_event.cpp rename to test/cpp_test_suite/event/back_per_event.cpp diff --git a/cpp_test_suite/event/change_event.cpp b/test/cpp_test_suite/event/change_event.cpp similarity index 100% rename from cpp_test_suite/event/change_event.cpp rename to test/cpp_test_suite/event/change_event.cpp diff --git a/cpp_test_suite/event/change_event64.cpp b/test/cpp_test_suite/event/change_event64.cpp similarity index 100% rename from cpp_test_suite/event/change_event64.cpp rename to test/cpp_test_suite/event/change_event64.cpp diff --git a/cpp_test_suite/event/change_event_buffer.cpp b/test/cpp_test_suite/event/change_event_buffer.cpp similarity index 100% rename from cpp_test_suite/event/change_event_buffer.cpp rename to test/cpp_test_suite/event/change_event_buffer.cpp diff --git a/cpp_test_suite/event/data_ready_event.cpp b/test/cpp_test_suite/event/data_ready_event.cpp similarity index 97% rename from cpp_test_suite/event/data_ready_event.cpp rename to test/cpp_test_suite/event/data_ready_event.cpp index f1eee3a9f..215f9e9b0 100644 --- a/cpp_test_suite/event/data_ready_event.cpp +++ b/test/cpp_test_suite/event/data_ready_event.cpp @@ -173,7 +173,7 @@ int main(int argc, char **argv) dvlsa.svalue.length(1); dvlsa.lvalue.length(1); dvlsa.lvalue[0] = 10; - dvlsa.svalue[0] = CORBA::string_dup(att_name.c_str()); + dvlsa.svalue[0] = Tango::string_dup(att_name.c_str()); DeviceData d_in; d_in << dvlsa; device->command_inout("PushDataReady",d_in); @@ -213,7 +213,7 @@ int main(int argc, char **argv) bool received_err = false; string err_reason; - dvlsa.svalue[0] = CORBA::string_dup("bidon"); + dvlsa.svalue[0] = Tango::string_dup("bidon"); d_in << dvlsa; try diff --git a/cpp_test_suite/event/data_ready_event_buffer.cpp b/test/cpp_test_suite/event/data_ready_event_buffer.cpp similarity index 98% rename from cpp_test_suite/event/data_ready_event_buffer.cpp rename to test/cpp_test_suite/event/data_ready_event_buffer.cpp index 2701641f3..0459b5ba6 100644 --- a/cpp_test_suite/event/data_ready_event_buffer.cpp +++ b/test/cpp_test_suite/event/data_ready_event_buffer.cpp @@ -141,7 +141,7 @@ int main(int argc, char **argv) dvlsa.svalue.length(1); dvlsa.lvalue.length(1); dvlsa.lvalue[0] = 9; - dvlsa.svalue[0] = CORBA::string_dup(att_name.c_str()); + dvlsa.svalue[0] = Tango::string_dup(att_name.c_str()); DeviceData d_in; for (int i=0; i<10; i++) @@ -366,7 +366,7 @@ int main(int argc, char **argv) dvlsa1.svalue.length(1); dvlsa1.lvalue.length(1); dvlsa1.lvalue[0] = 9; - dvlsa1.svalue[0] = CORBA::string_dup(att_name.c_str()); + dvlsa1.svalue[0] = Tango::string_dup(att_name.c_str()); DeviceData d_in1; for (int i=0; i<10; i++) diff --git a/cpp_test_suite/event/dev_intr_event.cpp b/test/cpp_test_suite/event/dev_intr_event.cpp similarity index 100% rename from cpp_test_suite/event/dev_intr_event.cpp rename to test/cpp_test_suite/event/dev_intr_event.cpp diff --git a/cpp_test_suite/event/event_lock.cpp b/test/cpp_test_suite/event/event_lock.cpp similarity index 100% rename from cpp_test_suite/event/event_lock.cpp rename to test/cpp_test_suite/event/event_lock.cpp diff --git a/cpp_test_suite/event/multi_dev_event.cpp b/test/cpp_test_suite/event/multi_dev_event.cpp similarity index 100% rename from cpp_test_suite/event/multi_dev_event.cpp rename to test/cpp_test_suite/event/multi_dev_event.cpp diff --git a/cpp_test_suite/event/multi_event.cpp b/test/cpp_test_suite/event/multi_event.cpp similarity index 100% rename from cpp_test_suite/event/multi_event.cpp rename to test/cpp_test_suite/event/multi_event.cpp diff --git a/cpp_test_suite/event/per_event.cpp b/test/cpp_test_suite/event/per_event.cpp similarity index 100% rename from cpp_test_suite/event/per_event.cpp rename to test/cpp_test_suite/event/per_event.cpp diff --git a/cpp_test_suite/event/pipe_event.cpp b/test/cpp_test_suite/event/pipe_event.cpp similarity index 100% rename from cpp_test_suite/event/pipe_event.cpp rename to test/cpp_test_suite/event/pipe_event.cpp diff --git a/cpp_test_suite/event/runtest b/test/cpp_test_suite/event/runtest old mode 100755 new mode 100644 similarity index 100% rename from cpp_test_suite/event/runtest rename to test/cpp_test_suite/event/runtest diff --git a/cpp_test_suite/event/scan.cpp b/test/cpp_test_suite/event/scan.cpp similarity index 100% rename from cpp_test_suite/event/scan.cpp rename to test/cpp_test_suite/event/scan.cpp diff --git a/cpp_test_suite/event/state_event.cpp b/test/cpp_test_suite/event/state_event.cpp similarity index 100% rename from cpp_test_suite/event/state_event.cpp rename to test/cpp_test_suite/event/state_event.cpp diff --git a/cpp_test_suite/event/user_event.cpp b/test/cpp_test_suite/event/user_event.cpp similarity index 100% rename from cpp_test_suite/event/user_event.cpp rename to test/cpp_test_suite/event/user_event.cpp diff --git a/cpp_test_suite/new_tests/CMakeLists.txt b/test/cpp_test_suite/new_tests/CMakeLists.txt similarity index 100% rename from cpp_test_suite/new_tests/CMakeLists.txt rename to test/cpp_test_suite/new_tests/CMakeLists.txt diff --git a/cpp_test_suite/new_tests/compare_test.cpp b/test/cpp_test_suite/new_tests/compare_test.cpp similarity index 100% rename from cpp_test_suite/new_tests/compare_test.cpp rename to test/cpp_test_suite/new_tests/compare_test.cpp diff --git a/cpp_test_suite/new_tests/compare_test.h b/test/cpp_test_suite/new_tests/compare_test.h similarity index 100% rename from cpp_test_suite/new_tests/compare_test.h rename to test/cpp_test_suite/new_tests/compare_test.h diff --git a/cpp_test_suite/new_tests/conf_devtest.cpp b/test/cpp_test_suite/new_tests/conf_devtest.cpp similarity index 100% rename from cpp_test_suite/new_tests/conf_devtest.cpp rename to test/cpp_test_suite/new_tests/conf_devtest.cpp diff --git a/cpp_test_suite/new_tests/cxx_always_hook.cpp b/test/cpp_test_suite/new_tests/cxx_always_hook.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_always_hook.cpp rename to test/cpp_test_suite/new_tests/cxx_always_hook.cpp diff --git a/cpp_test_suite/new_tests/cxx_attr.cpp b/test/cpp_test_suite/new_tests/cxx_attr.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_attr.cpp rename to test/cpp_test_suite/new_tests/cxx_attr.cpp diff --git a/cpp_test_suite/new_tests/cxx_attr_conf.cpp b/test/cpp_test_suite/new_tests/cxx_attr_conf.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_attr_conf.cpp rename to test/cpp_test_suite/new_tests/cxx_attr_conf.cpp diff --git a/cpp_test_suite/new_tests/cxx_attr_misc.cpp b/test/cpp_test_suite/new_tests/cxx_attr_misc.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_attr_misc.cpp rename to test/cpp_test_suite/new_tests/cxx_attr_misc.cpp diff --git a/cpp_test_suite/new_tests/cxx_attr_write.cpp b/test/cpp_test_suite/new_tests/cxx_attr_write.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_attr_write.cpp rename to test/cpp_test_suite/new_tests/cxx_attr_write.cpp diff --git a/cpp_test_suite/new_tests/cxx_attrprop.cpp b/test/cpp_test_suite/new_tests/cxx_attrprop.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_attrprop.cpp rename to test/cpp_test_suite/new_tests/cxx_attrprop.cpp diff --git a/cpp_test_suite/new_tests/cxx_blackbox.cpp b/test/cpp_test_suite/new_tests/cxx_blackbox.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_blackbox.cpp rename to test/cpp_test_suite/new_tests/cxx_blackbox.cpp diff --git a/cpp_test_suite/new_tests/cxx_class_dev_signal.cpp b/test/cpp_test_suite/new_tests/cxx_class_dev_signal.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_class_dev_signal.cpp rename to test/cpp_test_suite/new_tests/cxx_class_dev_signal.cpp diff --git a/cpp_test_suite/new_tests/cxx_class_signal.cpp b/test/cpp_test_suite/new_tests/cxx_class_signal.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_class_signal.cpp rename to test/cpp_test_suite/new_tests/cxx_class_signal.cpp diff --git a/cpp_test_suite/new_tests/cxx_cmd_query.cpp b/test/cpp_test_suite/new_tests/cxx_cmd_query.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_cmd_query.cpp rename to test/cpp_test_suite/new_tests/cxx_cmd_query.cpp diff --git a/cpp_test_suite/new_tests/cxx_cmd_types.cpp b/test/cpp_test_suite/new_tests/cxx_cmd_types.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_cmd_types.cpp rename to test/cpp_test_suite/new_tests/cxx_cmd_types.cpp diff --git a/cpp_test_suite/new_tests/cxx_database.cpp b/test/cpp_test_suite/new_tests/cxx_database.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_database.cpp rename to test/cpp_test_suite/new_tests/cxx_database.cpp diff --git a/cpp_test_suite/new_tests/cxx_dserver_cmd.cpp b/test/cpp_test_suite/new_tests/cxx_dserver_cmd.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_dserver_cmd.cpp rename to test/cpp_test_suite/new_tests/cxx_dserver_cmd.cpp diff --git a/cpp_test_suite/new_tests/cxx_dserver_misc.cpp b/test/cpp_test_suite/new_tests/cxx_dserver_misc.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_dserver_misc.cpp rename to test/cpp_test_suite/new_tests/cxx_dserver_misc.cpp diff --git a/cpp_test_suite/new_tests/cxx_encoded.cpp b/test/cpp_test_suite/new_tests/cxx_encoded.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_encoded.cpp rename to test/cpp_test_suite/new_tests/cxx_encoded.cpp diff --git a/cpp_test_suite/new_tests/cxx_enum_att.cpp b/test/cpp_test_suite/new_tests/cxx_enum_att.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_enum_att.cpp rename to test/cpp_test_suite/new_tests/cxx_enum_att.cpp diff --git a/cpp_test_suite/new_tests/cxx_exception.cpp b/test/cpp_test_suite/new_tests/cxx_exception.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_exception.cpp rename to test/cpp_test_suite/new_tests/cxx_exception.cpp diff --git a/cpp_test_suite/new_tests/cxx_fwd_att.cpp b/test/cpp_test_suite/new_tests/cxx_fwd_att.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_fwd_att.cpp rename to test/cpp_test_suite/new_tests/cxx_fwd_att.cpp diff --git a/cpp_test_suite/new_tests/cxx_group.cpp b/test/cpp_test_suite/new_tests/cxx_group.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_group.cpp rename to test/cpp_test_suite/new_tests/cxx_group.cpp diff --git a/cpp_test_suite/new_tests/cxx_mem_attr.cpp b/test/cpp_test_suite/new_tests/cxx_mem_attr.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_mem_attr.cpp rename to test/cpp_test_suite/new_tests/cxx_mem_attr.cpp diff --git a/cpp_test_suite/new_tests/cxx_misc.cpp b/test/cpp_test_suite/new_tests/cxx_misc.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_misc.cpp rename to test/cpp_test_suite/new_tests/cxx_misc.cpp diff --git a/cpp_test_suite/new_tests/cxx_misc_util.cpp b/test/cpp_test_suite/new_tests/cxx_misc_util.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_misc_util.cpp rename to test/cpp_test_suite/new_tests/cxx_misc_util.cpp diff --git a/test/cpp_test_suite/new_tests/cxx_old_poll.cpp b/test/cpp_test_suite/new_tests/cxx_old_poll.cpp new file mode 100644 index 000000000..c8961b181 --- /dev/null +++ b/test/cpp_test_suite/new_tests/cxx_old_poll.cpp @@ -0,0 +1,1346 @@ +#ifndef PollTestSuite_h +#define PollTestSuite_h + +#include +#include +#include +#include +#include +#include + +using namespace Tango; +using namespace std; + +#define cout cout << "\t" +#define BASIC_NB_POLL 16 +#define TEST_CLASS "devTest" + +#undef SUITE_NAME +#define SUITE_NAME OldPollTestSuite__loop + +typedef enum { + FIRST_EXCEPT = 0, + SECOND_EXCEPT, + FIRST_DATA, + SECOND_DATA +} AttrResult; + +typedef enum { + EXCEPT = 0, + FIRST_STR, + SECOND_STR +} CmdResult; + +void split_string(string &, char, vector &); + +void stop_poll_att_no_except(DeviceProxy *, const char *); + +void stop_poll_cmd_no_except(DeviceProxy *, const char *); + +void del_device_no_error(Database &, string&); + +class OldPollTestSuite__loop : public CxxTest::TestSuite { +protected: + DeviceProxy *device; + string device_name, device2_name, alias_name, serv_name, admin_dev_name, inst_name; + string new_dev, new_dev1_th2, new_dev2_th2, new_dev1_th3; + vector ref_polling_pool_conf; + + bool verbose; + int hist_depth; + +public: + SUITE_NAME() : hist_depth{10}, admin_dev_name{"dserver/"}, + inst_name{"debian8"},//TODO pass from cmd + new_dev{"test/debian8/77"}, + new_dev1_th2{"test/debian8/800"}, + new_dev2_th2{"test/debian8/801"}, + new_dev1_th3{"test/debian8/9000"}, + ref_polling_pool_conf{1, "test/debian8/10,test/debian8/11"} { + +// +// Arguments check ------------------------------------------------- +// + + device_name = CxxTest::TangoPrinter::get_param("device1"); + device2_name = CxxTest::TangoPrinter::get_param("device2"); + alias_name = CxxTest::TangoPrinter::get_param("devicealias"); + serv_name = CxxTest::TangoPrinter::get_param("fulldsname"); + + admin_dev_name += serv_name; + + verbose = CxxTest::TangoPrinter::is_param_set("verbose"); + + CxxTest::TangoPrinter::validate_args(); + + +// +// Initialization -------------------------------------------------- +// + + try { + device = new DeviceProxy(device_name); + device->ping(); + } + catch (const CORBA::Exception &e) { + Except::print_exception(e); + exit(-1); + } + + try { + device->poll_command("IOPollStr1", 500); + device->poll_command("IOPollArray2", 500); + device->poll_command("IOExcept", 2000); + device->poll_command("OEncoded", 500); + device->poll_command("State", 2000); + device->poll_command("Status", 2000); + + device->poll_attribute("PollLong_attr", 1000); + device->poll_attribute("PollString_spec_attr", 500); + device->poll_attribute("attr_wrong_type", 500); + + device->poll_attribute("Long64_attr_rw", 500); + device->poll_attribute("ULong_spec_attr_rw", 500); + device->poll_attribute("ULong64_attr_rw", 500); + device->poll_attribute("State_spec_attr_rw", 500); + device->poll_attribute("Encoded_attr", 500); + } + catch (const CORBA::Exception &e) { + Except::print_exception(e); + exit(-1); + } + + cout << "Wait for 7 seconds to fill in polling buffer..." << endl; + this_thread::sleep_for(chrono::seconds{7}); + cout << "Done." << endl; + } + + virtual ~SUITE_NAME() { + +// +// Clean up -------------------------------------------------------- +// +// cout << "Device name = " << device_name << endl; +// cout << "Kill device name = " << kill_device_name << endl; + + + if (CxxTest::TangoPrinter::is_restore_set("dev1_source_cache")) + device->set_source(Tango::CACHE_DEV); + + if (CxxTest::TangoPrinter::is_restore_set("dev2_poll_PollLong_attr_1000")) + stop_poll_att_no_except(new DeviceProxy(device2_name), "PollLong_attr"); + +// cout << endl << "new DeviceProxy(" << device->name() << ") returned" << endl << endl; + stop_poll_cmd_no_except(device, "IOPollStr1"); + stop_poll_cmd_no_except(device, "IOArray1"); + stop_poll_cmd_no_except(device, "IOPollArray2"); + stop_poll_cmd_no_except(device, "IOExcept"); + stop_poll_cmd_no_except(device, "OEncoded"); + stop_poll_cmd_no_except(device, "State"); + stop_poll_cmd_no_except(device, "Status"); + + stop_poll_att_no_except(device, "PollLong_attr"); + stop_poll_att_no_except(device, "PollString_spec_attr"); + stop_poll_att_no_except(device, "attr_wrong_type"); + + stop_poll_att_no_except(device, "Long64_attr_rw"); + stop_poll_att_no_except(device, "ULong_spec_attr_rw"); + stop_poll_att_no_except(device, "ULong64_attr_rw"); + stop_poll_att_no_except(device, "State_spec_attr_rw"); + stop_poll_att_no_except(device, "Encoded_attr"); + + stop_poll_att_no_except(device, "event_change_tst"); + stop_poll_att_no_except(device, "event64_change_tst"); + stop_poll_att_no_except(device, "short_attr"); + stop_poll_att_no_except(device, "slow_actuator"); + stop_poll_att_no_except(device, "fast_actuator"); + + if (CxxTest::TangoPrinter::is_restore_set("reset_device_server")) + reset_device_server(); + + delete device; + } + + static SUITE_NAME *createSuite() { + return new SUITE_NAME(); + } + + static void destroySuite(SUITE_NAME *suite) { + delete suite; + } + +// +// Tests ------------------------------------------------------- +// + + void test_read_command_history_string(void) { + auto d_hist = device->command_history("IOPollStr1", hist_depth); + + TSM_ASSERT_LESS_THAN("Not enough data in the polling buffer, restart later", 4, d_hist->size()); + + CmdResult cr; + + if ((*d_hist)[0].has_failed() == true) { + cr = EXCEPT; + } else { + string str; + (*d_hist)[0] >> str; + if (str[0] == 'E') + cr = FIRST_STR; + else + cr = SECOND_STR; + } + + for (size_t i = 0; i < d_hist->size(); i++) { + string str; + if ((*d_hist)[i].has_failed() == false) + (*d_hist)[i] >> str; + + if (verbose) { + cout << "Command failed = " << (*d_hist)[i].has_failed() << endl; + if ((*d_hist)[i].has_failed() == false) { + (*d_hist)[i] >> str; + cout << "Value = " << str << endl; + } + TimeVal &t = (*d_hist)[i].get_date(); + cout << "Date : " << t.tv_sec << " sec, " << t.tv_usec << " usec" << endl; + cout << "Error stack depth = " << (*d_hist)[i].get_err_stack().length() << endl; + cout << endl; + } + } + + DevErrorList del; + string simple_str; + + switch (cr) { + case EXCEPT: + TS_ASSERT((*d_hist)[0].has_failed() == true); + TS_ASSERT((*d_hist)[0].get_err_stack().length() == 1); + del = (*d_hist)[0].get_err_stack(); + TS_ASSERT(::strcmp(del[0].desc.in(), "www") == 0); + + (*d_hist)[1] >> simple_str; + TS_ASSERT((*d_hist)[1].has_failed() == false); + TS_ASSERT((*d_hist)[1].get_err_stack().length() == 0); + TS_ASSERT(simple_str == "Even value from IOPollStr1"); + + (*d_hist)[2] >> simple_str; + TS_ASSERT((*d_hist)[2].has_failed() == false); + TS_ASSERT((*d_hist)[2].get_err_stack().length() == 0); + TS_ASSERT(simple_str == "Odd value from IOPollStr1"); + break; + + case FIRST_STR: + (*d_hist)[0] >> simple_str; + TS_ASSERT((*d_hist)[0].has_failed() == false); + TS_ASSERT((*d_hist)[0].get_err_stack().length() == 0); + TS_ASSERT(simple_str == "Even value from IOPollStr1"); + + (*d_hist)[1] >> simple_str; + TS_ASSERT((*d_hist)[1].has_failed() == false); + TS_ASSERT((*d_hist)[1].get_err_stack().length() == 0); + TS_ASSERT(simple_str == "Odd value from IOPollStr1"); + + TS_ASSERT((*d_hist)[2].has_failed() == true); + TS_ASSERT((*d_hist)[2].get_err_stack().length() == 1); + del = (*d_hist)[2].get_err_stack(); + TS_ASSERT(::strcmp(del[0].desc.in(), "www") == 0); + break; + + case SECOND_STR: + (*d_hist)[0] >> simple_str; + TS_ASSERT((*d_hist)[0].has_failed() == false); + TS_ASSERT((*d_hist)[0].get_err_stack().length() == 0); + TS_ASSERT(simple_str == "Odd value from IOPollStr1"); + + TS_ASSERT((*d_hist)[1].has_failed() == true); + TS_ASSERT((*d_hist)[1].get_err_stack().length() == 1); + del = (*d_hist)[1].get_err_stack(); + TS_ASSERT(::strcmp(del[0].desc.in(), "www") == 0); + + (*d_hist)[2] >> simple_str; + TS_ASSERT((*d_hist)[2].has_failed() == false); + TS_ASSERT((*d_hist)[2].get_err_stack().length() == 0); + TS_ASSERT(simple_str == "Even value from IOPollStr1"); + break; + } + + delete d_hist; + } + + void test_command_history_array(void) { + auto d_hist = device->command_history("IOPollArray2", hist_depth); + + TSM_ASSERT_LESS_THAN("Not enough data in the polling buffer, restart later", 4, d_hist->size()); + + short first_val_first_rec; + for (size_t i = 0; i < d_hist->size(); i++) { + vector vect; + (*d_hist)[i] >> vect; + + if (verbose) { + cout << "Command failed = " << (*d_hist)[i].has_failed() << endl; + cout << "Value 0 = " << vect[0] << ", Value 1 = " << vect[1] << endl; + TimeVal &t = (*d_hist)[i].get_date(); + cout << "Date : " << t.tv_sec << " sec, " << t.tv_usec << " usec" << endl; + cout << "Error stack depth = " << (*d_hist)[i].get_err_stack().length() << endl; + cout << endl; + } + + if (i == 0) + first_val_first_rec = vect[0]; + + TS_ASSERT((*d_hist)[i].has_failed() == false); + TS_ASSERT((*d_hist)[i].get_err_stack().length() == 0); + if (i != 0) { + if (first_val_first_rec == 100) { + if ((i % 2) == 0) { + TS_ASSERT(vect[0] == 100); + TS_ASSERT(vect[1] == 200); + } else { + TS_ASSERT(vect[0] == 300); + TS_ASSERT(vect[1] == 400); + } + } else { + if ((i % 2) == 0) { + TS_ASSERT(vect[0] == 300); + TS_ASSERT(vect[1] == 400); + } else { + TS_ASSERT(vect[0] == 100); + TS_ASSERT(vect[1] == 200); + } + } + } + } + delete d_hist; + } + + void test_command_history_with_exception(void) { + auto d_hist = device->command_history("IOExcept", hist_depth); + + for (size_t i = 0; i < d_hist->size(); i++) { + if (verbose) { + cout << "Command failed = " << (*d_hist)[i].has_failed() << endl; + TimeVal &t = (*d_hist)[i].get_date(); + cout << "Date : " << t.tv_sec << " sec, " << t.tv_usec << " usec" << endl; + cout << "Error stack depth = " << (*d_hist)[i].get_err_stack().length() << endl; + cout << endl; + } + + TS_ASSERT((*d_hist)[i].has_failed() == true); + TS_ASSERT((*d_hist)[i].get_err_stack().length() == 1); + TS_ASSERT(!strcmp((*d_hist)[i].get_err_stack()[0].reason, "API_ThrowException")); + } + delete d_hist; + } + + + void test_command_history_for_state(void) { + auto d_hist = device->command_history("State", hist_depth); + + for (size_t i = 0; i < d_hist->size(); i++) { + if (verbose) { + cout << (*d_hist)[i] << endl; + } + + TS_ASSERT((*d_hist)[i].has_failed() == false); + TS_ASSERT((*d_hist)[i].get_err_stack().length() == 0); + Tango::DevState ds; + (*d_hist)[i] >> ds; + TS_ASSERT(ds == Tango::ON); + } + delete d_hist; + } + + void test_command_history_for_status(void) { + auto d_hist = device->command_history("Status", hist_depth); + + for (size_t i = 0; i < d_hist->size(); i++) { + if (verbose) { + cout << (*d_hist)[i] << endl; + } + + TS_ASSERT((*d_hist)[i].has_failed() == false); + TS_ASSERT((*d_hist)[i].get_err_stack().length() == 0); + string str; + (*d_hist)[i] >> str; + TS_ASSERT(::strcmp(str.c_str(), "The device is in ON state.") == 0); + } + delete d_hist; + } + + void test_command_history_DevEncoded(void) { + auto d_hist = device->command_history("OEncoded", hist_depth); + + TSM_ASSERT_LESS_THAN("Not enough data in the polling buffer, restart later", 4, d_hist->size()); + + unsigned char first_val_enc; + for (size_t i = 0; i < d_hist->size(); i++) { + DevEncoded the_enc; + (*d_hist)[i] >> the_enc; + + if (verbose) { + cout << "Command failed = " << (*d_hist)[i].has_failed() << endl; + cout << "Encoded_format = " << the_enc.encoded_format << endl; + for (unsigned int ii = 0; ii < the_enc.encoded_data.length(); ++ii) + cout << "Encoded_data = " << (int) the_enc.encoded_data[ii] << endl; + TimeVal &t = (*d_hist)[i].get_date(); + cout << "Date : " << t.tv_sec << " sec, " << t.tv_usec << " usec" << endl; + cout << "Error stack depth = " << (*d_hist)[i].get_err_stack().length() << endl; + cout << endl; + } + + TS_ASSERT((*d_hist)[i].has_failed() == false); + TS_ASSERT((*d_hist)[i].get_err_stack().length() == 0); + + if (i == 0) + first_val_enc = the_enc.encoded_data[0]; + + if ((i % 2) == 0) { + if (first_val_enc == 11) { + TS_ASSERT(!strcmp(the_enc.encoded_format, "Odd - OEncoded format")); + TS_ASSERT(the_enc.encoded_data.length() == 2); + TS_ASSERT(the_enc.encoded_data[0] == 11); + TS_ASSERT(the_enc.encoded_data[1] == 21); + } else { + TS_ASSERT(!strcmp(the_enc.encoded_format, "Even - OEncoded format")); + TS_ASSERT(the_enc.encoded_data[0] == 10); + TS_ASSERT(the_enc.encoded_data[1] == 20); + TS_ASSERT(the_enc.encoded_data[2] == 30); + TS_ASSERT(the_enc.encoded_data[3] == 40); + } + } else { + if (first_val_enc == 11) { + TS_ASSERT(!strcmp(the_enc.encoded_format, "Even - OEncoded format")); + TS_ASSERT(the_enc.encoded_data[0] == 10); + TS_ASSERT(the_enc.encoded_data[1] == 20); + TS_ASSERT(the_enc.encoded_data[2] == 30); + TS_ASSERT(the_enc.encoded_data[3] == 40); + } else { + TS_ASSERT(!strcmp(the_enc.encoded_format, "Odd - OEncoded format")); + TS_ASSERT(the_enc.encoded_data.length() == 2); + TS_ASSERT(the_enc.encoded_data[0] == 11); + TS_ASSERT(the_enc.encoded_data[1] == 21); + } + } + } + delete d_hist; + } + + void test_attribute_history_for_long(void) { + auto a_hist = device->attribute_history("PollLong_attr", hist_depth); + + DevLong first_val; + for (size_t i = 0; i < a_hist->size(); i++) { + DevLong lo; + (*a_hist)[i] >> lo; + + if (i == 0) + first_val = lo; + + if (verbose) { + cout << "Attribute failed = " << (*a_hist)[i].has_failed() << endl; + cout << "Value = " << lo << endl; + TimeVal &t = (*a_hist)[i].get_date(); + cout << "Date : " << t.tv_sec << " sec, " << t.tv_usec << " usec" << endl; + cout << "Error stack depth = " << (*a_hist)[i].get_err_stack().length() << endl; + cout << endl; + } + + TS_ASSERT((*a_hist)[i].has_failed() == false); + TS_ASSERT((*a_hist)[i].get_err_stack().length() == 0); + + TS_ASSERT((*a_hist)[i].get_dim_x() == 1); + TS_ASSERT((*a_hist)[i].get_dim_y() == 0); + + if (first_val == 5555) { + if ((i % 2) == 0) { + TS_ASSERT(lo == 5555); + } else { + TS_ASSERT(lo == 6666); + } + } else { + if ((i % 2) == 0) { + TS_ASSERT(lo == 6666); + } else { + TS_ASSERT(lo == 5555); + } + } + } + delete a_hist; + } + + void test_attribute_history_for_strings_spectrum(void) { + auto a_hist = device->attribute_history("PollString_spec_attr", hist_depth); + + string first_string; + AttrResult ar; + + vector str; + + if ((*a_hist)[0].has_failed() == true) { + if (::strcmp(((*a_hist)[0].get_err_stack())[0].reason.in(), "aaaa") == 0) + ar = FIRST_EXCEPT; + else + ar = SECOND_EXCEPT; + } else { + (*a_hist)[0] >> str; + if (str.size() == 2) + ar = FIRST_DATA; + else + ar = SECOND_DATA; + } + + for (size_t i = 0; i < a_hist->size(); i++) { + if (verbose) { + cout << "Attribute failed = " << (*a_hist)[i].has_failed() << endl; + TimeVal &t = (*a_hist)[i].get_date(); + cout << "Date : " << t.tv_sec << " sec, " << t.tv_usec << " usec" << endl; + if ((*a_hist)[i].has_failed() == false) { + (*a_hist)[i] >> str; + cout << "Value = " << str[0]; + if (str.size() == 2) + cout << ", Value = " << str[1]; + cout << endl; + } else { + cout << "Error stack depth = " << (*a_hist)[i].get_err_stack().length() << endl; + cout << "Error level 0 reason = " << ((*a_hist)[i].get_err_stack())[0].reason << endl; + cout << "Error level 0 desc = " << ((*a_hist)[i].get_err_stack())[0].desc << endl; + } + cout << endl; + } + } + + switch (ar) { + case FIRST_EXCEPT: + TS_ASSERT((*a_hist)[0].has_failed() == true); + TS_ASSERT((*a_hist)[0].get_err_stack().length() == 1); + TS_ASSERT(::strcmp(((*a_hist)[0].get_err_stack())[0].desc.in(), "bbb") == 0); + TS_ASSERT(::strcmp(((*a_hist)[0].get_err_stack())[0].reason.in(), "aaaa") == 0); + + TS_ASSERT((*a_hist)[1].has_failed() == true); + TS_ASSERT((*a_hist)[1].get_err_stack().length() == 1); + TS_ASSERT(::strcmp(((*a_hist)[1].get_err_stack())[0].desc.in(), "yyy") == 0); + TS_ASSERT(::strcmp(((*a_hist)[1].get_err_stack())[0].reason.in(), "xxx") == 0); + + (*a_hist)[2] >> str; + TS_ASSERT(str.size() == 2); + TS_ASSERT(str[0] == "Hello world"); + TS_ASSERT(str[1] == "Hello universe"); + + (*a_hist)[3] >> str; + TS_ASSERT(str.size() == 1); + TS_ASSERT(str[0] == "Hello Grenoble"); + break; + + case SECOND_EXCEPT: + TS_ASSERT((*a_hist)[0].has_failed() == true); + TS_ASSERT((*a_hist)[0].get_err_stack().length() == 1); + TS_ASSERT(::strcmp(((*a_hist)[0].get_err_stack())[0].desc.in(), "yyy") == 0); + TS_ASSERT(::strcmp(((*a_hist)[0].get_err_stack())[0].reason.in(), "xxx") == 0); + + (*a_hist)[1] >> str; + TS_ASSERT(str.size() == 2); + TS_ASSERT(str[0] == "Hello world"); + TS_ASSERT(str[1] == "Hello universe"); + + (*a_hist)[2] >> str; + TS_ASSERT(str.size() == 1); + TS_ASSERT(str[0] == "Hello Grenoble"); + + TS_ASSERT((*a_hist)[3].has_failed() == true); + TS_ASSERT((*a_hist)[3].get_err_stack().length() == 1); + TS_ASSERT(::strcmp(((*a_hist)[3].get_err_stack())[0].desc.in(), "bbb") == 0); + TS_ASSERT(::strcmp(((*a_hist)[3].get_err_stack())[0].reason.in(), "aaaa") == 0); + break; + + case FIRST_DATA: + (*a_hist)[0] >> str; + TS_ASSERT(str.size() == 2); + TS_ASSERT(str[0] == "Hello world"); + TS_ASSERT(str[1] == "Hello universe"); + + (*a_hist)[1] >> str; + TS_ASSERT(str.size() == 1); + TS_ASSERT(str[0] == "Hello Grenoble"); + + TS_ASSERT((*a_hist)[2].has_failed() == true); + TS_ASSERT((*a_hist)[2].get_err_stack().length() == 1); + TS_ASSERT(::strcmp(((*a_hist)[2].get_err_stack())[0].desc.in(), "bbb") == 0); + TS_ASSERT(::strcmp(((*a_hist)[2].get_err_stack())[0].reason.in(), "aaaa") == 0); + + TS_ASSERT((*a_hist)[3].has_failed() == true); + TS_ASSERT((*a_hist)[3].get_err_stack().length() == 1); + TS_ASSERT(::strcmp(((*a_hist)[3].get_err_stack())[0].desc.in(), "yyy") == 0); + TS_ASSERT(::strcmp(((*a_hist)[3].get_err_stack())[0].reason.in(), "xxx") == 0); + break; + + case SECOND_DATA: + (*a_hist)[0] >> str; + TS_ASSERT(str.size() == 1); + TS_ASSERT(str[0] == "Hello Grenoble"); + + TS_ASSERT((*a_hist)[1].has_failed() == true); + TS_ASSERT((*a_hist)[1].get_err_stack().length() == 1); + TS_ASSERT(::strcmp(((*a_hist)[1].get_err_stack())[0].desc.in(), "bbb") == 0); + TS_ASSERT(::strcmp(((*a_hist)[1].get_err_stack())[0].reason.in(), "aaaa") == 0); + + TS_ASSERT((*a_hist)[2].has_failed() == true); + TS_ASSERT((*a_hist)[2].get_err_stack().length() == 1); + TS_ASSERT(::strcmp(((*a_hist)[2].get_err_stack())[0].desc.in(), "yyy") == 0); + TS_ASSERT(::strcmp(((*a_hist)[2].get_err_stack())[0].reason.in(), "xxx") == 0); + + (*a_hist)[3] >> str; + TS_ASSERT(str.size() == 2); + TS_ASSERT(str[0] == "Hello world"); + TS_ASSERT(str[1] == "Hello universe"); + break; + } + delete a_hist; + } + + void test_attribute_history_for_dev_encoded(void) { + auto enc_hist = device->attribute_history("Encoded_attr", hist_depth); + + for (size_t i = 0; i < enc_hist->size(); i++) { + + if (verbose) { + cout << "Value = " << (*enc_hist)[i] << endl; + cout << endl; + } + + TS_ASSERT((*enc_hist)[i].has_failed() == false); + TS_ASSERT((*enc_hist)[i].get_err_stack().length() == 0); + + TS_ASSERT((*enc_hist)[i].get_dim_x() == 1); + TS_ASSERT((*enc_hist)[i].get_dim_y() == 0); + + DevEncoded enc; + (*enc_hist)[i] >> enc; + + TS_ASSERT(::strcmp(enc.encoded_format, "Which format?") == 0); + TS_ASSERT(enc.encoded_data[0] == 97); + TS_ASSERT(enc.encoded_data[1] == 98); + TS_ASSERT(enc.encoded_data[2] == 99); + TS_ASSERT(enc.encoded_data[3] == 100); + } + delete enc_hist; + } + + void test_attribute_history_with_exception(void) { + auto a_hist = device->attribute_history("attr_wrong_type", hist_depth); + + for (size_t i = 0; i < a_hist->size(); i++) { + if (verbose) { + cout << "Command failed = " << (*a_hist)[i].has_failed() << endl; + TimeVal &t = (*a_hist)[i].get_date(); + cout << "Date : " << t.tv_sec << " sec, " << t.tv_usec << " usec" << endl; + cout << "Error stack depth = " << (*a_hist)[i].get_err_stack().length() << endl; + cout << "Error level 0 reason = " << ((*a_hist)[i].get_err_stack())[0].reason << endl; + cout << "Error level 0 desc = " << ((*a_hist)[i].get_err_stack())[0].desc << endl; + cout << endl; + } + + TS_ASSERT((*a_hist)[i].has_failed() == true); + TS_ASSERT((*a_hist)[i].get_err_stack().length() == 1); + TS_ASSERT(!strcmp((*a_hist)[i].get_err_stack()[0].reason, "API_AttrOptProp")); +// AttributeDimension dim; +// dim = (*a_hist)[i].get_r_dimension(); + + TS_ASSERT((*a_hist)[i].get_dim_x() == 0); + TS_ASSERT((*a_hist)[i].get_dim_y() == 0); + +// dim = (*a_hist)[i].get_w_dimension(); + +// TS_ASSERT ( dim.dim_x == 0); +// TS_ASSERT ( dim.dim_y == 0); + + } + delete a_hist; + } + + void test_getting_a_long_64_attribute_from_polling_buffer(void) { + TS_ASSERT_THROWS_NOTHING(device->set_source(Tango::CACHE)); + CxxTest::TangoPrinter::restore_set("dev1_source_cache"); + + DeviceAttribute da; + int data_type; + + TS_ASSERT_THROWS_NOTHING(da = device->read_attribute("Long64_attr_rw")); + DevLong64 lo; + da >> lo; + data_type = da.get_type(); + if (verbose) + cout << "64 bits attribute data = " << hex << lo << dec << endl; + TS_ASSERT(lo == 0x800000000LL); + TS_ASSERT(data_type == Tango::DEV_LONG64); + } + + void test_getting_an_unsigned_long_64_bits_attribute_from_polling_buffer(void) { + TS_ASSERT_THROWS_NOTHING(device->set_source(Tango::CACHE)); + CxxTest::TangoPrinter::restore_set("dev1_source_cache"); + + DeviceAttribute da_ulo; + TS_ASSERT_THROWS_NOTHING(da_ulo = device->read_attribute("ULong64_attr_rw")); + DevULong64 ulo; + da_ulo >> ulo; + int data_type_ulo = da_ulo.get_type(); + if (verbose) + cout << "unsigned 64 bits attribute data = " << hex << ulo << dec << endl; + TS_ASSERT(ulo == 0xC000000000000000LL); + TS_ASSERT(data_type_ulo == Tango::DEV_ULONG64); + } + + void test_getting_a_unsigned_long_spectrum_attribute_from_polling_buffer(void) { + TS_ASSERT_THROWS_NOTHING(device->set_source(Tango::CACHE)); + CxxTest::TangoPrinter::restore_set("dev1_source_cache"); + + DeviceAttribute da; + TS_ASSERT_THROWS_NOTHING(da = device->read_attribute("ULong_spec_attr_rw")); + vector v_lo; + auto ret = (da >> v_lo); + + TS_ASSERT(ret == true); + TS_ASSERT(v_lo[0] == 2222); + TS_ASSERT(v_lo[1] == 22222); + TS_ASSERT(v_lo[2] == 222222); + } + + void test_getting_a_state_spectrum_attribute_from_polling_buffer(void) { + TS_ASSERT_THROWS_NOTHING(device->set_source(Tango::CACHE)); + CxxTest::TangoPrinter::restore_set("dev1_source_cache"); + + DeviceAttribute da; + TS_ASSERT_THROWS_NOTHING(da = device->read_attribute("State_spec_attr_rw")); + vector v_sta; + auto ret = (da >> v_sta); + + TS_ASSERT(ret == true); + TS_ASSERT(v_sta[0] == Tango::ON); + TS_ASSERT(v_sta[1] == Tango::OFF); + } + + void test_getting_a_dev_encoded_attribute_from_polling_buffer(void) { + TS_ASSERT_THROWS_NOTHING(device->set_source(Tango::CACHE)); + CxxTest::TangoPrinter::restore_set("dev1_source_cache"); + + DeviceAttribute da; + TS_ASSERT_THROWS_NOTHING(da = device->read_attribute("Encoded_attr")); + DevEncoded enc_lo; + da >> enc_lo; + auto data_type = da.get_type(); + TS_ASSERT(::strcmp(enc_lo.encoded_format.in(), "Which format?") == 0); + TS_ASSERT(data_type == Tango::DEV_ENCODED); + TS_ASSERT(enc_lo.encoded_data.length() == 4); + TS_ASSERT(enc_lo.encoded_data[0] == 97); + TS_ASSERT(enc_lo.encoded_data[1] == 98); + TS_ASSERT(enc_lo.encoded_data[2] == 99); + TS_ASSERT(enc_lo.encoded_data[3] == 100); + } + + void test_polling_status_from_device_name(void) { + if (CxxTest::TangoPrinter::is_restore_set("dev1_source_cache")) + TS_ASSERT_THROWS_NOTHING(device->set_source(Tango::CACHE_DEV)); + + vector *poll_str; + TS_ASSERT_THROWS_NOTHING(poll_str = device->polling_status()); + + unsigned long nb_polled = BASIC_NB_POLL; + for (unsigned int i = 0; i < poll_str->size(); i++) { + if ((*poll_str)[i].find("String_attr") != string::npos) { + nb_polled++; + } + if ((*poll_str)[i].find("IOStartPoll") != string::npos) { + nb_polled++; + } + } + + if (verbose) { + cout << poll_str->size() << " object(s) polled for device" << endl; + cout << endl; + for (unsigned int i = 0; i < poll_str->size(); i++) + cout << "Polling status = " << (*poll_str)[i] << endl; + cout << endl; + } + + TS_ASSERT(poll_str->size() == nb_polled); + + delete poll_str; + } + + void test_polling_status_from_device_name_2(void) { + auto device2 = new DeviceProxy(device2_name); + vector *poll_str; + TS_ASSERT_THROWS_NOTHING(poll_str = device2->polling_status()); + + if (verbose) { + cout << poll_str->size() << " object(s) polled for device" << endl; + cout << endl; + for (unsigned int i = 0; i < poll_str->size(); i++) + cout << "Polling status = " << (*poll_str)[i] << endl; + cout << endl; + } + + TS_ASSERT(poll_str->size() == 0); + delete poll_str; + delete device2; + } + + void test_polling_status_from_alias_name(void) { + + string adm_name = device->adm_name(); + DeviceProxy *admin_dev = new DeviceProxy(adm_name); + + + DeviceData d_send, d_received; + d_send << alias_name; + TS_ASSERT_THROWS_NOTHING(d_received = admin_dev->command_inout("DevPollStatus", d_send)); + vector v_str; + d_received >> v_str; + + auto nb_polled = BASIC_NB_POLL; + for (unsigned int i = 0; i < v_str.size(); i++) { + if (v_str[i].find("String_attr") != string::npos) { + nb_polled++; + continue; + } + if (v_str[i].find("IOStartPoll") != string::npos) { + nb_polled++; + } + } + + if (verbose) { + cout << v_str.size() << " object(s) polled for device" << endl; + cout << endl; + for (unsigned int i = 0; i < v_str.size(); i++) + cout << "Polling status = " << v_str[i] << endl; + cout << endl; + } + + TS_ASSERT(v_str.size() == nb_polled); + } + + void test_get_command_poll_period(void) { + + string cmd("IOExcept"); + int per; + TS_ASSERT_THROWS_NOTHING(per = device->get_command_poll_period(cmd)); + + if (verbose) { + cout << "Cmd " << cmd << " polling period = " << per << endl; + } + + TS_ASSERT(per == 2000); + + string attr("PollLong_attr"); + TS_ASSERT_THROWS_NOTHING(per = device->get_attribute_poll_period(attr)); + + if (verbose) + cout << "Attr " << attr << " polling period = " << per << endl; + + TS_ASSERT(per == 1000); + } + + void test_poll_command(void) { + + string cmd{"IOArray1"}; + bool poll; + TS_ASSERT_THROWS_NOTHING(poll = device->is_command_polled(cmd)); + + TS_ASSERT(poll == false); + + TS_ASSERT_THROWS_NOTHING(device->poll_command(cmd, 3000)); + TS_ASSERT_THROWS_NOTHING(poll = device->is_command_polled(cmd)); + + TS_ASSERT(poll == true); + + int per; + TS_ASSERT_THROWS_NOTHING(per = device->get_command_poll_period(cmd)); + + TS_ASSERT(per == 3000); + +#ifdef WIN32 + Sleep(3000); +#else + this_thread::sleep_for(chrono::seconds{3}); +#endif + + TS_ASSERT_THROWS_NOTHING(device->poll_command(cmd, 5000)); + TS_ASSERT_THROWS_NOTHING(per = device->get_command_poll_period(cmd)); + + TS_ASSERT(per == 5000); + +#ifdef WIN32 + Sleep(3000); +#else + this_thread::sleep_for(chrono::seconds{3}); +#endif + vector *poll_str; + TS_ASSERT_THROWS_NOTHING(poll_str = device->polling_status()); + + if (verbose) { + cout << poll_str->size() << " object(s) polled for device" << endl; + cout << endl; + for (unsigned int i = 0; i < poll_str->size(); i++) + cout << "Polling status = " << (*poll_str)[i] << endl; + cout << endl; + } + + auto nb_polled = BASIC_NB_POLL + 1; + for (unsigned int i = 0; i < poll_str->size(); i++) { + if ((*poll_str)[i].find("String_attr") != string::npos) { + nb_polled++; + } + if ((*poll_str)[i].find("IOStartPoll") != string::npos) { + nb_polled++; + } + } + + TS_ASSERT(poll_str->size() == nb_polled); + + delete poll_str; + } + + void test_min_polling_period(void) { +// +// WARNING, this test works only if device property min_poll_period set to 200 +// and cmd_min_poll_period set to IOExcept,500 +// + + TS_ASSERT_THROWS(device->poll_command("IOExcept", 300), Tango::DevFailed); + + TS_ASSERT_THROWS(device->poll_command("IOExcept", 100), Tango::DevFailed); + + TS_ASSERT_THROWS_NOTHING(device->poll_command("IOExcept", 500)); + +#ifdef WIN32 + Sleep(3000); +#else + this_thread::sleep_for(chrono::seconds{3}); +#endif + + TS_ASSERT_THROWS_NOTHING(device->poll_command("IOExcept", 2000)); + + DbData db; + vector prop_vs; + prop_vs.push_back("IOExcept"); + prop_vs.push_back("500"); + db.push_back(DbDatum("cmd_min_poll_period")); + db[0] << prop_vs; + TS_ASSERT_THROWS_NOTHING(device->put_property(db)); + } + + void test_stop_poll_command(void) { + string cmd{"IOArray1"}; + TS_ASSERT_THROWS_NOTHING(device->stop_poll_command(cmd)); + + bool poll; + TS_ASSERT_THROWS_NOTHING(poll = device->is_command_polled(cmd)); + + TS_ASSERT(poll == false); + + vector *poll_str; + TS_ASSERT_THROWS_NOTHING(poll_str = device->polling_status()); + + if (verbose) { + cout << poll_str->size() << " object(s) polled for device" << endl; + cout << endl; + for (unsigned int i = 0; i < poll_str->size(); i++) + cout << "Polling status = " << (*poll_str)[i] << endl; + cout << endl; + } + + auto nb_polled = BASIC_NB_POLL; + for (unsigned int i = 0; i < poll_str->size(); i++) { + if ((*poll_str)[i].find("String_attr") != string::npos) { + nb_polled++; + } + if ((*poll_str)[i].find("IOStartPoll") != string::npos) { + nb_polled++; + } + } + + TS_ASSERT(poll_str->size() == nb_polled); + + delete poll_str; + } + + void test_poll_attribute(void) { + + string attr{"Double_attr"}; + bool poll; + TS_ASSERT_THROWS_NOTHING(poll = device->is_attribute_polled(attr)); + + TS_ASSERT(poll == false); + + TS_ASSERT_THROWS_NOTHING(device->poll_attribute(attr, 3000)); + TS_ASSERT_THROWS_NOTHING(poll = device->is_attribute_polled(attr)); + + TS_ASSERT(poll == true); + + int per; + TS_ASSERT_THROWS_NOTHING(per = device->get_attribute_poll_period(attr)); + + TS_ASSERT(per == 3000); + +#ifdef WIN32 + Sleep(3000); +#else + this_thread::sleep_for(chrono::seconds{3}); +#endif + + TS_ASSERT_THROWS_NOTHING(device->poll_attribute(attr, 5000)); + TS_ASSERT_THROWS_NOTHING(per = device->get_attribute_poll_period(attr)); + + TS_ASSERT(per == 5000); + +#ifdef WIN32 + Sleep(3000); +#else + this_thread::sleep_for(chrono::seconds{3}); +#endif + + vector *poll_str; + TS_ASSERT_THROWS_NOTHING(poll_str = device->polling_status()); + + if (verbose) { + cout << poll_str->size() << " object(s) polled for device" << endl; + cout << endl; + for (unsigned int i = 0; i < poll_str->size(); i++) + cout << "Polling status = " << (*poll_str)[i] << endl; + cout << endl; + } + + auto nb_polled = BASIC_NB_POLL + 1; + for (unsigned int i = 0; i < poll_str->size(); i++) { + if ((*poll_str)[i].find("String_attr") != string::npos) { + nb_polled++; + } + if ((*poll_str)[i].find("IOStartPoll") != string::npos) { + nb_polled++; + } + } + + TS_ASSERT(poll_str->size() == nb_polled); + + delete poll_str; + } + + void test_stop_poll_attribute(void) { + string attr{"Double_attr"}; + TS_ASSERT_THROWS_NOTHING(device->stop_poll_attribute(attr)); + + bool poll; + TS_ASSERT_THROWS_NOTHING(poll = device->is_attribute_polled(attr)); + + TS_ASSERT(poll == false); + + vector *poll_str; + TS_ASSERT_THROWS_NOTHING(poll_str = device->polling_status()); + + if (verbose) { + cout << poll_str->size() << " object(s) polled for device" << endl; + cout << endl; + for (unsigned int i = 0; i < poll_str->size(); i++) + cout << "Polling status = " << (*poll_str)[i] << endl; + cout << endl; + } + + auto nb_polled = BASIC_NB_POLL; + for (unsigned int i = 0; i < poll_str->size(); i++) { + if ((*poll_str)[i].find("String_attr") != string::npos) { + nb_polled++; + } + if ((*poll_str)[i].find("IOStartPoll") != string::npos) { + nb_polled++; + } + } + + TS_ASSERT(poll_str->size() == nb_polled); + + delete poll_str; + } + + void test_poll_device_2(void) { + auto dev2 = new DeviceProxy(device2_name); + TS_ASSERT_THROWS_NOTHING(dev2->poll_attribute("PollLong_attr", 1000)); + CxxTest::TangoPrinter::restore_set("dev2_poll_PollLong_attr_1000"); + + this_thread::sleep_for(chrono::seconds{2}); + + vector polled_devs; + split_string(ref_polling_pool_conf[0], ',', polled_devs); + int nb_polled_devs = polled_devs.size(); + +// Add a device into device server and restart it +// Also add property to poll one of the device attribute + + + DbDevInfo my_device_info{ + new_dev.c_str(), + TEST_CLASS, + serv_name.c_str() + }; + + Database db{}; + TS_ASSERT_THROWS_NOTHING(db.add_device(my_device_info)); + + DbDatum poll_prop("polled_attr"); + vector poll_param; + poll_param.push_back("PollLong_attr"); + poll_param.push_back("1000"); + poll_prop << poll_param; + DbData db_poll; + db_poll.push_back(poll_prop); + TS_ASSERT_THROWS_NOTHING(db.put_device_property(new_dev.c_str(), db_poll)); + CxxTest::TangoPrinter::restore_set("reset_device_server"); + + auto admin_dev = new DeviceProxy(admin_dev_name); + TS_ASSERT_THROWS_NOTHING(admin_dev->command_inout("RestartServer")); + + this_thread::sleep_for(chrono::seconds{5}); + +// Read polling threads pool conf once more + + DeviceData da; + + DeviceProxy dev{device_name}; + TS_ASSERT_THROWS_NOTHING(da = dev.command_inout("PollingPoolTst")); + vector new_polling_pool_conf; + da >> new_polling_pool_conf; + + TS_ASSERT(ref_polling_pool_conf.size() == new_polling_pool_conf.size()); + split_string(new_polling_pool_conf[0], ',', polled_devs); + int new_nb_polled_devs = polled_devs.size(); + + TS_ASSERT(new_nb_polled_devs == nb_polled_devs + 1); + + auto iter = find(polled_devs.begin(), polled_devs.end(), new_dev); + TS_ASSERT(iter != polled_devs.end()); + } + + void test_change_polling_thread_number_and_add_2_more_devices(void) { + DbDevInfo my_device_info{ + new_dev1_th2.c_str(), + TEST_CLASS, + serv_name.c_str() + }; + + Database db{}; + TS_ASSERT_THROWS_NOTHING(db.add_device(my_device_info)); + + my_device_info.name = new_dev2_th2.c_str(); + TS_ASSERT_THROWS_NOTHING(db.add_device(my_device_info)); + + DbDatum pool_size("polling_threads_pool_size"); + DbData db_data; + + pool_size << 2L; + db_data.push_back(pool_size); + TS_ASSERT_THROWS_NOTHING(db.put_device_property(admin_dev_name.c_str(), db_data)); + + + DbDatum poll_prop("polled_attr"); + vector poll_param; + poll_param.push_back("PollLong_attr"); + poll_param.push_back("1000"); + poll_prop << poll_param; + DbData db_poll; + db_poll.push_back(poll_prop); + + TS_ASSERT_THROWS_NOTHING(db.put_device_property(new_dev1_th2.c_str(), db_poll)); + TS_ASSERT_THROWS_NOTHING(db.put_device_property(new_dev2_th2.c_str(), db_poll)); + CxxTest::TangoPrinter::restore_set("reset_device_server"); + + auto admin_dev = new DeviceProxy(admin_dev_name); + TS_ASSERT_THROWS_NOTHING(admin_dev->command_inout("RestartServer")); + + this_thread::sleep_for(chrono::seconds{5}); + +// Check new pool conf + + DeviceData dz; + + DeviceProxy dev(device_name); + TS_ASSERT_THROWS_NOTHING(dz = dev.command_inout("PollingPoolTst")); + + vector new_polling_pool_conf{}; + dz >> new_polling_pool_conf; + + TS_ASSERT(new_polling_pool_conf.size() == ref_polling_pool_conf.size() + 1); + + vector polled_devs{}; + split_string(new_polling_pool_conf[1], ',', polled_devs); + auto new_nb_polled_devs = polled_devs.size(); + + TS_ASSERT(new_nb_polled_devs == 2); + + auto iter = find(polled_devs.begin(), polled_devs.end(), new_dev1_th2); + TS_ASSERT(iter != polled_devs.end()); + + iter = find(polled_devs.begin(), polled_devs.end(), new_dev2_th2); + TS_ASSERT(iter != polled_devs.end()); + } + + void test_change_polling_thread_number_to_3_and_add_1_more_device(void) { + DbDevInfo my_device_info{ + new_dev1_th3.c_str(), + TEST_CLASS, + serv_name.c_str() + }; + + Database db{}; + TS_ASSERT_THROWS_NOTHING(db.add_device(my_device_info)); + + DbDatum pool_size3("polling_threads_pool_size"); + DbData db_data3; + + pool_size3 << 3L; + db_data3.push_back(pool_size3); + TS_ASSERT_THROWS_NOTHING(db.put_device_property(admin_dev_name.c_str(), db_data3)); + + DbDatum poll_prop("polled_attr"); + vector poll_param; + poll_param.push_back("PollLong_attr"); + poll_param.push_back("1000"); + poll_prop << poll_param; + DbData db_poll; + db_poll.push_back(poll_prop); + + TS_ASSERT_THROWS_NOTHING(db.put_device_property(new_dev1_th3.c_str(), db_poll)); + CxxTest::TangoPrinter::restore_set("reset_device_server"); + + auto admin_dev = new DeviceProxy(admin_dev_name); + TS_ASSERT_THROWS_NOTHING(admin_dev->command_inout("RestartServer")); + + this_thread::sleep_for(chrono::seconds{5}); + +// Check new pool conf + + DeviceData dx; + + DeviceProxy dev{device_name}; + TS_ASSERT_THROWS_NOTHING(dx = dev.command_inout("PollingPoolTst")); + + vector new_polling_pool_conf{}; + dx >> new_polling_pool_conf; + + TS_ASSERT(new_polling_pool_conf.size() == ref_polling_pool_conf.size() + 2); + + vector polled_devs; + split_string(new_polling_pool_conf[2], ',', polled_devs); + + auto new_nb_polled_devs = polled_devs.size(); + TS_ASSERT(new_nb_polled_devs == 1); + + auto iter = find(polled_devs.begin(), polled_devs.end(), new_dev1_th3); + TS_ASSERT(iter != polled_devs.end()); + } + + void test_delete_1_device_to_check_automatic_polling_pool_reconfiguration(void) { + Database db{}; + TS_ASSERT_THROWS_NOTHING(db.delete_device(new_dev1_th3)); + + auto admin_dev = new DeviceProxy(admin_dev_name); + TS_ASSERT_THROWS_NOTHING(admin_dev->command_inout("RestartServer")); + + this_thread::sleep_for(chrono::seconds{5}); + +// Check pool conf + + DeviceData dv; + + DeviceProxy dev{device_name}; + TS_ASSERT_THROWS_NOTHING(dv = dev.command_inout("PollingPoolTst")); + + vector new_polling_pool_conf; + dv >> new_polling_pool_conf; + + TS_ASSERT(new_polling_pool_conf.size() == ref_polling_pool_conf.size() + 1); + + vector polled_devs; + split_string(new_polling_pool_conf[1], ',', polled_devs); + auto new_nb_polled_devs = polled_devs.size(); + + TS_ASSERT(new_nb_polled_devs == 2); + + auto iter = find(polled_devs.begin(), polled_devs.end(), new_dev1_th2); + TS_ASSERT(iter != polled_devs.end()); + + iter = find(polled_devs.begin(), polled_devs.end(), new_dev2_th2); + TS_ASSERT(iter != polled_devs.end()); + } + + void reset_device_server() { + Database db{}; + + del_device_no_error(db, new_dev); + del_device_no_error(db, new_dev1_th2); + del_device_no_error(db, new_dev1_th3); + del_device_no_error(db, new_dev2_th2); + + DbDatum pool_conf("polling_threads_pool_conf"); + DbData db_data; + + pool_conf << ref_polling_pool_conf; + db_data.push_back(pool_conf); + db.put_device_property(admin_dev_name.c_str(), db_data); + + DbDatum del_prop("polling_threads_pool_size"); + db_data.clear(); + db_data.push_back(del_prop); + db.delete_device_property(admin_dev_name.c_str(), db_data); + + auto admin_dev = new DeviceProxy(admin_dev_name); + admin_dev->command_inout("RestartServer"); + + this_thread::sleep_for(chrono::seconds{5}); + } +}; + +void split_string(string &the_str, char delim, vector &splitted_str) { + string::size_type pos, start; + splitted_str.clear(); + + start = 0; + while ((pos = the_str.find(delim, start)) != string::npos) { + splitted_str.push_back(the_str.substr(start, pos - start)); + start = pos + 1; + } + + splitted_str.push_back(the_str.substr(start)); +} + + +void stop_poll_att_no_except(DeviceProxy *dev, const char *att_name) { + try { + dev->stop_poll_attribute(att_name); + } + catch (Tango::DevFailed &) {} + catch (CORBA::Exception &e) { + Except::print_exception(e); + exit(-1); + } +} + +void stop_poll_cmd_no_except(DeviceProxy *dev, const char *cmd_name) { + try { + dev->stop_poll_command(cmd_name); + } + catch (Tango::DevFailed &) {} + catch (CORBA::Exception &e) { + Except::print_exception(e); + exit(-1); + } +} + +void del_device_no_error(Database &db, string& d_name) { + try { + db.delete_device(d_name.c_str()); + } + catch (DevFailed &) {} +} + + +#undef cout +#endif // PollTestSuite_h diff --git a/cpp_test_suite/new_tests/cxx_pipe.cpp b/test/cpp_test_suite/new_tests/cxx_pipe.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_pipe.cpp rename to test/cpp_test_suite/new_tests/cxx_pipe.cpp diff --git a/cpp_test_suite/new_tests/cxx_pipe_conf.cpp b/test/cpp_test_suite/new_tests/cxx_pipe_conf.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_pipe_conf.cpp rename to test/cpp_test_suite/new_tests/cxx_pipe_conf.cpp diff --git a/cpp_test_suite/new_tests/cxx_poll.cpp b/test/cpp_test_suite/new_tests/cxx_poll.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_poll.cpp rename to test/cpp_test_suite/new_tests/cxx_poll.cpp diff --git a/cpp_test_suite/new_tests/cxx_poll_admin.cpp b/test/cpp_test_suite/new_tests/cxx_poll_admin.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_poll_admin.cpp rename to test/cpp_test_suite/new_tests/cxx_poll_admin.cpp diff --git a/test/cpp_test_suite/new_tests/cxx_reconnection_zmq.cpp b/test/cpp_test_suite/new_tests/cxx_reconnection_zmq.cpp new file mode 100644 index 000000000..b218da793 --- /dev/null +++ b/test/cpp_test_suite/new_tests/cxx_reconnection_zmq.cpp @@ -0,0 +1,234 @@ +// +// Created by ingvord on 12/14/16. +// +#ifndef RecoZmqTestSuite_h +#define RecoZmqTestSuite_h + + +#include +#include +#include +#include +#include + +using namespace Tango; +using namespace std; + +#define cout cout << "\t" +#define coutv if (verbose == true) cout + +#undef SUITE_NAME +#define SUITE_NAME RecoZmqTestSuite + +class EventCallback : public Tango::CallBack +{ +public: + EventCallback() { }; + ~EventCallback() { }; + void push_event( Tango::EventData *ed ){ + cout << "In callback with error flag = " << std::boolalpha << ed->err << endl; + if(ed->err) { + cb_err++; + cout << "Error: " << ed->errors[0].reason << endl; + } else { + cb_executed++; + } + } + + + int cb_executed; + int cb_err; +}; + +class RecoZmqTestSuite : public CxxTest::TestSuite { +protected: + DeviceProxy *device1, *device2; + string device1_name, device2_name, device1_instance_name, device2_instance_name; + bool verbose; + EventCallback eventCallback; + +public: + SUITE_NAME() : + device1_instance_name{"test"},//TODO pass via cl + device2_instance_name{"test2"}, + eventCallback{} + { + +// +// Arguments check ------------------------------------------------- +// + + device1_name = CxxTest::TangoPrinter::get_param("device1"); + device2_name = CxxTest::TangoPrinter::get_param("device20"); + + verbose = CxxTest::TangoPrinter::is_param_defined("verbose"); + + CxxTest::TangoPrinter::validate_args(); + + +// +// Initialization -------------------------------------------------- +// + + try { + device1 = new DeviceProxy(device1_name); + device2 = new DeviceProxy(device2_name); + + //TODO start server 2 and set fallback point + CxxTest::TangoPrinter::start_server(device2_instance_name); + CxxTest::TangoPrinter::restore_set("test2/debian8/20 started."); + + //sleep 18 && start_server "@INST_NAME@" & + thread([this]() { + Tango_sleep(18); + CxxTest::TangoPrinter::start_server(device1_instance_name); + }).detach(); + + //sleep 62 && start_server "@INST_NAME@" & + thread([this]() { + Tango_sleep(62); + CxxTest::TangoPrinter::start_server(device1_instance_name); + }).detach(); + } + catch (CORBA::Exception &e) { + Except::print_exception(e); + exit(-1); + } + + } + + virtual ~SUITE_NAME() { + if (CxxTest::TangoPrinter::is_restore_set("test2/debian8/20 started.")) + CxxTest::TangoPrinter::kill_server(); + + CxxTest::TangoPrinter::start_server(device1_instance_name); + + delete device1; + delete device2; + } + + static SUITE_NAME *createSuite() { + return new SUITE_NAME(); + } + + static void destroySuite(SUITE_NAME *suite) { + delete suite; + } + +// +// Tests ------------------------------------------------------- +// + +// +// Subscribe to a user event +// + void test_subscribe_to_user_event(void) { + string att_name("event_change_tst"); + + const vector filters; + eventCallback.cb_executed = 0; + eventCallback.cb_err = 0; + + TS_ASSERT_THROWS_NOTHING(device1->subscribe_event(att_name, Tango::USER_EVENT, &eventCallback, filters)); + +// +// Fire one event +// + + TS_ASSERT_THROWS_NOTHING(device1->command_inout("IOPushEvent")); + TS_ASSERT_THROWS_NOTHING(device1->command_inout("IOPushEvent")); + + Tango_sleep(1); + + coutv << "Callback execution before re-connection = " << eventCallback.cb_executed << endl; + coutv << "Callback error before re-connection = " << eventCallback.cb_err << endl; + + TS_ASSERT_EQUALS (eventCallback.cb_executed, 3); + TS_ASSERT_EQUALS (eventCallback.cb_err, 0); + +// +// Kill device server (using its admin device) +// + + string adm_name = device1->adm_name(); + DeviceProxy admin_dev(adm_name); + TS_ASSERT_THROWS_NOTHING(admin_dev.command_inout("kill")); + +// +// Wait for some error and re-connection +// + + Tango_sleep(40); + +// +// Check error and re-connection +// + + coutv << "Callback execution after re-connection = " << eventCallback.cb_executed << endl; + coutv << "Callback error after re-connection = " << eventCallback.cb_err << endl; + + TS_ASSERT_LESS_THAN_EQUALS (1, eventCallback.cb_err); + TS_ASSERT_EQUALS (eventCallback.cb_executed, 4); + +// +// Fire another event +// + + TS_ASSERT_THROWS_NOTHING(device1->command_inout("IOPushEvent")); + TS_ASSERT_THROWS_NOTHING(device1->command_inout("IOPushEvent")); + + Tango_sleep(1); + + coutv << "Callback execution after re-connection and event = " << eventCallback.cb_executed << endl; + coutv << "Callback error after re-connection and event = " << eventCallback.cb_err << endl; + + TS_ASSERT_EQUALS (eventCallback.cb_executed, 6); + TS_ASSERT_LESS_THAN_EQUALS (1, eventCallback.cb_err); + } + +// +// Clear call back counters and kill device server once more +// + void test_clear_cb_kill_ds(void) { + eventCallback.cb_executed = 0; + eventCallback.cb_err = 0; + + string adm_name = device1->adm_name(); + DeviceProxy admin_dev(adm_name); + TS_ASSERT_THROWS_NOTHING(admin_dev.command_inout("kill")); + +// +// Wait for some error and re-connection +// + + Tango_sleep(40); + +// +// Check error and re-connection +// + + coutv << "Callback execution after second re-connection = " << eventCallback.cb_executed << endl; + coutv << "Callback error after second re-connection = " << eventCallback.cb_err << endl; + + TS_ASSERT_LESS_THAN_EQUALS (1, eventCallback.cb_err); + TS_ASSERT_EQUALS (eventCallback.cb_executed, 1); + +// +// Fire yet another event +// + + TS_ASSERT_THROWS_NOTHING(device1->command_inout("IOPushEvent")); + + Tango_sleep(2); + + coutv << "Callback execution after second re-connection and event = " << eventCallback.cb_executed << endl; + coutv << "Callback error after second re-connection and event = " << eventCallback.cb_err << endl; + + TS_ASSERT_EQUALS (eventCallback.cb_executed, 2); + TS_ASSERT_LESS_THAN_EQUALS (1, eventCallback.cb_err); + } +}; + +#undef cout +#endif // RecoZmqTestSuite_h + diff --git a/cpp_test_suite/new_tests/cxx_seq_vec.cpp b/test/cpp_test_suite/new_tests/cxx_seq_vec.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_seq_vec.cpp rename to test/cpp_test_suite/new_tests/cxx_seq_vec.cpp diff --git a/test/cpp_test_suite/new_tests/cxx_server_event.cpp b/test/cpp_test_suite/new_tests/cxx_server_event.cpp new file mode 100644 index 000000000..8b3fd29f3 --- /dev/null +++ b/test/cpp_test_suite/new_tests/cxx_server_event.cpp @@ -0,0 +1,150 @@ +// +// Created by ingvord on 12/14/16. +// +#ifndef ServerEventTestSuite_h +#define ServerEventTestSuite_h + + +#include +#include +#include +#include + +using namespace Tango; +using namespace std; + +#define cout cout << "\t" +#define coutv if (verbose == true) cout + +#undef SUITE_NAME +#define SUITE_NAME ServerEventTestSuite + +class ServerEventTestSuite : public CxxTest::TestSuite { +protected: + DeviceProxy *device1, *device2; + string device1_name, device2_name, device1_instance_name, device2_instance_name; + bool verbose; + DevLong eve_id; + +public: + SUITE_NAME(): + device1_instance_name{"test"},//TODO pass via cl + device2_instance_name{"test2"} + { + +// +// Arguments check ------------------------------------------------- +// + + device1_name = CxxTest::TangoPrinter::get_param("device1"); + device2_name = CxxTest::TangoPrinter::get_param("device20"); + + verbose = CxxTest::TangoPrinter::is_param_defined("verbose"); + + CxxTest::TangoPrinter::validate_args(); + + +// +// Initialization -------------------------------------------------- +// + + try { + device1 = new DeviceProxy(device1_name); + device2 = new DeviceProxy(device2_name); + + //TODO start server 2 and set fallback point + CxxTest::TangoPrinter::start_server(device2_instance_name); + CxxTest::TangoPrinter::restore_set("test2/debian8/20 started."); + } + catch (CORBA::Exception &e) { + Except::print_exception(e); + exit(-1); + } + + } + + virtual ~SUITE_NAME() { + if (CxxTest::TangoPrinter::is_restore_set("test2/debian8/20 started.")) + CxxTest::TangoPrinter::kill_server(); + + CxxTest::TangoPrinter::start_server(device1_instance_name); + + delete device1; + delete device2; + } + + static SUITE_NAME *createSuite() { + return new SUITE_NAME(); + } + + static void destroySuite(SUITE_NAME *suite) { + delete suite; + } + +// +// Tests ------------------------------------------------------- +// + +// +// Ask the device server to subscribe to an event +// + void test_device_server_subscribe_to_event(void) { + coutv << endl << "new DeviceProxy(" << device1->name() << ") returned" << endl << endl; + + + vector vs{device2_name, "Short_attr", "periodic"}; + + DeviceData dd_in, dd_out; + dd_in << vs; + TS_ASSERT_THROWS_NOTHING(dd_out = device1->command_inout("IOSubscribeEvent", dd_in)); + dd_out >> eve_id; + } + + + +// +// Wait for event to be executed +// + + void test_wait_event(void) { + Tango_sleep(3); + + DeviceData da; + TS_ASSERT_THROWS_NOTHING(da = device1->command_inout("IOGetCbExecuted")); + Tango::DevLong cb; + da >> cb; + + coutv << "cb executed = " << cb << endl; + TS_ASSERT_LESS_THAN_EQUALS(2, cb); + TS_ASSERT_LESS_THAN_EQUALS(cb, 4); + } + +// +// Ask server to unsubsribe from event +// + void test_server_unsubscribes_from_event(void) { + DeviceData dd_un; + dd_un << eve_id; + + DeviceData da; + TS_ASSERT_THROWS_NOTHING(device1->command_inout("IOUnSubscribeEvent", dd_un)); + TS_ASSERT_THROWS_NOTHING(da = device1->command_inout("IOGetCbExecuted")); + + Tango::DevLong cb; + da >> cb; + + Tango_sleep(2); + TS_ASSERT_THROWS_NOTHING(da = device1->command_inout("IOGetCbExecuted")); + Tango::DevLong cb2; + da >> cb2; + + TS_ASSERT_EQUALS(cb2, cb); + } +}; + +#undef cout +#endif // ServerEventTestSuite_h + + + + diff --git a/cpp_test_suite/new_tests/cxx_signal.cpp b/test/cpp_test_suite/new_tests/cxx_signal.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_signal.cpp rename to test/cpp_test_suite/new_tests/cxx_signal.cpp diff --git a/test/cpp_test_suite/new_tests/cxx_stateless_subscription.cpp b/test/cpp_test_suite/new_tests/cxx_stateless_subscription.cpp new file mode 100644 index 000000000..e2eaef62d --- /dev/null +++ b/test/cpp_test_suite/new_tests/cxx_stateless_subscription.cpp @@ -0,0 +1,157 @@ +// +// Created by ingvord on 12/14/16. +// +#ifndef StatelessSubTestSuite_h +#define StatelessSubTestSuite_h + + +#include +#include +#include +#include +#include + +using namespace Tango; +using namespace std; + +#define cout cout << "\t" +#define coutv if (verbose == true) cout + +#undef SUITE_NAME +#define SUITE_NAME StatelessSubTestSuite + +class EventCallback : public Tango::CallBack { +public: + EventCallback() {}; + + ~EventCallback() {}; + + void push_event(Tango::EventData *ed) { + cout << "In callback with error flag = " << std::boolalpha << ed->err << endl; + if (ed->err) { + cb_err++; + cout << "Error: " << ed->errors[0].reason << endl; + } else { + cb_executed++; + } + } + + + int cb_executed; + int cb_err; +}; + +class StatelessSubTestSuite : public CxxTest::TestSuite { +protected: + DeviceProxy *device2; + string device2_name, device1_instance_name, device2_instance_name; + bool verbose; + EventCallback eventCallback; + +public: + SUITE_NAME() : + device2_instance_name{"test2"}, + eventCallback{} { + +// +// Arguments check ------------------------------------------------- +// + + device2_name = CxxTest::TangoPrinter::get_param("device20"); + + verbose = CxxTest::TangoPrinter::is_param_defined("verbose"); + + CxxTest::TangoPrinter::validate_args(); + + +// +// Initialization -------------------------------------------------- +// + + try { + device2 = new DeviceProxy(device2_name); + + //sleep 24 && start_server "@INST_NAME@2" & + thread([this]() { + Tango_sleep(24); + CxxTest::TangoPrinter::start_server(device2_instance_name); + CxxTest::TangoPrinter::restore_set("test2/debian8/20 started."); + }).detach(); + } + catch (CORBA::Exception &e) { + Except::print_exception(e); + exit(-1); + } + + } + + virtual ~SUITE_NAME() { + if (CxxTest::TangoPrinter::is_restore_set("test2/debian8/20 started.")) + CxxTest::TangoPrinter::kill_server(); + + CxxTest::TangoPrinter::start_server("test"); + + delete device2; + } + + static SUITE_NAME *createSuite() { + return new SUITE_NAME(); + } + + static void destroySuite(SUITE_NAME *suite) { + delete suite; + } + +// +// Tests ------------------------------------------------------- +// + +// +// Subscribe to event with stateless flag set +// + void test_unsubscribe_from_stateless_event(void) { + string att_name("event_change_tst"); + + int eventID = 0; + const vector filters; + eventCallback.cb_executed = 0; + eventCallback.cb_err = 0; + + TS_ASSERT_THROWS_NOTHING( + eventID = device2->subscribe_event(att_name, Tango::CHANGE_EVENT, &eventCallback, filters, true)); + + Tango_sleep(6); + + TS_ASSERT_THROWS_NOTHING(device2->unsubscribe_event(eventID)); + } + +// +// Re-subscribe +// + void test_re_subscribe_and_check(void) { + string att_name("event_change_tst"); + int eventID; + TS_ASSERT_THROWS_NOTHING(eventID = device2->subscribe_event(att_name, Tango::CHANGE_EVENT, &eventCallback, true)); + +// +// Wait for connection and event +// + + Tango_sleep(40); + +// +// Check error and connection +// + + coutv << "cb err = " << eventCallback.cb_err << endl; + coutv << "cb executed = " << eventCallback.cb_executed << endl; + + TS_ASSERT_LESS_THAN_EQUALS (1, eventCallback.cb_err); + TS_ASSERT_LESS_THAN_EQUALS (1, eventCallback.cb_executed); + } +}; + +#undef cout +#endif // StatelessSubTestSuite_h + + diff --git a/cpp_test_suite/new_tests/cxx_syntax.cpp b/test/cpp_test_suite/new_tests/cxx_syntax.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_syntax.cpp rename to test/cpp_test_suite/new_tests/cxx_syntax.cpp diff --git a/cpp_test_suite/new_tests/cxx_templ_cmd.cpp b/test/cpp_test_suite/new_tests/cxx_templ_cmd.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_templ_cmd.cpp rename to test/cpp_test_suite/new_tests/cxx_templ_cmd.cpp diff --git a/cpp_test_suite/new_tests/cxx_template.cpp b/test/cpp_test_suite/new_tests/cxx_template.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_template.cpp rename to test/cpp_test_suite/new_tests/cxx_template.cpp diff --git a/cpp_test_suite/new_tests/cxx_test_state_on.cpp b/test/cpp_test_suite/new_tests/cxx_test_state_on.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_test_state_on.cpp rename to test/cpp_test_suite/new_tests/cxx_test_state_on.cpp diff --git a/cpp_test_suite/new_tests/cxx_write_attr_hard.cpp b/test/cpp_test_suite/new_tests/cxx_write_attr_hard.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_write_attr_hard.cpp rename to test/cpp_test_suite/new_tests/cxx_write_attr_hard.cpp diff --git a/cpp_test_suite/new_tests/cxx_z00_dyn_cmd.cpp b/test/cpp_test_suite/new_tests/cxx_z00_dyn_cmd.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_z00_dyn_cmd.cpp rename to test/cpp_test_suite/new_tests/cxx_z00_dyn_cmd.cpp diff --git a/cpp_test_suite/new_tests/cxx_zmcast01_simple.cpp b/test/cpp_test_suite/new_tests/cxx_zmcast01_simple.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_zmcast01_simple.cpp rename to test/cpp_test_suite/new_tests/cxx_zmcast01_simple.cpp diff --git a/cpp_test_suite/new_tests/cxx_zmcast02_local_remote.cpp b/test/cpp_test_suite/new_tests/cxx_zmcast02_local_remote.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_zmcast02_local_remote.cpp rename to test/cpp_test_suite/new_tests/cxx_zmcast02_local_remote.cpp diff --git a/cpp_test_suite/new_tests/cxx_zmcast03_svr_local_remote.cpp b/test/cpp_test_suite/new_tests/cxx_zmcast03_svr_local_remote.cpp similarity index 100% rename from cpp_test_suite/new_tests/cxx_zmcast03_svr_local_remote.cpp rename to test/cpp_test_suite/new_tests/cxx_zmcast03_svr_local_remote.cpp diff --git a/cpp_test_suite/new_tests/out/always_hook.out b/test/cpp_test_suite/new_tests/out/always_hook.out similarity index 97% rename from cpp_test_suite/new_tests/out/always_hook.out rename to test/cpp_test_suite/new_tests/out/always_hook.out index c7578b1e3..9d6b4b416 100644 --- a/cpp_test_suite/new_tests/out/always_hook.out +++ b/test/cpp_test_suite/new_tests/out/always_hook.out @@ -1,260 +1,260 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cpp_test_suite/new_tests/out/class_dev_signal.out b/test/cpp_test_suite/new_tests/out/class_dev_signal.out similarity index 100% rename from cpp_test_suite/new_tests/out/class_dev_signal.out rename to test/cpp_test_suite/new_tests/out/class_dev_signal.out diff --git a/cpp_test_suite/new_tests/out/class_signal.out b/test/cpp_test_suite/new_tests/out/class_signal.out similarity index 100% rename from cpp_test_suite/new_tests/out/class_signal.out rename to test/cpp_test_suite/new_tests/out/class_signal.out diff --git a/cpp_test_suite/new_tests/out/dserver_cmd.out b/test/cpp_test_suite/new_tests/out/dserver_cmd.out similarity index 97% rename from cpp_test_suite/new_tests/out/dserver_cmd.out rename to test/cpp_test_suite/new_tests/out/dserver_cmd.out index 22587b6c3..362f0875e 100644 --- a/cpp_test_suite/new_tests/out/dserver_cmd.out +++ b/test/cpp_test_suite/new_tests/out/dserver_cmd.out @@ -1,280 +1,280 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cpp_test_suite/new_tests/out/signal.out b/test/cpp_test_suite/new_tests/out/signal.out similarity index 97% rename from cpp_test_suite/new_tests/out/signal.out rename to test/cpp_test_suite/new_tests/out/signal.out index 096c10751..f83dd6cdd 100644 --- a/cpp_test_suite/new_tests/out/signal.out +++ b/test/cpp_test_suite/new_tests/out/signal.out @@ -1,184 +1,184 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cpp_test_suite/old_tests/CMakeLists.txt b/test/cpp_test_suite/old_tests/CMakeLists.txt similarity index 89% rename from cpp_test_suite/old_tests/CMakeLists.txt rename to test/cpp_test_suite/old_tests/CMakeLists.txt index 21e1fa37f..668a8a6b8 100644 --- a/cpp_test_suite/old_tests/CMakeLists.txt +++ b/test/cpp_test_suite/old_tests/CMakeLists.txt @@ -23,17 +23,12 @@ set(TESTS acc_right multiple_new new_devproxy obj_prop - poll_attr - Poll poll_except - poll_met - poll_pool print_data print_data_hist prop_list rds read_attr - read_hist read_hist_ext reconnect_attr reconnect @@ -41,7 +36,6 @@ set(TESTS acc_right ring_depth size state_attr - StopPoll sub_dev unlock wait_mcast_dev @@ -69,12 +63,6 @@ add_test(NAME "old_tests::write_attr" COMMAND $ ${DEV1} add_test(NAME "old_tests::copy_devproxy" COMMAND $ ${DEV1} ${DEV2} ${DEV3}) add_test(NAME "old_tests::attr_misc" COMMAND $ ${DEV1}) add_test(NAME "old_tests::obj_prop" COMMAND $) - -configure_file(test_polling.sh.cmake test_polling.sh @ONLY) -execute_process(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/test_polling.sh) -add_test(NAME "old_tests::polling" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test_polling.sh - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - add_test(NAME "old_tests::attr_proxy" COMMAND $ ${DEV1}/Short_attr_rw) add_test(NAME "old_tests::write_attr_3" COMMAND $ ${DEV1} 10) add_test(NAME "old_tests::read_hist_ext" COMMAND $ ${DEV1}) diff --git a/cpp_test_suite/old_tests/ConfEventBugClient.cpp b/test/cpp_test_suite/old_tests/ConfEventBugClient.cpp similarity index 100% rename from cpp_test_suite/old_tests/ConfEventBugClient.cpp rename to test/cpp_test_suite/old_tests/ConfEventBugClient.cpp diff --git a/cpp_test_suite/old_tests/Poll.cpp b/test/cpp_test_suite/old_tests/Poll.cpp similarity index 100% rename from cpp_test_suite/old_tests/Poll.cpp rename to test/cpp_test_suite/old_tests/Poll.cpp diff --git a/cpp_test_suite/old_tests/README b/test/cpp_test_suite/old_tests/README similarity index 100% rename from cpp_test_suite/old_tests/README rename to test/cpp_test_suite/old_tests/README diff --git a/cpp_test_suite/old_tests/StopPoll.cpp b/test/cpp_test_suite/old_tests/StopPoll.cpp similarity index 100% rename from cpp_test_suite/old_tests/StopPoll.cpp rename to test/cpp_test_suite/old_tests/StopPoll.cpp diff --git a/cpp_test_suite/old_tests/acc_right.cpp b/test/cpp_test_suite/old_tests/acc_right.cpp similarity index 100% rename from cpp_test_suite/old_tests/acc_right.cpp rename to test/cpp_test_suite/old_tests/acc_right.cpp diff --git a/cpp_test_suite/old_tests/add_rem_attr.cpp b/test/cpp_test_suite/old_tests/add_rem_attr.cpp similarity index 100% rename from cpp_test_suite/old_tests/add_rem_attr.cpp rename to test/cpp_test_suite/old_tests/add_rem_attr.cpp diff --git a/cpp_test_suite/old_tests/add_rem_dev.cpp b/test/cpp_test_suite/old_tests/add_rem_dev.cpp similarity index 100% rename from cpp_test_suite/old_tests/add_rem_dev.cpp rename to test/cpp_test_suite/old_tests/add_rem_dev.cpp diff --git a/cpp_test_suite/old_tests/allowed_cmd.cpp b/test/cpp_test_suite/old_tests/allowed_cmd.cpp similarity index 100% rename from cpp_test_suite/old_tests/allowed_cmd.cpp rename to test/cpp_test_suite/old_tests/allowed_cmd.cpp diff --git a/cpp_test_suite/old_tests/att_conf.cpp b/test/cpp_test_suite/old_tests/att_conf.cpp similarity index 100% rename from cpp_test_suite/old_tests/att_conf.cpp rename to test/cpp_test_suite/old_tests/att_conf.cpp diff --git a/cpp_test_suite/old_tests/attr_conf_test.cpp b/test/cpp_test_suite/old_tests/attr_conf_test.cpp similarity index 100% rename from cpp_test_suite/old_tests/attr_conf_test.cpp rename to test/cpp_test_suite/old_tests/attr_conf_test.cpp diff --git a/cpp_test_suite/old_tests/attr_manip.cpp b/test/cpp_test_suite/old_tests/attr_manip.cpp similarity index 100% rename from cpp_test_suite/old_tests/attr_manip.cpp rename to test/cpp_test_suite/old_tests/attr_manip.cpp diff --git a/cpp_test_suite/old_tests/attr_misc.cpp b/test/cpp_test_suite/old_tests/attr_misc.cpp similarity index 100% rename from cpp_test_suite/old_tests/attr_misc.cpp rename to test/cpp_test_suite/old_tests/attr_misc.cpp diff --git a/cpp_test_suite/old_tests/attr_proxy.cpp b/test/cpp_test_suite/old_tests/attr_proxy.cpp similarity index 100% rename from cpp_test_suite/old_tests/attr_proxy.cpp rename to test/cpp_test_suite/old_tests/attr_proxy.cpp diff --git a/cpp_test_suite/old_tests/attr_types.cpp b/test/cpp_test_suite/old_tests/attr_types.cpp similarity index 100% rename from cpp_test_suite/old_tests/attr_types.cpp rename to test/cpp_test_suite/old_tests/attr_types.cpp diff --git a/cpp_test_suite/old_tests/cmd_inout.cpp b/test/cpp_test_suite/old_tests/cmd_inout.cpp similarity index 100% rename from cpp_test_suite/old_tests/cmd_inout.cpp rename to test/cpp_test_suite/old_tests/cmd_inout.cpp diff --git a/cpp_test_suite/old_tests/cmd_types.cpp b/test/cpp_test_suite/old_tests/cmd_types.cpp similarity index 97% rename from cpp_test_suite/old_tests/cmd_types.cpp rename to test/cpp_test_suite/old_tests/cmd_types.cpp index ddcbf14d6..1ee6b9819 100644 --- a/cpp_test_suite/old_tests/cmd_types.cpp +++ b/test/cpp_test_suite/old_tests/cmd_types.cpp @@ -818,8 +818,8 @@ int main(int argc, char **argv) DeviceData din,dout; DevVarStringArray *in = new DevVarStringArray(2); in->length(2); - (*in)[0] = CORBA::string_dup("abc"); - (*in)[1] = CORBA::string_dup("def"); + (*in)[0] = Tango::string_dup("abc"); + (*in)[1] = Tango::string_dup("def"); din << in; try { @@ -881,8 +881,8 @@ int main(int argc, char **argv) in->lvalue[0] = 111; in->lvalue[1] = 222; in->svalue.length(2); - in->svalue[0] = CORBA::string_dup("zxc"); - in->svalue[1] = CORBA::string_dup("qwe"); + in->svalue[0] = Tango::string_dup("zxc"); + in->svalue[1] = Tango::string_dup("qwe"); din << in; try { @@ -910,8 +910,8 @@ int main(int argc, char **argv) in.lvalue[0] = 111; in.lvalue[1] = 222; in.svalue.length(2); - in.svalue[0] = CORBA::string_dup("zxc"); - in.svalue[1] = CORBA::string_dup("qwe"); + in.svalue[0] = Tango::string_dup("zxc"); + in.svalue[1] = Tango::string_dup("qwe"); din << in; try { @@ -980,9 +980,9 @@ int main(int argc, char **argv) in->dvalue[0] = 1.11; in->dvalue[1] = 22.2; in->svalue.length(3); - in->svalue[0] = CORBA::string_dup("iop"); - in->svalue[1] = CORBA::string_dup("jkl"); - in->svalue[2] = CORBA::string_dup("bnm"); + in->svalue[0] = Tango::string_dup("iop"); + in->svalue[1] = Tango::string_dup("jkl"); + in->svalue[2] = Tango::string_dup("bnm"); din << in; try { @@ -1012,9 +1012,9 @@ int main(int argc, char **argv) in.dvalue[0] = 1.11; in.dvalue[1] = 22.2; in.svalue.length(3); - in.svalue[0] = CORBA::string_dup("iop"); - in.svalue[1] = CORBA::string_dup("jkl"); - in.svalue[2] = CORBA::string_dup("bnm"); + in.svalue[0] = Tango::string_dup("iop"); + in.svalue[1] = Tango::string_dup("jkl"); + in.svalue[2] = Tango::string_dup("bnm"); din << in; try { @@ -1045,7 +1045,7 @@ int main(int argc, char **argv) in.encoded_data.length(2); in.encoded_data[0] = 11; in.encoded_data[1] = 22; - in.encoded_format = CORBA::string_dup("Sent"); + in.encoded_format = Tango::string_dup("Sent"); din << in; try { diff --git a/cpp_test_suite/old_tests/copy_devproxy.cpp b/test/cpp_test_suite/old_tests/copy_devproxy.cpp similarity index 100% rename from cpp_test_suite/old_tests/copy_devproxy.cpp rename to test/cpp_test_suite/old_tests/copy_devproxy.cpp diff --git a/cpp_test_suite/old_tests/ds_cache.cpp b/test/cpp_test_suite/old_tests/ds_cache.cpp similarity index 100% rename from cpp_test_suite/old_tests/ds_cache.cpp rename to test/cpp_test_suite/old_tests/ds_cache.cpp diff --git a/cpp_test_suite/old_tests/helper.cpp b/test/cpp_test_suite/old_tests/helper.cpp similarity index 98% rename from cpp_test_suite/old_tests/helper.cpp rename to test/cpp_test_suite/old_tests/helper.cpp index d602c712f..46a2d4e16 100644 --- a/cpp_test_suite/old_tests/helper.cpp +++ b/test/cpp_test_suite/old_tests/helper.cpp @@ -4,7 +4,7 @@ #include -#include +#include using namespace Tango; @@ -412,8 +412,8 @@ int main(int argc, char **argv) DevVarStringArray *in_dvstra = new DevVarStringArray(2); const DevVarStringArray *received_dvstra; in_dvstra->length(2); - (*in_dvstra)[0] = CORBA::string_dup("abc"); - (*in_dvstra)[1] = CORBA::string_dup("def"); + (*in_dvstra)[0] = Tango::string_dup("abc"); + (*in_dvstra)[1] = Tango::string_dup("def"); dev_helper->command_inout("IOStringArray",in_dvstra,received_dvstra); assert( !strcmp((*received_dvstra)[0],"def") ); assert( !strcmp((*received_dvstra)[1],"abc") ); diff --git a/cpp_test_suite/old_tests/lock.cpp b/test/cpp_test_suite/old_tests/lock.cpp similarity index 100% rename from cpp_test_suite/old_tests/lock.cpp rename to test/cpp_test_suite/old_tests/lock.cpp diff --git a/cpp_test_suite/old_tests/locked_device.cpp b/test/cpp_test_suite/old_tests/locked_device.cpp similarity index 100% rename from cpp_test_suite/old_tests/locked_device.cpp rename to test/cpp_test_suite/old_tests/locked_device.cpp diff --git a/cpp_test_suite/old_tests/locked_device_cmd.h.cmake b/test/cpp_test_suite/old_tests/locked_device_cmd.h.cmake similarity index 100% rename from cpp_test_suite/old_tests/locked_device_cmd.h.cmake rename to test/cpp_test_suite/old_tests/locked_device_cmd.h.cmake diff --git a/cpp_test_suite/old_tests/mem_att.cpp b/test/cpp_test_suite/old_tests/mem_att.cpp similarity index 100% rename from cpp_test_suite/old_tests/mem_att.cpp rename to test/cpp_test_suite/old_tests/mem_att.cpp diff --git a/cpp_test_suite/old_tests/misc_devattr.cpp b/test/cpp_test_suite/old_tests/misc_devattr.cpp similarity index 100% rename from cpp_test_suite/old_tests/misc_devattr.cpp rename to test/cpp_test_suite/old_tests/misc_devattr.cpp diff --git a/cpp_test_suite/old_tests/misc_devdata.cpp b/test/cpp_test_suite/old_tests/misc_devdata.cpp similarity index 100% rename from cpp_test_suite/old_tests/misc_devdata.cpp rename to test/cpp_test_suite/old_tests/misc_devdata.cpp diff --git a/cpp_test_suite/old_tests/misc_devproxy.cpp b/test/cpp_test_suite/old_tests/misc_devproxy.cpp similarity index 100% rename from cpp_test_suite/old_tests/misc_devproxy.cpp rename to test/cpp_test_suite/old_tests/misc_devproxy.cpp diff --git a/cpp_test_suite/old_tests/multiple_new.cpp b/test/cpp_test_suite/old_tests/multiple_new.cpp similarity index 100% rename from cpp_test_suite/old_tests/multiple_new.cpp rename to test/cpp_test_suite/old_tests/multiple_new.cpp diff --git a/cpp_test_suite/old_tests/new_devproxy.cpp b/test/cpp_test_suite/old_tests/new_devproxy.cpp similarity index 100% rename from cpp_test_suite/old_tests/new_devproxy.cpp rename to test/cpp_test_suite/old_tests/new_devproxy.cpp diff --git a/cpp_test_suite/old_tests/obj_prop.cpp b/test/cpp_test_suite/old_tests/obj_prop.cpp similarity index 100% rename from cpp_test_suite/old_tests/obj_prop.cpp rename to test/cpp_test_suite/old_tests/obj_prop.cpp diff --git a/cpp_test_suite/old_tests/poll_except.cpp b/test/cpp_test_suite/old_tests/poll_except.cpp similarity index 100% rename from cpp_test_suite/old_tests/poll_except.cpp rename to test/cpp_test_suite/old_tests/poll_except.cpp diff --git a/cpp_test_suite/old_tests/print_data.cpp b/test/cpp_test_suite/old_tests/print_data.cpp similarity index 93% rename from cpp_test_suite/old_tests/print_data.cpp rename to test/cpp_test_suite/old_tests/print_data.cpp index 6d267e3a3..dce21c7c9 100644 --- a/cpp_test_suite/old_tests/print_data.cpp +++ b/test/cpp_test_suite/old_tests/print_data.cpp @@ -219,9 +219,9 @@ int main(int argc, char **argv) DevVarStringArray *str_arr = new DevVarStringArray(2); vector str_arr_out; str_arr->length(3); - (*str_arr)[0] = CORBA::string_dup("abc"); - (*str_arr)[1] = CORBA::string_dup("def"); - (*str_arr)[2] = CORBA::string_dup("ghi"); + (*str_arr)[0] = Tango::string_dup("abc"); + (*str_arr)[1] = Tango::string_dup("def"); + (*str_arr)[2] = Tango::string_dup("ghi"); din << str_arr; cout << din << endl; din >> str_arr_out; @@ -240,8 +240,8 @@ int main(int argc, char **argv) lgstr_arr->lvalue[0] = 1110; lgstr_arr->lvalue[1] = 2220; lgstr_arr->svalue.length(2); - lgstr_arr->svalue[0] = CORBA::string_dup("zxc"); - lgstr_arr->svalue[1] = CORBA::string_dup("qwe"); + lgstr_arr->svalue[0] = Tango::string_dup("zxc"); + lgstr_arr->svalue[1] = Tango::string_dup("qwe"); din << lgstr_arr; cout << din << endl; din.extract(lg_lgstr,str_lgstr); @@ -262,9 +262,9 @@ int main(int argc, char **argv) dbstr_arr->dvalue[0] = 1.11; dbstr_arr->dvalue[1] = 22.2; dbstr_arr->svalue.length(3); - dbstr_arr->svalue[0] = CORBA::string_dup("iop"); - dbstr_arr->svalue[1] = CORBA::string_dup("jkl"); - dbstr_arr->svalue[2] = CORBA::string_dup("bnm"); + dbstr_arr->svalue[0] = Tango::string_dup("iop"); + dbstr_arr->svalue[1] = Tango::string_dup("jkl"); + dbstr_arr->svalue[2] = Tango::string_dup("bnm"); din << dbstr_arr; cout << din << endl; din.extract(db_dbstr,str_dbstr); @@ -291,7 +291,7 @@ int main(int argc, char **argv) // test DevEncoded DevEncoded de; - de.encoded_format = CORBA::string_dup("the string"); + de.encoded_format = Tango::string_dup("the string"); de.encoded_data.length(2); de.encoded_data[0] = 11; de.encoded_data[1] = 22; diff --git a/cpp_test_suite/old_tests/print_data_hist.cpp b/test/cpp_test_suite/old_tests/print_data_hist.cpp similarity index 100% rename from cpp_test_suite/old_tests/print_data_hist.cpp rename to test/cpp_test_suite/old_tests/print_data_hist.cpp diff --git a/cpp_test_suite/old_tests/prop_list.cpp b/test/cpp_test_suite/old_tests/prop_list.cpp similarity index 100% rename from cpp_test_suite/old_tests/prop_list.cpp rename to test/cpp_test_suite/old_tests/prop_list.cpp diff --git a/cpp_test_suite/old_tests/rds.cpp b/test/cpp_test_suite/old_tests/rds.cpp similarity index 100% rename from cpp_test_suite/old_tests/rds.cpp rename to test/cpp_test_suite/old_tests/rds.cpp diff --git a/cpp_test_suite/old_tests/read_attr.cpp b/test/cpp_test_suite/old_tests/read_attr.cpp similarity index 100% rename from cpp_test_suite/old_tests/read_attr.cpp rename to test/cpp_test_suite/old_tests/read_attr.cpp diff --git a/cpp_test_suite/old_tests/read_hist_ext.cpp b/test/cpp_test_suite/old_tests/read_hist_ext.cpp similarity index 100% rename from cpp_test_suite/old_tests/read_hist_ext.cpp rename to test/cpp_test_suite/old_tests/read_hist_ext.cpp diff --git a/cpp_test_suite/old_tests/reconnect.cpp b/test/cpp_test_suite/old_tests/reconnect.cpp similarity index 100% rename from cpp_test_suite/old_tests/reconnect.cpp rename to test/cpp_test_suite/old_tests/reconnect.cpp diff --git a/cpp_test_suite/old_tests/reconnect_attr.cpp b/test/cpp_test_suite/old_tests/reconnect_attr.cpp similarity index 100% rename from cpp_test_suite/old_tests/reconnect_attr.cpp rename to test/cpp_test_suite/old_tests/reconnect_attr.cpp diff --git a/cpp_test_suite/old_tests/restart_device.cpp b/test/cpp_test_suite/old_tests/restart_device.cpp similarity index 100% rename from cpp_test_suite/old_tests/restart_device.cpp rename to test/cpp_test_suite/old_tests/restart_device.cpp diff --git a/cpp_test_suite/old_tests/ring_depth.cpp b/test/cpp_test_suite/old_tests/ring_depth.cpp similarity index 100% rename from cpp_test_suite/old_tests/ring_depth.cpp rename to test/cpp_test_suite/old_tests/ring_depth.cpp diff --git a/cpp_test_suite/old_tests/size.cpp b/test/cpp_test_suite/old_tests/size.cpp similarity index 100% rename from cpp_test_suite/old_tests/size.cpp rename to test/cpp_test_suite/old_tests/size.cpp diff --git a/cpp_test_suite/old_tests/state_attr.cpp b/test/cpp_test_suite/old_tests/state_attr.cpp similarity index 100% rename from cpp_test_suite/old_tests/state_attr.cpp rename to test/cpp_test_suite/old_tests/state_attr.cpp diff --git a/cpp_test_suite/old_tests/sub_dev.cpp b/test/cpp_test_suite/old_tests/sub_dev.cpp similarity index 100% rename from cpp_test_suite/old_tests/sub_dev.cpp rename to test/cpp_test_suite/old_tests/sub_dev.cpp diff --git a/cpp_test_suite/old_tests/unlock.cpp b/test/cpp_test_suite/old_tests/unlock.cpp similarity index 100% rename from cpp_test_suite/old_tests/unlock.cpp rename to test/cpp_test_suite/old_tests/unlock.cpp diff --git a/cpp_test_suite/old_tests/w_r_attr.cpp b/test/cpp_test_suite/old_tests/w_r_attr.cpp similarity index 100% rename from cpp_test_suite/old_tests/w_r_attr.cpp rename to test/cpp_test_suite/old_tests/w_r_attr.cpp diff --git a/cpp_test_suite/old_tests/wait_mcast_dev.cpp b/test/cpp_test_suite/old_tests/wait_mcast_dev.cpp similarity index 100% rename from cpp_test_suite/old_tests/wait_mcast_dev.cpp rename to test/cpp_test_suite/old_tests/wait_mcast_dev.cpp diff --git a/cpp_test_suite/old_tests/write_attr.cpp b/test/cpp_test_suite/old_tests/write_attr.cpp similarity index 100% rename from cpp_test_suite/old_tests/write_attr.cpp rename to test/cpp_test_suite/old_tests/write_attr.cpp diff --git a/cpp_test_suite/old_tests/write_attr_3.cpp b/test/cpp_test_suite/old_tests/write_attr_3.cpp similarity index 100% rename from cpp_test_suite/old_tests/write_attr_3.cpp rename to test/cpp_test_suite/old_tests/write_attr_3.cpp diff --git a/log4tango/tests/CMakeLists.txt b/test/log4tango/CMakeLists.txt similarity index 52% rename from log4tango/tests/CMakeLists.txt rename to test/log4tango/CMakeLists.txt index 5c476dfec..679c59223 100644 --- a/log4tango/tests/CMakeLists.txt +++ b/test/log4tango/CMakeLists.txt @@ -2,7 +2,7 @@ set(LOG4TANGO_TEST_SOURCES test_log4tango.cpp) set(BENCH_TEST_SOURCES clock.cpp clock.hh test_bench.cpp) add_executable(test_log4tango ${LOG4TANGO_TEST_SOURCES} $) -add_executable(test_bench ${BENCH_TEST_SOURCES} $) +add_executable(test_bench ${BENCH_TEST_SOURCES} $) -add_test("log4tango_test" test_log4tango) -add_test("log4tango_benchmark" test_bench) \ No newline at end of file +add_test("log4tango::test" test_log4tango) +#add_test("log4tango::benchmark" test_bench) \ No newline at end of file diff --git a/log4tango/tests/clock.cpp b/test/log4tango/clock.cpp similarity index 98% rename from log4tango/tests/clock.cpp rename to test/log4tango/clock.cpp index 30e70baa0..7d596411a 100644 --- a/log4tango/tests/clock.cpp +++ b/test/log4tango/clock.cpp @@ -1,6 +1,4 @@ -static const char rcsid[] = "$Id$"; - -// +// // Copyright (C) : 2004,2005,2006,2007,2008,2009,2010 // Synchrotron SOLEIL // L'Orme des Merisiers diff --git a/log4tango/tests/clock.hh b/test/log4tango/clock.hh similarity index 100% rename from log4tango/tests/clock.hh rename to test/log4tango/clock.hh diff --git a/log4tango/tests/test_bench.cpp b/test/log4tango/test_bench.cpp similarity index 100% rename from log4tango/tests/test_bench.cpp rename to test/log4tango/test_bench.cpp diff --git a/log4tango/tests/test_log4tango.cpp b/test/log4tango/test_log4tango.cpp similarity index 100% rename from log4tango/tests/test_log4tango.cpp rename to test/log4tango/test_log4tango.cpp