Changeset 20492

Show
Ignore:
Timestamp:
07/08/07 16:06:08 (1 year ago)
Author:
patrick
Message:

Get the non-Windows build and installation in sync with the Windows build
with regard to debug-enabled plug-ins. Instead of using an "_d" name
variant, we are now separating the plug-ins using directories. The
debug-enabled plug-ins go in the "debug" subdirectory of the directory
containing the optimized plug-ins. In cases where the plug-in search path is
configurable, users can load the debug plug-ins into optimized or
debug-enabled code by changing the search path in the configuration.
Otherwise, the previous revision changed the default search path so that the
"debug" subdirectory is searched before the optimized directory for debug
builds. This retains backwards compatibility with previous versions and keeps
things simple when developers are only making debug builds.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/modules/gadgeteer/drivers/driver.defs.mk.in

    r19729 r20492  
    3838# Common code for driver DSOs. 
    3939# ----------------------------------------------------------------------------- 
    40 ifeq ($(BUILD_TYPE), dbg) 
    41    BUILD_TYPE_EXT=      _d 
    42 endif 
    43  
    4440LIBDIR_NAME?=   lib$(LIBBITSUF) 
    4541 
    …… 
    4743LIBDIR_BASE?=   $(topdir)/$(LIBDIR_NAME) 
    4844 
    49 DSO_DRIVER_SUBDIR=      $(DRIVER_DIR_VERSION)/drivers 
     45DRIVER_DIR=             $(DRIVER_DIR_VERSION)/drivers 
     46ifeq ($(BUILD_TYPE), dbg) 
     47   DSO_DRIVER_SUBDIR=   $(DRIVER_DIR)/debug 
     48else 
     49   DSO_DRIVER_SUBDIR=   $(DRIVER_DIR) 
     50endif 
    5051DSO_DRIVER_DIR=         $(LIBDIR_BASE)/$(DSO_DRIVER_SUBDIR) 
    5152 

  • juggler/trunk/modules/gadgeteer/drivers/gadget.driver.mk.in

    r20387 r20492  
    112112# ----------------------------------------------------------------------------- 
    113113ifeq ($(BUILD_TYPE), dbg) 
    114    BUILD_TYPE_EXT=      _d 
     114   BUILD_TYPE_EXT=       
    115115   DEBUG_APP=           TRUE 
    116116   OPTIM_APP=           FALSE 

  • juggler/trunk/modules/gadgeteer/plugins/gadget.plugin.mk.in

    r20387 r20492  
    115115# ----------------------------------------------------------------------------- 
    116116ifeq ($(BUILD_TYPE), dbg) 
    117    BUILD_TYPE_EXT=      _d 
     117   BUILD_TYPE_EXT=       
    118118   DEBUG_APP=           TRUE 
    119119   OPTIM_APP=           FALSE 

  • juggler/trunk/modules/gadgeteer/plugins/plugin.defs.mk.in

    r19729 r20492  
    3838# Common code for plugin DSOs. 
    3939# ----------------------------------------------------------------------------- 
    40 ifeq ($(BUILD_TYPE), dbg) 
    41    BUILD_TYPE_EXT=      _d 
    42 endif 
    43  
    4440LIBDIR_NAME?=   lib$(LIBBITSUF) 
    4541 
    …… 
    4743LIBDIR_BASE?=   $(topdir)/$(LIBDIR_NAME) 
    4844 
    49 DSO_PLUGIN_SUBDIR=      $(PLUGIN_DIR_VERSION)/plugins 
     45PLUGIN_DIR=             $(PLUGIN_DIR_VERSION)/plugins 
     46ifeq ($(BUILD_TYPE), dbg) 
     47   DSO_PLUGIN_SUBDIR=   $(PLUGIN_DIR)/debug 
     48else 
     49   DSO_PLUGIN_SUBDIR=   $(PLUGIN_DIR) 
     50endif 
    5051DSO_PLUGIN_DIR=         $(LIBDIR_BASE)/$(DSO_PLUGIN_SUBDIR) 
    5152 

  • juggler/trunk/modules/jackal/plugins/plugin.defs.mk.in

    r19729 r20492  
    3838# Common code for plug-in DSOs. 
    3939# ----------------------------------------------------------------------------- 
    40 ifeq ($(BUILD_TYPE), dbg) 
    41    BUILD_TYPE_EXT=      _d 
    42 endif 
    43  
    4440LIBDIR_NAME?=   lib$(LIBBITSUF) 
    4541 
    …… 
    4743LIBDIR_BASE?=   $(topdir)/$(LIBDIR_NAME) 
    4844 
    49 DSO_PLUGIN_SUBDIR=      $(PLUGIN_DIR_VERSION)/plugins 
     45PLUGIN_DIR=             $(PLUGIN_DIR_VERSION)/plugins 
     46ifeq ($(BUILD_TYPE), dbg) 
     47   DSO_PLUGIN_SUBDIR=   $(PLUGIN_DIR)/debug 
     48else 
     49   DSO_PLUGIN_SUBDIR=   $(PLUGIN_DIR) 
     50endif 
    5051DSO_PLUGIN_DIR=         $(LIBDIR_BASE)/$(DSO_PLUGIN_SUBDIR) 
    5152