From 910ab38af6d83eb22da1d6a569255c79bdec5e76 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 3 Dec 2012 16:39:27 -0600 Subject: [PATCH] Creating 3.14.12.3-rc1 --- configure/CONFIG_BASE_VERSION | 4 ++-- configure/CONFIG_SITE | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure/CONFIG_BASE_VERSION b/configure/CONFIG_BASE_VERSION index 024f506bc..7e4ff1354 100644 --- a/configure/CONFIG_BASE_VERSION +++ b/configure/CONFIG_BASE_VERSION @@ -35,10 +35,10 @@ EPICS_PATCH_LEVEL = 3 # This will end in -DEV between official releases #EPICS_DEV_SNAPSHOT=-DEV #EPICS_DEV_SNAPSHOT=-pre1 -EPICS_DEV_SNAPSHOT=-pre1-DEV +#EPICS_DEV_SNAPSHOT=-pre1-DEV #EPICS_DEV_SNAPSHOT=-pre2 #EPICS_DEV_SNAPSHOT=-pre2-DEV -#EPICS_DEV_SNAPSHOT=-rc1 +EPICS_DEV_SNAPSHOT=-rc1 #EPICS_DEV_SNAPSHOT=-rc1-DEV #EPICS_DEV_SNAPSHOT=-rc2 #EPICS_DEV_SNAPSHOT=-rc2-DEV diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 45f2f5917..f60c7662a 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -72,6 +72,7 @@ # linux-cris (Axis GNU crosscompiler on linux-x86 host) # linux-cris_v10 (Axis GNU crosscompiler on linux-x86 host) # linux-cris_v32 (Axis GNU crosscompiler on linux-x86 host) +# linux-microblaze # linux-xscale_be # vxWorks-486 # vxWorks-68040 @@ -119,9 +120,9 @@ CROSS_COMPILER_HOST_ARCHS= # NOTE: os/CONFIG.$(EPICS_HOST_ARCH).$(EPICS_HOST_ARCH) files and # os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(EPICS_HOST_ARCH) files may override # -# NOTE WIN32: YES results in a DLL. Valid settings are -# SHARED_LIBRARIES=YES and STATIC_BUILD=NO -# SHARED_LIBRARIES=NO and STATIC_BUILD=YES +# NOTE Windows: YES results in a DLL. Valid settings are +# SHARED_LIBRARIES=YES and STATIC_BUILD=NO +# SHARED_LIBRARIES=NO and STATIC_BUILD=YES # SHARED_LIBRARIES=YES