Changeset 20571

Show
Ignore:
Timestamp:
07/20/07 09:32:05 (1 year ago)
Author:
patrick
Message:

Use Flagpoll in the Gadgeteer plug-in build process to figure out where to
install things.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/branches/2.2/macros/gadget.m4

    r19908 r20571  
    8888            GADGET_USE_X11=`$FLAGPOLL $gadget_flagpoll_args --get-use-x11` 
    8989            GADGET_USE_COCOA=`$FLAGPOLL $gadget_flagpoll_args --get-use-cocoa` 
     90            GADGET_HEADER_SUBDIR=`$FLAGPOLL $gadget_flagpoll_args --get-gadget-header-subdir` 
     91            GADGET_DATA_SUBDIR=`$FLAGPOLL $gadget_flagpoll_args --get-gadget-data-subdir` 
     92            GADGET_PLUGIN_SUBDIR=`$FLAGPOLL $gadget_flagpoll_args --get-gadget-plugin-subdir` 
    9093 
    9194            DPP_VERSION_CHECK_MSG_NO_CACHE([Gadgeteer], [$GADGET_VERSION], 
    …… 
    125128    AC_SUBST(GADGET_USE_X11) 
    126129    AC_SUBST(GADGET_USE_COCOA) 
     130    AC_SUBST(GADGET_HEADER_SUBDIR) 
     131    AC_SUBST(GADGET_DATA_SUBDIR) 
     132    AC_SUBST(GADGET_PLUGIN_SUBDIR) 
    127133]) 

  • juggler/branches/2.2/modules/gadgeteer/configure.ac

    r20500 r20571  
    236236   LIBRARY_VERSION="-$VERSION_UNDERSCORE" 
    237237   DATA_VERSION="gadgeteer-$VERSION_DOT" 
     238   PLUGIN_VERSION="gadgeteer-$VERSION_DOT" 
    238239 
    239240   AC_DEFINE([GADGET_USE_VERSIONING], , 
    …… 
    243244 
    244245# If versioning is disabled, then none of the version variables need to be 
    245 # set except for $DATA_VERSION. Their use is different than the others. The 
    246 # important thing to note is that the directory name is unversioned in this 
    247 # case. 
     246# set except for $DATA_VERSION and $PLUGIN_VERSION. Their use is different 
     247# than the others. The important thing to note is that the directory name is 
     248# unversioned in this case. 
    248249else 
    249250   DATA_VERSION="gadgeteer" 
     251   PLUGIN_VERSION="gadgeteer" 
    250252fi 
    251253 
    …… 
    429431 
    430432includedir="$includedir/$HEADER_VERSION" 
     433gadget_header_subdir="$HEADER_VERSION" 
     434gadget_data_subdir="$DATA_VERSION" 
     435gadget_plugin_subdir="$PLUGIN_VERSION" 
    431436 
    432437DPP_SUBST 
    …… 
    477482AC_SUBST(gadget_use_x11) 
    478483AC_SUBST(gadget_use_cocoa) 
     484AC_SUBST(gadget_header_subdir) 
     485AC_SUBST(gadget_data_subdir) 
     486AC_SUBST(gadget_plugin_subdir) 
    479487 
    480488# ----------------------------------------------------------------------------- 

  • juggler/branches/2.2/modules/gadgeteer/drivers/configure.ac

    r20309 r20571  
    5151# --enable-feature[=arg] and --disable-feature arguments # 
    5252# ------------------------------------------------------ # 
    53 AC_ARG_ENABLE([versioning], 
    54               [  --disable-versioning    Disable all versioning capabilities], 
    55               [ENABLE_VERSIONING="$enableval"], [ENABLE_VERSIONING='yes']) 
    5653 
    5754# -------------------------------------------- # 
    …… 
    603600# ----------------------------------------------------------------------------- 
    604601 
    605  
    606 # Set the form of the version number used for versioned directory and file 
    607 # naming. Unstable builds use all three version numbers; stable builds use 
    608 # only the major and minor version numbers. 
    609 if test "x$ENABLE_VERSIONING" = "xyes" ; then 
    610    DATA_VERSION="gadgeteer-$GADGET_VERSION" 
    611    DRIVER_DIR_VERSION="gadgeteer-$GADGET_VERSION" 
    612  
    613 # If versioning is disabled, then none of the version variables need to be 
    614 # set except for $DATA_VERSION. Its use is different than the others. The 
    615 # important thing to note is that the directory name is unversioned in this 
    616 # case. 
    617 else 
    618    DATA_VERSION="gadgeteer" 
    619    DRIVER_DIR_VERSION="gadgeteer" 
    620 fi 
     602DATA_SUBDIR="$GADGET_DATA_SUBDIR" 
     603DRIVER_SUBDIR="$GADGET_PLUGIN_SUBDIR" 
    621604 
    622605# Add these C++ options when compiling with G++. 
    …… 
    712695AC_SUBST(VPR_SUBSYSTEM) 
    713696 
    714 AC_SUBST(DATA_VERSION) 
    715 AC_SUBST(DRIVER_DIR_VERSION) 
     697AC_SUBST(DATA_SUBDIR) 
     698AC_SUBST(DRIVER_SUBDIR) 
    716699 
    717700AC_SUBST(EXTRA_LDFLAGS) 

  • juggler/branches/2.2/modules/gadgeteer/drivers/driver.defs.mk.in

    r20507 r20571  
    4343LIBDIR_BASE?=   $(topdir)/$(LIBDIR_NAME) 
    4444 
    45 DSO_DRIVER_SUBDIR=      $(DRIVER_DIR_VERSION)/drivers 
     45DSO_DRIVER_SUBDIR=      $(GADGET_DRIVER_SUBDIR)/drivers 
    4646DSO_DRIVER_DIR=         $(LIBDIR_BASE)/$(DSO_DRIVER_SUBDIR) 
    4747 

  • juggler/branches/2.2/modules/gadgeteer/drivers/make.defs.mk.in

    r19729 r20571  
    7171# ----------------------------------------------------------------------------- 
    7272mtreedir=               $(topdir)/mtree 
    73 projdatadir=            $(datadir)/@DATA_VERSION@ 
     73projdatadir=            $(datadir)/@DATA_SUBDIR@ 
    7474releasedir=             @JUGGLERROOT_ABS@/release 
    7575scriptdir=              $(releasedir)/scripts 
    …… 
    8989DRIVER_ROOT_ABS=        @DRIVER_ROOT_ABS@ 
    9090JUGGLERROOT_ABS=        @JUGGLERROOT_ABS@ 
    91 DRIVER_DIR_VERSION=     @DRIVER_DIR_VERSION@ 
     91GADGET_DRIVER_SUBDIR=  @DRIVER_SUBDIR@ 
    9292 
    9393 

  • juggler/branches/2.2/modules/gadgeteer/gadgeteer.fpc.in

    r19854 r20571  
    4444gadget_use_x11= @gadget_use_x11@ 
    4545gadget_use_cocoa= @gadget_use_cocoa@ 
     46gadget_header_subdir = @gadget_header_subdir@ 
     47gadget_data_subdir = @gadget_data_subdir@ 
     48gadget_plugin_subdir = @gadget_plugin_subdir@ 
    4649 
    4750########################### Public Variables ############################ 
    …… 
    6871profiled_libs: ${libs} ${gadget_prof_libs} 
    6972profiled_static_libs: ${static_begin} ${gadget_prof_libs} ${static_end} 
     73gadget_header_subdir: ${gadget_header_subdir} 
     74gadget_data_subdir: ${gadget_data_subdir} 
     75gadget_plugin_subdir: ${gadget_plugin_subdir} 

  • juggler/branches/2.2/modules/gadgeteer/plugins/configure.ac

    r19847 r20571  
    5454# --enable-feature[=arg] and --disable-feature arguments # 
    5555# ------------------------------------------------------ # 
    56 AC_ARG_ENABLE([versioning], 
    57               [  --disable-versioning    Disable all versioning capabilities], 
    58               [ENABLE_VERSIONING="$enableval"], [ENABLE_VERSIONING='yes']) 
    5956 
    6057# Force the use of GCC as the compiler. 
    …… 
    174171# ----------------------------------------------------------------------------- 
    175172 
    176 # Set the form of the version number used for versioned directory and file 
    177 # naming. Unstable builds use all three version numbers; stable builds use 
    178 # only the major and minor version numbers. 
    179 if test "x$ENABLE_VERSIONING" = "xyes" ; then 
    180    HEADER_VERSION="gadgeteer-$GADGET_VERSION" 
    181    DATA_VERSION="gadgeteer-$GADGET_VERSION" 
    182    PLUGIN_DIR_VERSION="gadgeteer-$GADGET_VERSION" 
    183  
    184 # If versioning is disabled, then none of the version variables need to be 
    185 # set except for $DATA_VERSION. Its use is different than the others. The 
    186 # important thing to note is that the directory name is unversioned in this 
    187 # case. 
    188 else 
    189    DATA_VERSION="gadgeteer" 
    190    PLUGIN_DIR_VERSION="gadgeteer" 
    191 fi 
    192  
     173HEADER_SUBDIR="$GADGET_HEADER_SUBDIR" 
     174DATA_SUBDIR="$GADGET_DATA_SUBDIR" 
     175PLUGIN_SUBDIR="$GADGET_PLUGIN_SUBDIR" 
    193176 
    194177# Add these C++ options when compiling with G++. 
    …… 
    264247fi 
    265248 
    266 includedir="$includedir/$HEADER_VERSION" 
     249includedir="$includedir/$HEADER_SUBDIR" 
    267250 
    268251DPP_SUBST 
    …… 
    275258AC_SUBST(VPR_SUBSYSTEM) 
    276259 
    277 AC_SUBST(HEADER_VERSION) 
    278 AC_SUBST(DATA_VERSION) 
    279 AC_SUBST(PLUGIN_DIR_VERSION) 
     260AC_SUBST(HEADER_SUBDIR) 
     261AC_SUBST(DATA_SUBDIR) 
     262AC_SUBST(PLUGIN_SUBDIR) 
    280263 
    281264AC_SUBST(EXTRA_LDFLAGS) 

  • juggler/branches/2.2/modules/gadgeteer/plugins/make.defs.mk.in

    r19729 r20571  
    7171# ----------------------------------------------------------------------------- 
    7272mtreedir=               $(topdir)/mtree 
    73 projdatadir=            $(datadir)/@DATA_VERSION@ 
     73projdatadir=            $(datadir)/@DATA_SUBDIR@ 
    7474releasedir=             @JUGGLERROOT_ABS@/release 
    7575scriptdir=              $(releasedir)/scripts 
    …… 
    8989PLUGIN_ROOT_ABS=        @PLUGIN_ROOT_ABS@ 
    9090JUGGLERROOT_ABS=        @JUGGLERROOT_ABS@ 
    91 PLUGIN_DIR_VERSION=     @PLUGIN_DIR_VERSION@ 
     91GADGET_PLUGIN_SUBDIR=  @PLUGIN_SUBDIR@ 
    9292 
    9393STATICLIB_EXT=          @STATICLIB_EXT@ 

  • juggler/branches/2.2/modules/gadgeteer/plugins/plugin.defs.mk.in

    r20507 r20571  
    4343LIBDIR_BASE?=   $(topdir)/$(LIBDIR_NAME) 
    4444 
    45 DSO_PLUGIN_SUBDIR=      $(PLUGIN_DIR_VERSION)/plugins 
     45DSO_PLUGIN_SUBDIR=      $(GADGET_PLUGIN_SUBDIR)/plugins 
    4646DSO_PLUGIN_DIR=         $(LIBDIR_BASE)/$(DSO_PLUGIN_SUBDIR) 
    4747