From 12cc2fdecbb2424d85ada927e010f4bebaf08c41 Mon Sep 17 00:00:00 2001 From: zimoch Date: Wed, 14 Dec 2011 08:55:55 +0000 Subject: [PATCH] update to 3.14.12.2 --- LICENSE | 9 ++- Makefile | 7 -- configure/CONFIG_ADDONS | 5 +- configure/CONFIG_BASE_VERSION | 14 ++-- configure/CONFIG_COMMON | 14 ++-- configure/RULES.Db | 68 ++++++++++-------- configure/RULES_BUILD | 13 ++-- configure/RULES_TOP | 75 ++++++++++---------- configure/os/CONFIG.Common.ios-arm | 8 +-- configure/os/CONFIG.Common.ios-x86 | 3 + configure/os/CONFIG.Common.iosCommon | 27 +++++-- configure/os/CONFIG.Common.vxWorksCommon | 4 +- configure/os/CONFIG.win32-x86-borland.Common | 5 +- configure/os/CONFIG.win32-x86-mingw.Common | 5 +- configure/os/CONFIG.win32-x86.Common | 5 +- configure/os/CONFIG.win32-x86.win32-x86 | 4 +- configure/os/CONFIG_SITE.Common.darwin-x86 | 10 ++- configure/os/CONFIG_SITE.Common.iosCommon | 5 +- 18 files changed, 156 insertions(+), 125 deletions(-) diff --git a/LICENSE b/LICENSE index ff9597ccf..4806c058e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,11 +1,14 @@ -Copyright (c) 1991-2007 UChicago Argonne LLC and The Regents of the -University of California. All rights reserved. +Copyright (c) 1991-2011 UChicago Argonne LLC. +Copyright (c) 1991-2006 The Regents of the University of California. +Copyright (c) 2006-2011. Los Alamos National Security, LLC. Some of this +material was produced under U.S. Government contract DE-AC52-06NA25396 +for Los Alamos National Laboratory (LANL), which is operated by Los Alamos +National Security, LLC for the U.S. Department of Energy. EPICS BASE is distributed subject to the following license conditions: SOFTWARE LICENSE AGREEMENT Software: EPICS BASE - Versions: 3.13.7 and higher 1. The "Software", below, refers to EPICS BASE (in either source code, or binary form and accompanying documentation). Each licensee is diff --git a/Makefile b/Makefile index c7cf5663e..069a5cf81 100644 --- a/Makefile +++ b/Makefile @@ -27,10 +27,3 @@ config_DEPEND_DIRS = src include $(TOP)/configure/RULES_TOP - -UNINSTALL_DIRS += $(INSTALL_LOCATION)/src -copysrc: - tar cf - --exclude=CVS --exclude=O.* src | tar xf - -C $(INSTALL_LOCATION) - -tar: install copysrc - tar cfjP epics_base-3.14.12.tar.bz2 $(INSTALL_LOCATION) --exclude=*.o diff --git a/configure/CONFIG_ADDONS b/configure/CONFIG_ADDONS index 4a8ecfb6b..13c7ac72b 100644 --- a/configure/CONFIG_ADDONS +++ b/configure/CONFIG_ADDONS @@ -1,12 +1,12 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20111114183307-7ziopjkjj2k97la3 # # check for add-on CFLAGS and CXXFLAGS # @@ -34,6 +34,7 @@ # LIBSRCS source files for building libraries (deprecated) # PROD_OBJS object files for building prods # LIB_OBJS object files for building libraries +# USR_OBJS object files for building libraries and prods # USR_LIBS libs needed by PROD and TESTPROD and LIBRARY # PROD_LIBS libs needed by PROD and TESTPROD # LIB_LIBS libs needed by shared LIBRARY diff --git a/configure/CONFIG_BASE_VERSION b/configure/CONFIG_BASE_VERSION index b889bc76e..f732d4587 100644 --- a/configure/CONFIG_BASE_VERSION +++ b/configure/CONFIG_BASE_VERSION @@ -1,5 +1,5 @@ #************************************************************************* -# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. @@ -7,7 +7,7 @@ # in the file LICENSE that is included with this distribution. #************************************************************************* # -# Revision-Id: anj@aps.anl.gov-20110426203619-3oqagan3wqf5n0gx +# Revision-Id: jba@aps.anl.gov-20111212200932-ms3d0pzp9t1uojxe # # EPICS Version information # @@ -19,18 +19,18 @@ BASE_3_14=YES -# EPICS_VERSION must be a number >0 and <256 +# EPICS_VERSION must be a number >0 and <256 EPICS_VERSION = 3 -# EPICS_REVISION must be a number >=0 and <256 +# EPICS_REVISION must be a number >=0 and <256 EPICS_REVISION = 14 -# EPICS_MODIFICATION must be a number >=0 and <256 +# EPICS_MODIFICATION must be a number >=0 and <256 EPICS_MODIFICATION = 12 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement) # Not included if zero -EPICS_PATCH_LEVEL = 1 +EPICS_PATCH_LEVEL = 2 # This will end in -DEV between official releases #EPICS_DEV_SNAPSHOT=-DEV @@ -58,7 +58,7 @@ EPICS_SHORT_VERSION=$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)$(EP EPICS_VERSION_NUMBER=$(EPICS_SHORT_VERSION)$(EPICS_DEV_SNAPSHOT)$(EPICS_SITE_VSTRING) EPICS_VERSION_STRING="EPICS Version $(EPICS_VERSION_NUMBER)" -COMMIT_DATE="\$Date: 2011/05/18 14:43:13 $" +COMMIT_DATE="\$Date: 2011/12/14 08:56:55 $" # Provide these in case anyone is still using the old names EPICS_CVS_SNAPSHOT=$(EPICS_DEV_SNAPSHOT) diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index d7c3d534a..d9ee39a9e 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -1,14 +1,13 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found +# EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* # -# Revision-Id: jba@aps.anl.gov-20101111194353-td0hfhkjg56whjgn +# Revision-Id: anj@aps.anl.gov-20111202201024-6naufg256gbustg2 # # CONFIG_COMMON # @@ -48,7 +47,7 @@ DB_OPT = NO #------------------------------------------------------- # Check configure/RELEASE file for consistency CHECK_RELEASE_YES = checkRelease -CHECK_RELEASE_NO = +CHECK_RELEASE_NO = noCheckRelease CHECK_RELEASE_WARN = warnRelease #------------------------------------------------------- @@ -82,7 +81,8 @@ COMMON_DIR = ../O.Common #------------------------------------------------------- # Make echo output - suppress echoing if make's '-s' flag is set -ECHO := $(if $(findstring s,$(MAKEFLAGS)),\#,@echo) +COMMENT = \# +ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(COMMENT),echo) #------------------------------------------------------- ifdef T_A @@ -335,7 +335,7 @@ HDEPENDS_CFLAGS = $(HDEPENDS_CFLAGS_$(HDEPENDS)) #-------------------------------------------------- # depends definition -TARGET_SRCS = $(foreach name, $(TESTPROD) $(PROD) $(LIBRARY), $($(name)_SRCS)) +TARGET_SRCS = $(foreach name, $(TESTPROD) $(PROD) $(LIBRARY) $(LOADABLE_LIBRARY), $($(name)_SRCS)) SRC_FILES = $(LIB_SRCS) $(LIBSRCS) $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(TARGET_SRCS) HDEPENDS_FILES_YES = $(addsuffix $(DEP),$(notdir $(basename $(SRC_FILES)))) HDEPENDS_FILES = $(if $(filter NO,$(HDEPENDS)),,$(HDEPENDS_FILES_YES)) diff --git a/configure/RULES.Db b/configure/RULES.Db index 9eb27e527..96d51ec7f 100644 --- a/configure/RULES.Db +++ b/configure/RULES.Db @@ -1,10 +1,9 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found +# EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* #RULES.Db @@ -23,8 +22,8 @@ vpath %.acs $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR) ##################################################### dbdflags # dbExpand -INSTALL_DBDFLAGS += -I $(INSTALL_LOCATION)/dbd -INSTALL_DBFLAGS += -I $(INSTALL_LOCATION)/db +INSTALL_DBDFLAGS += -I $(INSTALL_DBD) +INSTALL_DBFLAGS += -I $(INSTALL_DB) DBDFLAGS = $(USR_DBDFLAGS) -I . -I .. $(INSTALL_DBDFLAGS) $(RELEASE_DBDFLAGS) DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) -I. -I.. $(INSTALL_DBFLAGS) $(RELEASE_DBFLAGS) @@ -48,7 +47,7 @@ DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) -I. -I.. $(INSTALL_DBFLAGS) $(RELEASE_DBF # Following line added for backward compatibilty DBD += $(DBDNAME) -DBDINC_NAME = $(patsubst %.h,%,$(patsubst %.db,%,$(DBDINC))) +DBDINC_NAME = $(patsubst %.h,%,$(patsubst %.dbd,%,$(DBDINC))) DBD += $(addsuffix .dbd,$(DBDINC_NAME)) INC += $(addsuffix .h,$(DBDINC_NAME)) @@ -122,7 +121,7 @@ MAKEDBDEPENDS = $(PERL) $(TOOLS)/makeDbDepends.pl ifndef T_A -ECHO := $(if $(findstring s,$(MAKEFLAGS)),\#,@echo) +ECHO := $(if $(findstring s,$(MAKEFLAGS)),$(COMMENT),@echo) COMMON_DIR = . INSTALL_DBDS = INSTALL_DBS = @@ -224,58 +223,65 @@ $(INSTALL_DB)/%.template: %.template $(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd @$(RM) $(notdir $@)$(DEP) @$(DBDDEPENDS_CMD) - $(ECHO) "$<:../Makefile" >> $(notdir $@)$(DEP) - @$(RM) $@ - $(DBTORECORDTYPEH) $(DBDFLAGS) $< $@ + echo "$< : ../Makefile" >> $(notdir $@)$(DEP) + @$(RM) $(notdir $@) + $(DBTORECORDTYPEH) $(DBDFLAGS) $< $(notdir $@) + @$(MV) $(notdir $@) $@ $(COMMON_DIR)/%Record.h: %Record.dbd @$(RM) $(notdir $@)$(DEP) @$(DBDDEPENDS_CMD) - $(ECHO) "$<:../Makefile" >> $(notdir $@)$(DEP) - @$(RM) $@ - $(DBTORECORDTYPEH) $(DBDFLAGS) $< $@ + echo "$< : ../Makefile" >> $(notdir $@)$(DEP) + @$(RM) $(notdir $@) + $(DBTORECORDTYPEH) $(DBDFLAGS) $< $(notdir $@) + @$(MV) $(notdir $@) $@ $(COMMON_DIR)/menu%.h: $(COMMON_DIR)/menu%.dbd @$(RM) $(notdir $@)$(DEP) @$(DBDDEPENDS_CMD) - $(ECHO) "$<:../Makefile" >> $(notdir $@)$(DEP) - @$(RM) $@ - $(DBTOMENUH) $(DBDFLAGS) $< $@ + echo "$< : ../Makefile" >> $(notdir $@)$(DEP) + @$(RM) $(notdir $@) + $(DBTOMENUH) $(DBDFLAGS) $< $(notdir $@) + @$(MV) $(notdir $@) $@ $(COMMON_DIR)/menu%.h: menu%.dbd @$(RM) $(notdir $@)$(DEP) @$(DBDDEPENDS_CMD) - $(ECHO) "$<:../Makefile" >> $(notdir $@)$(DEP) - @$(RM) $@ - $(DBTOMENUH) $(DBDFLAGS) $< $@ + echo "$< : ../Makefile" >> $(notdir $@)$(DEP) + @$(RM) $(notdir $@) + $(DBTOMENUH) $(DBDFLAGS) $< $(notdir $@) + @$(MV) $(notdir $@) $@ .PRECIOUS: $(COMMON_DIR)/%.h ##################################################### DBD files $(COMMON_DIR)/bpt%.dbd: bpt%.data - @$(RM) $@ - $(MAKEBPT) $< $@ + $(MAKEBPT) $< $(notdir $@) + @$(MV) $(notdir $@) $@ $(COMMON_DIR)/%.dbd: $(COMMON_DIR)/%Include.dbd @$(RM) $(notdir $@)$(DEP) @$(DBDDEPENDS_CMD) - $(ECHO) "$<:../Makefile" >> $(notdir $@)$(DEP) + echo "$< : ../Makefile" >> $(notdir $@)$(DEP) $(ECHO) "Expanding dbd" - @$(RM) $@ - @$(DBEXPAND) $(DBDFLAGS) -o $@ $< + @$(RM) $(notdir $@) + @$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $< + @$(MV) $(notdir $@) $@ $(COMMON_DIR)/%.dbd: %Include.dbd @$(RM) $(notdir $@)$(DEP) @$(DBDDEPENDS_CMD) - $(ECHO) "$<:../Makefile" >> $(notdir $@)$(DEP) + echo "$< : ../Makefile" >> $(notdir $@)$(DEP) $(ECHO) "Expanding dbd" - @$(RM) $@ - $(DBEXPAND) $(DBDFLAGS) -o $@ $< + @$(RM) $(notdir $@) + $(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $< + @$(MV) $(notdir $@) $@ $(COMMON_DIR)/%Include.dbd: - @$(RM) $@ - $(PERL) $(TOOLS)/makeIncludeDbd.pl $($*_DBD) $@ + @$(RM) $(notdir $@) + $(PERL) $(TOOLS)/makeIncludeDbd.pl $($*_DBD) $(notdir $@) + @$(MV) $(notdir $@) $@ $(INSTALL_DBD)/%: $(COMMON_DIR)/% $(ECHO) "Installing created dbd file $@" @@ -303,8 +309,8 @@ $(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf $(COMMON_DIR)/%.db$(RAW): %.substitutions @$(RM) $(notdir $@)$(DEP) - $(MAKEDBDEPENDS) $@ $< $(TEMPLATE_FILENAME) >> $(notdir $@)$(DEP) - $(ECHO) "$@:$(TEMPLATE_FILENAME)" >> $(notdir $@)$(DEP) + @$(MAKEDBDEPENDS) $@ $< $(TEMPLATE_FILENAME) >> $(notdir $@)$(DEP) + echo "$@ : $(TEMPLATE_FILENAME)" >> $(notdir $@)$(DEP) $(ECHO) "Inflating database from $< $(TEMPLATE_FILENAME)" @$(RM) $@ $*.tmp $(MSI) $(DBFLAGS) -S$< $(TEMPLATE_FILENAME) > $*.tmp diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index 9b0591bd7..ae96d5565 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -6,7 +6,7 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in the file LICENSE that is included with this distribution. #************************************************************************* -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20111202201024-6naufg256gbustg2 # # Rules for making things specified in Makefile # @@ -167,6 +167,10 @@ checkRelease: $(CONVERTRELEASE) checkRelease warnRelease: -$(CONVERTRELEASE) checkRelease +noCheckRelease: +ifeq ($(EPICS_HOST_ARCH),$(T_A)) + @echo "Warning: RELEASE file consistency checks have been disabled" +endif #--------------------------------------------------------------- # The order of the following rules is @@ -205,11 +209,6 @@ $(OBJLIBNAME):%$(OBJ): @$(RM) $@ $(COMPILE.cpp) $(call PATH_FILTER,$<) $(COMPILE_FILTER.cpp) -%$(OBJ): %.C - @$(HDEPENDS_CMD) - @$(RM) $@ - $(COMPILE.cpp) $(call PATH_FILTER,$<) $(COMPILE_FILTER.cpp) - # WIN95/NT resource compiler %$(RES): %.rc @$(RM) $@ @@ -463,7 +462,7 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: % .PRECIOUS: $(COMMON_INC) .PHONY: all inc build install clean rebuild buildInstall -.PHONY: runtests checkRelease warnRelease +.PHONY: runtests checkRelease warnRelease noCheckRelease endif # BASE_RULES_BUILD # EOF RULES_BUILD diff --git a/configure/RULES_TOP b/configure/RULES_TOP index 2ebde5ea9..523ec33df 100644 --- a/configure/RULES_TOP +++ b/configure/RULES_TOP @@ -1,85 +1,84 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found +# EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20110610211741-4s0vjlkzhb73biml # include $(CONFIG)/RULES_DIRS +distclean: realclean cvsclean realuninstall + +CVSCLEAN=$(firstword $(wildcard $(TOOLS)/cvsclean.pl $(TOP)/src/tools/cvsclean.pl)) +cvsclean: + $(PERL) $(CVSCLEAN) + +realuninstall: uninstallDirs + $(RMDIR) $(INSTALL_LOCATION_BIN) + $(RMDIR) $(INSTALL_LOCATION_LIB) + UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)\ $(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES) \ $(INSTALL_DB) UNINSTALL_DIRS += $(DIRECTORY_TARGETS) +uninstallDirs: + $(RMDIR) $(UNINSTALL_DIRS) + +uninstall: archuninstall uninstallDirs + +archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS)) + @$(MAKE) -f Makefile cleandirs -uninstallArchTargets = $(foreach arch,$(BUILD_ARCHS), uninstall$(DIVIDER)$(arch)) archPart = $(word 2, $(subst $(DIVIDER), ,$@)) - -$(uninstallArchTargets): uninstallDirs - @$(RMDIR) $(INSTALL_LOCATION_BIN)/$(archPart) $(INSTALL_LOCATION_LIB)/$(archPart) +uninstall$(DIVIDER)%: + $(RMDIR) $(INSTALL_LOCATION_BIN)/$(archPart) + $(RMDIR) $(INSTALL_LOCATION_LIB)/$(archPart) cleandirs: ifeq ($(wildcard $(INSTALL_LOCATION_BIN)/*),) - @$(RMDIR) $(INSTALL_LOCATION_BIN) + $(RMDIR) $(INSTALL_LOCATION_BIN) endif ifeq ($(wildcard $(INSTALL_LOCATION_LIB)/*),) - @$(RMDIR) $(INSTALL_LOCATION_LIB) + $(RMDIR) $(INSTALL_LOCATION_LIB) endif @echo # The echo above stops a "nothing to be done for cleandirs" message -distclean: realclean realuninstall - -CVSCLEAN=$(firstword $(wildcard $(TOOLS)/cvsclean.pl $(TOP)/src/tools/cvsclean.pl)) - -cvsclean: - @$(PERL) $(CVSCLEAN) - -realuninstall: - @$(RMDIR) $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB) - @$(RMDIR) $(UNINSTALL_DIRS) - -uninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS)) - @$(MAKE) -f Makefile cleandirs - -uninstallDirs: - @$(RMDIR) $(UNINSTALL_DIRS) - help: @echo "Usage: gnumake [options] [target] ..." @echo "Targets supported by all Makefiles:" - @echo " install - Builds and installs all targets (default rule)" - @echo " all - Same as install" - @echo " buildInstall - Same as install" + @echo " all - Same as install (default rule)" + @echo " inc - Installs header files" + @echo " build - Builds and installs all targets" + @echo " install - Builds and installs all targets" + @echo " buildInstall - Same as install (deprecated)" @echo " clean - Removes the O. dirs created by running make" @echo " In O. dir, clean removes build created files" @echo " realclean - Removes ALL O. dirs" @echo " Cannot be used within an O. dir" @echo " rebuild - Same as clean install" - @echo " inc - Installs header files" - @echo " build - Builds all targets" @echo " archclean - Removes O. dirs but not O.Common dir" @echo "\"Partial\" build targets supported by Makefiles:" @echo " inc. - Installs only header files." + @echo " build. - Builds and installs only." @echo " install. - Builds and installs only." @echo " clean. - Cleans binaries in O. dirs only." - @echo " build. - Builds only." + @echo " uninstall. - Remove bin & lib directories for only." @echo "Targets supported by top level Makefile:" - @echo " uninstall - Cleans directories created by the install." + @echo " archuninstall - Remove bin & lib directories created by this hostarch." + @echo " uninstall - Remove install directories created by this hostarch." @echo " realuninstall - Removes ALL install dirs" - @echo " distclean - Same as realclean realuninstall." + @echo " distclean - Same as realclean cvsclean realuninstall." @echo " cvsclean - Removes cvs .#* files in all dirs of directory tree" @echo " help - Prints this list of valid make targets " @echo "Indiv. object targets are supported by O. level Makefile .e.g" @echo " xxxRecord.o" -.PHONY : $(uninstallArchTargets) -.PHONY : uninstall help cleandirs distclean uninstallDirs realuninstall -.PHONY : cvsclean +.PHONY: cleandirs distclean cvsclean realuninstall archuninstall uninstallDirs +.PHONY: uninstall help diff --git a/configure/os/CONFIG.Common.ios-arm b/configure/os/CONFIG.Common.ios-arm index b6f1a57b8..69d9d76bc 100644 --- a/configure/os/CONFIG.Common.ios-arm +++ b/configure/os/CONFIG.Common.ios-arm @@ -1,17 +1,15 @@ # CONFIG.Common.ios-arm # +# Revision-Id: anj@aps.anl.gov-20111202164243-clxybuefflizbyvr # This file is maintained by the build community. # # Definitions for ios-arm target builds +# Sites may override these definitions in CONFIG_SITE.Common.ios-arm +# or CONFIG_SITE..ios-arm #------------------------------------------------------- IOS_PLATFORM = iPhoneOS -# -# Architecture-specific information -# -ARCH_CLASS = armv6 - OP_SYS_CFLAGS += -fno-inline-functions # iOS optimization flags for arm architecture diff --git a/configure/os/CONFIG.Common.ios-x86 b/configure/os/CONFIG.Common.ios-x86 index c236e606c..41181ac1b 100644 --- a/configure/os/CONFIG.Common.ios-x86 +++ b/configure/os/CONFIG.Common.ios-x86 @@ -1,8 +1,11 @@ # CONFIG.Common.ios-x86 # +# Revision-Id: anj@aps.anl.gov-20111202164243-clxybuefflizbyvr # This file is maintained by the build community. # # Definitions for ios-x86 target builds +# Sites may override these definitions in CONFIG_SITE.Common.ios-x86 +# or CONFIG_SITE..ios-x86 #------------------------------------------------------- IOS_PLATFORM = iPhoneSimulator diff --git a/configure/os/CONFIG.Common.iosCommon b/configure/os/CONFIG.Common.iosCommon index 647b913b4..693db8d3a 100644 --- a/configure/os/CONFIG.Common.iosCommon +++ b/configure/os/CONFIG.Common.iosCommon @@ -1,9 +1,9 @@ # CONFIG.Common.iosCommon # -# Revision-Id: anj@aps.anl.gov-20110405172700-pjvcru7gjw9sfkc5 +# Revision-Id: anj@aps.anl.gov-20111202164243-clxybuefflizbyvr # This file is maintained by the build community. # -# Definitions for iOS target archs +# Definitions for all Apple iOS builds # Sites may override these definitions in CONFIG_SITE.Common.iosCommon # or CONFIG_SITE..iosCommon #------------------------------------------------------- @@ -29,8 +29,14 @@ SDK_DIR = $(PLATFORM_DIR)/Developer/SDKs/$(IOS_PLATFORM)$(IOS_VERSION).sdk #------------------------------------------------------- # Build architecture flags -ARCH_DEP_CFLAGS += -arch $(ARCH_CLASS) -ARCH_DEP_LDFLAGS += -arch $(ARCH_CLASS) +# ARCH_CLASS must contain a list of CPU architectures which must be +# valid arguments to the -arch options for the cc and ld commands. +# ARCH_CLASS is defined in a CONFIG_SITE file which is not loaded +# until after this file. +# +ARCH_DEP_FLAGS = $(addprefix -arch ,$(ARCH_CLASS)) +ARCH_DEP_CFLAGS += $(ARCH_DEP_FLAGS) +ARCH_DEP_LDFLAGS += $(ARCH_DEP_FLAGS) #-------------------------------------------------- # Operating system flags @@ -49,9 +55,9 @@ OPT_CXXFLAGS_YES += -g #------------------------------------------------------- # Compiler definitions: # Use clang instead of gcc -# Must use g++ still CC = $(GNU_BIN)/clang -CCC = $(GNU_BIN)/c++ +CCC = $(GNU_BIN)/clang++ +GNU_LDLIBS_YES = #------------------------------------------------------- # Linker flags @@ -80,6 +86,15 @@ vpath %.m $(USR_VPATH) $(ALL_SRC_DIRS) %.o: %.m $(COMPILE.c) -c $< +#-------------------------------------------------- +# Header dependency file generation +# +# Use compiler when ARCH_CLASS is a single arch value +# otherwise use perl script command +SINGLE_ARCH=$(filter 1,$(words $(ARCH_CLASS))) +HDEPENDS_CFLAGS = $(if $(SINGLE_ARCH),$(HDEPENDS_CFLAGS_$(HDEPENDS))) +HDEPENDS_METHOD = $(if $(SINGLE_ARCH),CFLAGS,CMD) + #-------------------------------------------------- # Allow site overrides -include $(CONFIG)/os/CONFIG_SITE.Common.iosCommon diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index daf1a84dc..95084889a 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -1,6 +1,6 @@ # CONFIG.Common.vxWorksCommon # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20110610151440-534gadgi98sgedyd # This file is maintained by the build community. # # Definitions for vxWorks target archs @@ -159,7 +159,7 @@ export TOOL_FAMILY = GNU #-------------------------------------------------- # Operating system flags -OP_SYS_CPPFLAGS += -DvxWorks +OP_SYS_CPPFLAGS += -DvxWorks=vxWorks OP_SYS_CFLAGS += -fno-builtin # Fix for vxWorks 5 headers that use macros defined in vxWorks.h but diff --git a/configure/os/CONFIG.win32-x86-borland.Common b/configure/os/CONFIG.win32-x86-borland.Common index 1e70b7541..60aea63cd 100644 --- a/configure/os/CONFIG.win32-x86-borland.Common +++ b/configure/os/CONFIG.win32-x86-borland.Common @@ -1,6 +1,6 @@ # CONFIG.win32-x86-borland.Common # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20110606145131-rpql3fdjvli0113i # This file is maintained by the build community. # # Definitions for win32-x86-borland host archs @@ -8,10 +8,11 @@ #------------------------------------------------------- CP = $(PERL) -MExtUtils::Command -e cp -MV = $(PERL) -MExtUtils::Command -e mv +MV = $(PERL) -MExtUtils::Command -e mv RM = $(PERL) -MExtUtils::Command -e rm_f MKDIR = $(PERL) -MExtUtils::Command -e mkpath RMDIR = $(PERL) -MExtUtils::Command -e rm_rf +COMMENT = $(PERL) -e '' WIND_HOST_TYPE = x86-win32 OSITHREAD_USE_DEFAULT_STACK = NO diff --git a/configure/os/CONFIG.win32-x86-mingw.Common b/configure/os/CONFIG.win32-x86-mingw.Common index e78bc3c5d..9f8c7e4d6 100644 --- a/configure/os/CONFIG.win32-x86-mingw.Common +++ b/configure/os/CONFIG.win32-x86-mingw.Common @@ -1,6 +1,6 @@ # CONFIG.win32-x86-mingw.Common # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20110606145131-rpql3fdjvli0113i # This file is maintained by the build community. # # Definitions for win32-x86-cygwin host archs @@ -11,10 +11,11 @@ include $(CONFIG)/os/CONFIG.UnixCommon.Common CP = $(PERL) -MExtUtils::Command -e cp -MV = $(PERL) -MExtUtils::Command -e mv +MV = $(PERL) -MExtUtils::Command -e mv RM = $(PERL) -MExtUtils::Command -e rm_f MKDIR = $(PERL) -MExtUtils::Command -e mkpath RMDIR = $(PERL) -MExtUtils::Command -e rm_rf +COMMENT = $(PERL) -e '' WIND_HOST_TYPE = x86-win32 OSITHREAD_USE_DEFAULT_STACK = NO diff --git a/configure/os/CONFIG.win32-x86.Common b/configure/os/CONFIG.win32-x86.Common index 1cf2418ef..659704c19 100644 --- a/configure/os/CONFIG.win32-x86.Common +++ b/configure/os/CONFIG.win32-x86.Common @@ -1,6 +1,6 @@ # CONFIG.win32-x86.Common # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20110606145131-rpql3fdjvli0113i # This file is maintained by the build community. # # Definitions for win32-x86 host archs @@ -8,10 +8,11 @@ #------------------------------------------------------- CP = $(PERL) -MExtUtils::Command -e cp -MV = $(PERL) -MExtUtils::Command -e mv +MV = $(PERL) -MExtUtils::Command -e mv RM = $(PERL) -MExtUtils::Command -e rm_f MKDIR = $(PERL) -MExtUtils::Command -e mkpath RMDIR = $(PERL) -MExtUtils::Command -e rm_rf +COMMENT = $(PERL) -e '' WIND_HOST_TYPE = x86-win32 OSITHREAD_USE_DEFAULT_STACK = NO diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86 index 091161c69..478a72733 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86 +++ b/configure/os/CONFIG.win32-x86.win32-x86 @@ -1,6 +1,6 @@ # CONFIG.win32-x86.win32-x86 # -# Revision-Id: jba@aps.anl.gov-20101021200611-k20b8rbfxat4nk3i +# Revision-Id: jba@aps.anl.gov-20110805170230-c0yd86k1a0ujy7fu # This file is maintained by the build community. # # Definitions for win32-x86 target archs when host arch is win32-x86 @@ -31,7 +31,9 @@ BAFCMD = bscmake /nologo /o $@ # Configure OS vendor C compiler CC = cl +# Override CONFIG.gnuCommon for cross builds. GNU = NO +HDEPENDS_METHOD = CMD # # /W use warning level N diff --git a/configure/os/CONFIG_SITE.Common.darwin-x86 b/configure/os/CONFIG_SITE.Common.darwin-x86 index c2fc5070d..3bdde8710 100644 --- a/configure/os/CONFIG_SITE.Common.darwin-x86 +++ b/configure/os/CONFIG_SITE.Common.darwin-x86 @@ -1,6 +1,6 @@ # CONFIG_SITE.Common.darwin-x86 # -# Revision-Id: anj@aps.anl.gov-20101012202556-m22qur2eligwq95h +# Revision-Id: jba@aps.anl.gov-20110727210802-dy8pljbg3tx9i9fs # This file is maintained by the build community. # # Site override definitions for darwin-x86 target builds @@ -13,3 +13,11 @@ ARCH_CLASS = i386 #ARCH_CLASS = x86_64 #ARCH_CLASS = i386 x86_64 + +# +# Uncomment the followings lines to build with CLANG instead of GCC. +# +#CC = clang +#CCC = clang++ +#GNU_LDLIBS_YES = + diff --git a/configure/os/CONFIG_SITE.Common.iosCommon b/configure/os/CONFIG_SITE.Common.iosCommon index 324810753..c490445fa 100644 --- a/configure/os/CONFIG_SITE.Common.iosCommon +++ b/configure/os/CONFIG_SITE.Common.iosCommon @@ -1,6 +1,6 @@ # CONFIG_SITE.Common.iosCommon # -# Revision-Id: anj@aps.anl.gov-20110405172700-pjvcru7gjw9sfkc5 +# Revision-Id: anj@aps.anl.gov-20111202164243-clxybuefflizbyvr # This file is maintained by the build community. # # Site-specific settings for Apple iOS builds @@ -10,7 +10,8 @@ #IOS_VERSION = 3.2 #IOS_VERSION = 4.1 -IOS_VERSION = 4.3 +#IOS_VERSION = 4.3 +IOS_VERSION = 5.0 # Most sites will want shared libraries