Changeset 20574

Show
Ignore:
Timestamp:
07/20/07 12:21:31 (1 year ago)
Author:
patrick
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r19729 r20574  
    8383            VRJ_EXTRA_LIBS=`$FLAGPOLL $vrj_flagpoll_args --get-extra-libs` 
    8484            VRJ_VERSION=`$FLAGPOLL $vrj_flagpoll_args --modversion` 
     85            VRJ_HEADER_SUBDIR=`$FLAGPOLL $vrj_flagpoll_args --get-vrj-header-subdir` 
     86            VRJ_DATA_SUBDIR=`$FLAGPOLL $vrj_flagpoll_args --get-vrj-data-subdir` 
     87            VRJ_PLUGIN_SUBDIR=`$FLAGPOLL $vrj_flagpoll_args --get-vrj-plugin-subdir` 
    8588 
    8689            DPP_VERSION_CHECK_MSG_NO_CACHE([VR Juggler], [$VRJ_VERSION], 
    …… 
    112115    AC_SUBST(VRJ_EXTRA_LIBS) 
    113116    AC_SUBST(VRJ_VERSION) 
     117    AC_SUBST(VRJ_HEADER_SUBDIR) 
     118    AC_SUBST(VRJ_DATA_SUBDIR) 
     119    AC_SUBST(VRJ_PLUGIN_SUBDIR) 
    114120]) 

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

    r20563 r20574  
    302302   LIBRARY_VERSION="-$VERSION_UNDERSCORE" 
    303303   DATA_VERSION="vrjuggler-$VERSION_DOT" 
     304   PLUGIN_VERSION="vrjuggler-$VERSION_DOT" 
    304305 
    305306   AC_DEFINE([VRJ_USE_VERSIONING], , 
    …… 
    309310 
    310311# If versioning is disabled, then none of the version variables need to be 
    311 # set except for $DATA_VERSION. Its use is different than the others. The 
    312 # important thing to note is that the directory name is unversioned in this 
    313 # case. 
     312# set except for $DATA_VERSION and $PLUGIN_VERSION. Their use is different 
     313# than the others. The important thing to note is that the directory name is 
     314# unversioned in this case. 
    314315else 
    315316   DATA_VERSION="vrjuggler" 
    316 fi 
    317  
     317   PLUGIN_VERSION="vrjuggler" 
     318fi 
    318319 
    319320# Add these C++ options when compiling with G++. 
    …… 
    630631# ----------------------------------------------------------------------------- 
    631632includedir="$includedir/$HEADER_VERSION" 
     633vrj_header_subdir="$HEADER_VERSION" 
     634vrj_data_subdir="$DATA_VERSION" 
     635vrj_plugin_subdir="$PLUGIN_VERSION" 
    632636 
    633637DPP_SUBST 
    …… 
    647651AC_SUBST(LIBRARY_VERSION) 
    648652AC_SUBST(DATA_VERSION) 
     653AC_SUBST(PLUGIN_VERSION) 
    649654 
    650655AC_SUBST(ANT) 
    …… 
    694699AC_SUBST(vrj_ogl_extra_libs) 
    695700AC_SUBST(vrj_pf_extra_libs) 
     701AC_SUBST(vrj_header_subdir) 
     702AC_SUBST(vrj_data_subdir) 
     703AC_SUBST(vrj_plugin_subdir) 
    696704 
    697705AC_SUBST(tweek_java_api_jars_bundle) 

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

    r19729 r20574  
    4848# --enable-feature[=arg] and --disable-feature arguments # 
    4949# ------------------------------------------------------ # 
    50  
    51 # Enable versioning by default 
    52 AC_ARG_ENABLE([versioning], 
    53               [  --disable-versioning    Disable all versioning capabilities], 
    54               [ENABLE_VERSIONING="$enableval"], [ENABLE_VERSIONING='yes']) 
    5550 
    5651DPP_STD_CPP(yes) 
    …… 
    188183# Do Makefile substitutions. 
    189184# ----------------------------------------------------------------------------- 
    190 # Set the form of the version number used for versioned directory and file 
    191 # naming. Unstable builds use all three version numbers; stable builds use 
    192 # only the major and minor version numbers. 
    193 if test "x$ENABLE_VERSIONING" = "xyes" ; then 
    194  
    195    DATA_VERSION="vrjuggler-$VRJ_VERSION" 
    196    PLUGIN_DIR_VERSION="vrjuggler-$VRJ_VERSION" 
    197  
    198 # If versioning is disabled, then none of the version variables need to be 
    199 # set except for $DATA_VERSION. Its use is different than the others. The 
    200 # important thing to note is that the directory name is unversioned in this 
    201 # case. 
    202 else 
    203    DATA_VERSION="vrjuggler" 
    204    PLUGIN_DIR_VERSION="vrjuggler" 
    205 fi 
     185DATA_SUBDIR="$VRJ_DATA_SUBDIR" 
     186PLUGIN_SUBDIR="$VRJ_PLUGIN_SUBDIR" 
    206187 
    207188# Add these C++ options when compiling with G++. 
    …… 
    275256AC_SUBST(JUGGLERROOT_ABS) 
    276257 
    277 AC_SUBST(DATA_VERSION) 
    278 AC_SUBST(PLUGIN_DIR_VERSION) 
     258AC_SUBST(DATA_SUBDIR) 
     259AC_SUBST(PLUGIN_SUBDIR) 
    279260 
    280261AC_SUBST(HAVE_TWEEK_CXX) 

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

    r19729 r20574  
    7171# ----------------------------------------------------------------------------- 
    7272mtreedir=               $(topdir)/mtree 
    73 projdatadir=            $(datadir)/@DATA_VERSION@ 
     73projdatadir=            $(datadir)/@DATA_SUBDIR@ 
    7474releasedir=             @JUGGLERROOT_ABS@/release 
    7575scriptdir=              $(releasedir)/scripts 
    …… 
    9393PLUGIN_ROOT_ABS=        @PLUGIN_ROOT_ABS@ 
    9494JUGGLERROOT_ABS=        @JUGGLERROOT_ABS@ 
    95 PLUGIN_DIR_VERSION=     @PLUGIN_DIR_VERSION@ 
     95VRJ_PLUGIN_SUBDIR=     @PLUGIN_SUBDIR@ 
    9696 
    9797STATICLIB_EXT=          @STATICLIB_EXT@ 

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

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

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

    r20563 r20574  
    5252extra_libs = ${vrj_extra_ldflags} ${vrj_extra_libs} 
    5353 
     54vrj_header_subdir = @vrj_header_subdir@ 
     55vrj_data_subdir   = @vrj_data_subdir@ 
     56vrj_plugin_subdir = @vrj_plugin_subdir@ 
    5457########################### Public Variables ############################ 
    5558 
    …… 
    8790vrj_app_icons: ${vrj_share_dir}/data/bundle/vrjuggler.icns 
    8891vrj_app_all_resources: ${vrj_share_dir}/data/bundle/vrjuggler.icns ${vrj_share_dir}/data/bundle/vrjuggler.plist 
     92 
     93vrj_header_subdir: ${vrj_header_subdir} 
     94vrj_data_subdir: ${vrj_data_subdir} 
     95vrj_plugin_subdir: ${vrj_plugin_subdir}