Changeset 20617

Show
Ignore:
Timestamp:
07/31/07 17:08:54 (1 year ago)
Author:
patrick
Message:

Use the actual version numbers for the Juggler modules instead of relying
on substitution at build time. I decided to do this because I do not feel
like making build_windows.py more complicated than it already is. The
issue is that the variable containing the module version (such as
GADGET_VERSION) gets used in two different contexts on Windows:

  1. In the substitution of @GADGET_VERSION@ in the generation of the .fpc
    files.
  2. As an environment variable used to set the version component of the
    DLL name in the Visual C++ build.

If it weren't for #2, we could use the major.minor.micro form for these
substitutions in the same way that we do on non-Windows platforms.

That said, doing the version requirements this way for Flagpoll is not so
bad. Given the goal of having binary compatibility between 2.2.x patch
releases, these requirements settings are perfectly valid. It's just messy.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r20571 r20617  
    5757Version: ${gadget_version} 
    5858Provides: gadgeteer 
    59 Requires: jccl = @JCCL_VERSION@ vpr = @VPR_VERSION@ gmtl >= @MIN_GMTL_VERSION@ 
     59Requires: jccl >= 1.2 jccl < 1.3 vpr >= 2.0 vpr < 2.1 gmtl >= @MIN_GMTL_VERSION@ 
    6060Arch: ${ISA} 
    6161Cflags: ${gadget_cxxflags} ${gadget_extra_cxxflags} -I${includedir} 

  • juggler/branches/2.2/modules/jackal/jccl.fpc.in

    r20572 r20617  
    5454Version: ${jccl_version} 
    5555Provides: jccl JCCL 
    56 Requires: vpr = @VPR_VERSION@ 
     56Requires: vpr >= 2.0 vpr < 2.1 
    5757Arch: ${ISA} 
    5858Libs: ${jccl_ldflags} ${jccl_libs} ${extra_libs} 

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

    r20573 r20617  
    5151Version: ${snx_version} 
    5252Provides: sonix 
    53 Requires: vpr = @VPR_VERSION@ gmtl >= @MIN_GMTL_VERSION@ 
     53Requires: vpr >= 2.0 vpr < 2.1 gmtl >= @MIN_GMTL_VERSION@ 
    5454Arch: ${ISA} 
    5555Cflags: ${snx_cxxflags} ${snx_extra_cxxflags} -I${includedir} 

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

    r20611 r20617  
    4646Version: ${tweek_version} 
    4747Provides: tweek tweek-c++ 
    48 Requires: @CXX_ORB_DEPS@ vpr = @VPR_VERSION@ 
     48Requires: @CXX_ORB_DEPS@ vpr >= 2.0 vpr < 2.1 
    4949Arch: ${ISA} 
    5050Libs: ${tweek_ldflags} ${tweek_libs} ${extra_libs} 

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

    r20574 r20617  
    6363Version: ${vrj_version} 
    6464Provides: vrjuggler 
    65 Requires: gadgeteer = @GADGET_VERSION@ sonix = @SNX_VERSION@ jccl = @JCCL_VERSION@ vpr = @VPR_VERSION@ 
     65Requires: gadgeteer >= 1.2 gadgeteer < 1.3 sonix >= 1.2 sonix < 1.3 jccl >= 1.2 jccl < 1.3 vpr >= 2.0 vpr < 2.1 
    6666Arch: ${ISA} 
    6767Cflags: ${vrj_cxxflags} ${vrj_extra_cxxflags} -I${includedir}