Changeset 19023

Show
Ignore:
Timestamp:
07/11/06 15:21:30 (2 years ago)
Author:
patrick
Message:

Moved things around so that the contents of the *Param.h files is solely
preprocessor symbol definitions. This is what I had originally intended for
these files, but more importantly, this fends off a circular include problem
that would have been a huge hass le on Windows once we have automatic
linking in place.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/build_windows.py

    r19017 r19023  
    504504   mods = [] 
    505505   mods.append(JugglerModule(r'modules\vapor', vcDir, 'VPR', 
    506                              [(r'vpr\vprParam.h',), (r'vpr\vprParam.cpp',), 
     506                             [(r'vpr\vprParam.h',), 
    507507                              (r'vpr\version.rc', 
    508508                               os.path.join(gJugglerDir, 'version.rc.in'))])) 
    509509   mods.append(JugglerModule(r'modules\tweek', vcDir, 'Tweek_CXX', 
    510510                             [(r'tweek\tweekParam.h',), 
    511                               (r'tweek\tweekParam.cpp',), 
    512511                              (r'tweek\version.rc', 
    513512                               os.path.join(gJugglerDir, 'version.rc.in'))])) 
    …… 
    516515                               os.path.join(gJugglerDir, 
    517516                                            r'modules\jackal\common\jccl\jcclParam.h.in')), 
    518                               (r'jccl\jcclParam.cpp', 
    519                                os.path.join(gJugglerDir, 
    520                                             r'modules\jackal\common\jccl\jcclParam.cpp.in')), 
    521517                              (r'jccl\version.rc', 
    522518                               os.path.join(gJugglerDir, 'version.rc.in')) 
    523519                             ])) 
    524520   mods.append(JugglerModule(r'modules\sonix', vcDir, 'Sonix', 
    525                              [(r'snx\snxParam.h',), (r'snx\snxParam.cpp',), 
     521                             [(r'snx\snxParam.h',), 
    526522                              (r'snx\version.rc', 
    527523                               os.path.join(gJugglerDir, 'version.rc.in'))])) 
    528524   mods.append(JugglerModule(r'modules\gadgeteer', vcDir, 'Gadgeteer', 
    529525                             [(r'gadget\gadgetParam.h',), 
    530                               (r'gadget\gadgetParam.cpp',), 
    531526                              (r'gadget\version.rc', 
    532527                               os.path.join(gJugglerDir, 'version.rc.in'))])) 
    533528   mods.append(JugglerModule(r'modules\vrjuggler', vcDir, 'VRJuggler', 
    534                              [(r'vrj\vrjParam.h',), (r'vrj\vrjParam.cpp',), 
     529                             [(r'vrj\vrjParam.h',), 
    535530                              (r'vrj\version.rc', 
    536531                               os.path.join(gJugglerDir, 'version.rc.in'))])) 

  • juggler/trunk/modules/gadgeteer/Makefile.inc.in

    r18991 r19023  
    120120# Version information. 
    121121PARAM_HEADER=   gadget/gadgetParam.h 
    122 PARAM_SOURCE=   gadget/gadgetParam.cpp 
    123122BRANCH=         trunk 
    124123CANON_NAME=     Varda 
    …… 
    139138 
    140139# Things to do before the object files and library are built. 
    141 beforebuild: $(PARAM_HEADER) $(PARAM_SOURCE) 
     140beforebuild: $(PARAM_HEADER) 
    142141 
    143142$(PARAM_HEADER): $(GADGETROOT_ABS)/$(PARAM_HEADER).in $(GADGETROOT_ABS)/VERSION 
    144143        @$(MAKE) clean-version-links 
    145         @$(SHELL) $(scriptdir)/make-ver.sh -o $@                \ 
    146           -i $(GADGETROOT_ABS)/$@.in $(VER_ARGS) 
    147  
    148 $(PARAM_SOURCE): $(PARAM_HEADER) $(GADGETROOT_ABS)/$(PARAM_SOURCE).in 
    149144        @$(SHELL) $(scriptdir)/make-ver.sh -o $@                \ 
    150145          -i $(GADGETROOT_ABS)/$@.in $(VER_ARGS) 

  • juggler/trunk/modules/gadgeteer/gadget/Makefile.in

    r18863 r19023  
    6161                ProxyFactory.cpp                \ 
    6262                RemoteInputManager.cpp          \ 
    63                 VirtualDevice.cpp               \ 
    64                 gadgetParam.cpp 
     63                VirtualDevice.cpp 
    6564 
    6665include $(MKPATH)/dpp.obj-subdir.mk 

  • juggler/trunk/modules/gadgeteer/gadget/Util/Version.cpp

    r18824 r19023  
    3434{ 
    3535 
     36const char* GADGET_VERSION(__GADGET_VERSION_STRING__); 
     37 
    3638GADGET_IMPLEMENT(std::string) getVersionString () 
    3739{ 

  • juggler/trunk/modules/gadgeteer/gadget/Util/Version.h

    r18824 r19023  
    3838 
    3939/** 
     40 * This is the "human-readable" Gadgeteer version \em string. The full form 
     41 * includes the version number (major.minor.patch-build), the canonical name 
     42 * of the release, the threading subsystem, and the build date. The major 
     43 * version number is updated when major architectural changes are made; the 
     44 * minor when there are minor API changes; and the patch when there are bug 
     45 * fixes. The build number is usually representative of the nightly build 
     46 * process relative to a given version x.y.z. 
     47 * 
     48 * @see gadget::getVersionString() 
     49 */ 
     50extern GADGET_DATA_API(const char*) GADGET_VERSION; 
     51 
     52/** 
    4053 * Retruns the "human-readable" Gadgeteer version \em string. The full form 
    4154 * includes the version number (major.minor.patch-build), the canonical name 

  • juggler/trunk/modules/gadgeteer/gadget/gadgetParam.h.in

    r18824 r19023  
    2828#define _GAD_PARAM_H_ 
    2929 
    30 #include <gadget/gadgetConfig.h> 
    31  
    32  
    3330/** 
    3431 * The 9-digit Gadgeteer version integer. This form provides three digits for 
    …… 
    4037 
    4138/** 
     39 * The Gadgeteer version \em string. Instead of referencing this symbol, use 
     40 * gadget::GADGET_VERSION or gadget::getVersionString(). 
     41 */ 
     42#define __GADGET_VERSION_STRING__ @VER_STRING@ 
     43 
     44/** 
    4245 * The individual Gadgeteer version numbers. 
    4346 */ 
    …… 
    4649#define __GADGET_PATCH__ @PATCH_VER_NUMBER@ 
    4750 
    48 namespace gadget 
    49 { 
    50    /** 
    51     * This is the "human-readable" Gadgeteer version \em string. The full form 
    52     * includes the version number (major.minor.patch-build), the canonical 
    53     * name of the release, the threading subsystem, and the build date. The 
    54     * major version number is updated when major architectural changes are 
    55     * made; the minor when there are minor API changes; and the patch when 
    56     * there are bug fixes. The build number is usually representative of the 
    57     * nightly build process relative to a given version x.y.z. 
    58     * 
    59     * @see gadget::getVersionString() 
    60     */ 
    61    extern GADGET_DATA_API(const char*) GADGET_VERSION; 
    62 } 
    63  
    64  
    6551#endif  /* _GAD_PARAM_H_ */ 

  • juggler/trunk/modules/jackal/Makefile.inc.in

    r18990 r19023  
    125125# Version information. 
    126126PARAM_HEADER=   common/jccl/jcclParam.h 
    127 PARAM_SOURCE=   common/jccl/jcclParam.cpp 
    128127BRANCH=         trunk 
    129128CANON_NAME=     Melkor 
    …… 
    144143 
    145144# Things to do before the object files and library are built. 
    146 beforebuild: $(PARAM_HEADER) $(PARAM_SOURCE) 
     145beforebuild: $(PARAM_HEADER) 
    147146 
    148147$(PARAM_HEADER): $(JCCLROOT_ABS)/$(PARAM_HEADER).in $(JCCLROOT_ABS)/VERSION 
    149148        @$(MAKE) clean-version-links 
    150         @$(SHELL) $(scriptdir)/make-ver.sh -o $@                \ 
    151           -i $(JCCLROOT_ABS)/$@.in $(VER_ARGS) 
    152  
    153 $(PARAM_SOURCE): $(PARAM_HEADER) $(JCCLROOT_ABS)/$(PARAM_SOURCE).in 
    154149        @$(SHELL) $(scriptdir)/make-ver.sh -o $@                \ 
    155150          -i $(JCCLROOT_ABS)/$@.in $(VER_ARGS) 

  • juggler/trunk/modules/jackal/common/jccl/Makefile.in

    r18824 r19023  
    4848                Util 
    4949 
    50 SRCS=           jcclParam.cpp 
     50SRCS=            
    5151 
    5252EXTRA_INCLUDES= \ 

  • juggler/trunk/modules/jackal/common/jccl/Util/Version.cpp

    r18824 r19023  
    3434{ 
    3535 
     36const char* JCCL_VERSION(__JCCL_VERSION_STRING__); 
     37 
    3638JCCL_IMPLEMENT(std::string) getVersionString () 
    3739{ 

  • juggler/trunk/modules/jackal/common/jccl/Util/Version.h

    r18824 r19023  
    3838 
    3939/** 
     40 * This is the "human-readable" JCCL version \em string. The full form 
     41 * includes the version number (major.minor.patch-build), the canonical name 
     42 * of the release, the threading subsystem, and the build date. The major 
     43 * version number is updated when major architectural changes are made; the 
     44 * minor when there are minor API changes; and the patch when there are bug 
     45 * fixes. The build number is usually representative of the nightly build 
     46 * process relative to a given version x.y.z. 
     47 * 
     48 * @see jccl::getVersionString() 
     49 */ 
     50extern JCCL_DATA_API(const char*) JCCL_VERSION; 
     51 
     52/** 
    4053 * Retruns the "human-readable" JCCL version \em string. The full form includes 
    4154 * the version number (major.minor.patch-build), the canonical name of the 

  • juggler/trunk/modules/jackal/common/jccl/jcclParam.h.in

    r18883 r19023  
    2828#define _JCCL_PARAM_H_ 
    2929 
    30 #include <jccl/jcclConfig.h> 
    31  
    32  
    3330/** 
    3431 * The 9-digit JCCl version integer. This form provides three digits for each 
    …… 
    4037 
    4138/** 
     39 * The JCCL version \em string. Instead of referencing this symbol, use 
     40 * jccl::JCCL_VERSION or jccl::getVersionString(). 
     41 */ 
     42#define __JCCL_VERSION_STRING__ @VER_STRING@ 
     43 
     44/** 
    4245 * Individual JCCL verions numbers 
    4346 */ 
    …… 
    4649#define __JCCL_PATCH__ @PATCH_VER_NUMBER@ 
    4750 
    48 namespace jccl 
    49 { 
    50    /** 
    51     * This is the "human-readable" JCCL version \em string. The full form 
    52     * includes the version number (major.minor.patch-build), the canonical 
    53     * name of the release, the threading subsystem, and the build date. The 
    54     * major version number is updated when major architectural changes are 
    55     * made; the minor when there are minor API changes; and the patch when 
    56     * there are bug fixes. The build number is usually representative of the 
    57     * nightly build process relative to a given version x.y.z. 
    58     * 
    59     * @see jccl::getVersionString() 
    60     */ 
    61    extern JCCL_DATA_API(const char*) JCCL_VERSION; 
    62 } 
    63  
    64  
    6551#endif  /* _JCCL_PARAM_H_ */ 

  • juggler/trunk/modules/sonix/Makefile.inc.in

    r18992 r19023  
    115115# Version information. 
    116116PARAM_HEADER=   snx/snxParam.h 
    117 PARAM_SOURCE=   snx/snxParam.cpp 
    118117BRANCH=         trunk 
    119118CANON_NAME=     Ulmo 
    …… 
    133132 
    134133# Things to do before the object files and library are built. 
    135 beforebuild: $(PARAM_HEADER) $(PARAM_SOURCE) 
     134beforebuild: $(PARAM_HEADER) 
    136135 
    137136$(PARAM_HEADER): $(ROOT_ABS)/$(PARAM_HEADER).in $(ROOT_ABS)/VERSION 
    138137        @$(MAKE) clean-version-links 
    139         @$(SHELL) $(scriptdir)/make-ver.sh -o $@                \ 
    140           -i $(ROOT_ABS)/$@.in $(VER_ARGS) 
    141  
    142 $(PARAM_SOURCE): $(PARAM_HEADER) $(ROOT_ABS)/$(PARAM_SOURCE).in 
    143138        @$(SHELL) $(scriptdir)/make-ver.sh -o $@                \ 
    144139          -i $(ROOT_ABS)/$@.in $(VER_ARGS) 

  • juggler/trunk/modules/sonix/snx/Makefile.in

    r18824 r19023  
    4343INSTALL=        @INSTALL@ 
    4444SUBOBJDIR=      $(SNX_LIBRARY) 
    45 EXTRA_CXXFLAGS+= -DVJ_ROOT_DIR="\"$(instprefix)\"" 
    4645 
    4746# Prefix for recursive stuff. 
    …… 
    5251                SoundImplementation.cpp         \ 
    5352                StubSoundImplementation.cpp     \ 
    54                 snxParam.cpp                    \ 
    5553                sonix.cpp 
    5654 

  • juggler/trunk/modules/sonix/snx/Util/Version.cpp

    r18824 r19023  
    4343{ 
    4444 
     45const char* SNX_VERSION(__SNX_VERSION_STRING__); 
     46 
    4547SNX_IMPLEMENT(std::string) getVersionString () 
    4648{ 

  • juggler/trunk/modules/sonix/snx/Util/Version.h

    r18824 r19023  
    4747 
    4848/** 
     49 * This is the "human-readable" Sonix version \em string. The full form 
     50 * includes the version number (major.minor.patch-build), the canonical name 
     51 * of the release, the threading subsystem, and the build date. The major 
     52 * version number is updated when major architectural changes are made; the 
     53 * minor when there are minor API changes; and the patch when there are bug 
     54 * fixes. The build number is usually representative of the nightly build 
     55 * process relative to a given version x.y.z. 
     56 * 
     57 * @see snx::getVersionString() 
     58 */ 
     59extern SNX_DATA_API(const char*) SNX_VERSION; 
     60 
     61/** 
    4962 * Retruns the "human-readable" Sonix version \em string. The full form 
    5063 * includes the version number (major.minor.patch-build), the canonical name 

  • juggler/trunk/modules/sonix/snx/snxParam.h.in

    r18869 r19023  
    3737#define _SNX_PARAM_H_ 
    3838 
    39  
    4039/** 
    4140 * The 9-digit Sonix version integer. This form provides three digits for each 
    …… 
    4645#define __SNX_version @VER_NUMBER@ 
    4746 
     47/** 
     48 * The Sonix version \em string. Instead of referencing this symbol, use 
     49 * snx::SNX_VERSION or snx::getVersionString(). 
     50 */ 
     51#define __SNX_VERSION_STRING__ @VER_STRING@ 
     52 
    4853/**  
    4954 * The individual SNX version numbers. 
    …… 
    5358#define __SNX_PATCH__ @PATCH_VER_NUMBER@ 
    5459 
    55 namespace snx 
    56 { 
    57    /** 
    58     * This is the "human-readable" Sonix version \em string. The full form 
    59     * includes the version number (major.minor.patch-build), the canonical 
    60     * name of the release, the threading subsystem, and the build date. The 
    61     * major version number is updated when major architectural changes are 
    62     * made; the minor when there are minor API changes; and the patch when 
    63     * there are bug fixes. The build number is usually representative of the 
    64     * nightly build process relative to a given version x.y.z. 
    65     * 
    66     * @see snx::getVersionString() 
    67     */ 
    68    extern SNX_DATA_API(const char*) SNX_VERSION; 
    69 } 
    70  
    71  
    7260#endif  /* _SNX_PARAM_H_ */ 

  • juggler/trunk/modules/tweek/Makefile.inc.in

    r18989 r19023  
    119119# Version information. 
    120120PARAM_HEADER=   tweek/tweekParam.h 
    121 PARAM_SOURCE=   tweek/tweekParam.cpp 
    122121BRANCH=         trunk 
    123122CANON_NAME=     Aule 
    …… 
    140139beforebuild: 
    141140        @$(MAKE) $(PARAM_HEADER) 
    142         @$(MAKE) $(PARAM_SOURCE) 
    143141        @echo "------------------------------------------------" 
    144142        @echo "IDL code generation phase" 
    …… 
    152150$(PARAM_HEADER): $(TWEEKROOT_ABS)/$(PARAM_HEADER).in $(TWEEKROOT_ABS)/VERSION 
    153151        @$(MAKE) clean-version-links 
    154         @$(SHELL) $(scriptdir)/make-ver.sh -o $@                \ 
    155           -i $(TWEEKROOT_ABS)/$@.in $(VER_ARGS) 
    156  
    157 $(PARAM_SOURCE): $(PARAM_HEADER) $(TWEEKROOT_ABS)/$(PARAM_SOURCE).in 
    158152        @$(SHELL) $(scriptdir)/make-ver.sh -o $@                \ 
    159153          -i $(TWEEKROOT_ABS)/$@.in $(VER_ARGS) 

  • juggler/trunk/modules/tweek/tweek/Makefile.in

    r18824 r19023  
    5050                idl 
    5151 
    52 SRCS=           tweekParam.cpp 
     52SRCS=            
    5353 
    5454include $(MKPATH)/dpp.obj-subdir.mk 

  • juggler/trunk/modules/tweek/tweek/Util/Version.cpp

    r18824 r19023  
    3434{ 
    3535 
     36const char* TWEEK_VERSION(__TWEEK_VERSION_STRING__); 
     37 
    3638std::string getVersionString() 
    3739{ 

  • juggler/trunk/modules/tweek/tweek/Util/Version.h

    r18824 r19023  
    3838 
    3939/** 
     40 * This is the "human-readable" Tweek version \em string. The full form 
     41 * includes the version number (major.minor.patch-build), the canonical name 
     42 * of the release, the threading subsystem, and the build date. The major 
     43 * version number is updated when major architectural changes are made; the 
     44 * minor when there are minor API changes; and the patch when there are bug 
     45 * fixes. The build number is usually representative of the nightly build 
     46 * process relative to a given version x.y.z. 
     47 * 
     48 * @see tweek::getVersionString() 
     49 */ 
     50extern TWEEK_DATA_API(const char*) TWEEK_VERSION; 
     51 
     52/** 
    4053 * Retruns the "human-readable" Tweek version \em string. The full form 
    4154 * includes the version number (major.minor.patch-build), the canonical name 

  • juggler/trunk/modules/tweek/tweek/tweekParam.h.in

    r18881 r19023  
    2828#define _TWEEK_PARAM_H_ 
    2929 
    30  
    3130/** 
    3231 * The 9-digit Tweek version integer. This form provides three digits for each 
    …… 
    3837 
    3938/** 
     39 * The Tweek version \em string. Instead of referencing this symbol, use 
     40 * tweek::TWEEK_VERSION or tweek::getVersionString(). 
     41 */ 
     42#define __TWEEK_VERSION_STRING__ @VER_STRING@ 
     43 
     44/** 
    4045 * The individual TWEEK version numbers 
    4146 */ 
    …… 
    4449#define __TWEEK_PATCH__ @PATCH_VER_NUMBER@ 
    4550 
    46  
    47 namespace tweek 
    48 { 
    49    /** 
    50     * This is the "human-readable" Tweek version \em string. The full form 
    51     * includes the version number (major.minor.patch-build), the canonical 
    52     * name of the release, the threading subsystem, and the build date. The 
    53     * major version number is updated when major architectural changes are 
    54     * made; the minor when there are minor API changes; and the patch when 
    55     * there are bug fixes. The build number is usually representative of the 
    56     * nightly build process relative to a given version x.y.z. 
    57     * 
    58     * @see tweek::getVersionString() 
    59     */ 
    60    extern TWEEK_DATA_API(const char*) TWEEK_VERSION; 
    61 } 
    62  
    63  
    6451#endif  /* _TWEEK_PARAM_H_ */ 

  • juggler/trunk/modules/vapor/Makefile.inc.in

    r18969 r19023  
    120120# Version information. 
    121121PARAM_HEADER=   vpr/vprParam.h 
    122 PARAM_SOURCE=   vpr/vprParam.cpp 
    123122BRANCH=         trunk 
    124123CANON_NAME=     Manwe 
    …… 
    138137 
    139138# Things to do before the object files and library are built. 
    140 beforebuild: $(PARAM_HEADER) $(PARAM_SOURCE) 
     139beforebuild: $(PARAM_HEADER) 
    141140 
    142141$(PARAM_HEADER): $(VPRROOT_ABS)/$(PARAM_HEADER).in $(VPRROOT_ABS)/VERSION 
    143142        @$(MAKE) clean-version-links 
    144         @$(SHELL) $(scriptdir)/make-ver.sh -o $@                        \ 
    145           -i $(VPRROOT_ABS)/$@.in $(VER_ARGS) 
    146  
    147 $(PARAM_SOURCE): $(PARAM_HEADER) $(VPRROOT_ABS)/$(PARAM_SOURCE).in 
    148143        @$(SHELL) $(scriptdir)/make-ver.sh -o $@                        \ 
    149144          -i $(VPRROOT_ABS)/$@.in $(VER_ARGS) 

  • juggler/trunk/modules/vapor/vpr/Makefile.in

    r18824 r19023  
    6060                md 
    6161 
    62 SRCS=           SystemBase.cpp  \ 
    63                 vprParam.cpp 
     62SRCS=           SystemBase.cpp 
    6463 
    6564include $(MKPATH)/dpp.obj-subdir.mk 

  • juggler/trunk/modules/vapor/vpr/Util/Version.cpp

    r18824 r19023  
    4343{ 
    4444 
     45const char* VPR_VERSION(__VPR_VERSION_STRING__); 
     46 
    4547VPR_IMPLEMENT(std::string) getVersionString () 
    4648{ 

  • juggler/trunk/modules/vapor/vpr/Util/Version.h

    r18824 r19023  
    4848 
    4949/** 
     50 * This is the "human-readable" VPR version \em string. The full form includes 
     51 * the version number (major.minor.patch-build), the canonical name of the 
     52 * release, the threading subsystem, and the build date. The major version 
     53 * number is updated when major architectural changes are made; the minor 
     54 * when there are minor API changes; and the patch when there are bug fixes. 
     55 * The build number is usually representative of the nightly build process 
     56 * relative to a given version x.y.z. 
     57 * 
     58 * @see vpr::getVersionString() 
     59 */ 
     60extern VPR_DATA_API(const char*) VPR_VERSION; 
     61 
     62/** 
    5063 * Retruns the "human-readable" VPR version \em string. The full form includes 
    5164 * the version number (major.minor.patch-build), the canonical name of the 

  • juggler/trunk/modules/vapor/vpr/vprParam.h.in

    r18856 r19023  
    3737#define _VPR_PARAM_H_ 
    3838 
    39 #include <vpr/vprConfig.h> 
    40  
    4139/** 
    4240 * The 9-digit VPR version integer. This form provides three digits for each of 
    …… 
    4846 
    4947/** 
     48 * The VPR version \em string. Instead of referencing this symbol, use 
     49 * vpr::VPR_VERSION or vpr::getVersionString(). 
     50 */ 
     51#define __VPR_VERSION_STRING__ @VER_STRING@ 
     52 
     53/** 
    5054 * The individual VPR version numbers. 
    5155 */ 
    …… 
    5458#define __VPR_PATCH__ @PATCH_VER_NUMBER@ 
    5559 
    56 namespace vpr 
    57 { 
    58    /** 
    59     * This is the "human-readable" VPR version \em string. The full form 
    60     * includes the version number (major.minor.patch-build), the canonical 
    61     * name of the release, the threading subsystem, and the build date. The 
    62     * major version number is updated when major architectural changes are 
    63     * made; the minor when there are minor API changes; and the patch when 
    64     * there are bug fixes. The build number is usually representative of the 
    65     * nightly build process relative to a given version x.y.z. 
    66     * 
    67     * @see vpr::getVersionString() 
    68     */ 
    69    extern VPR_DATA_API(const char*) VPR_VERSION; 
    70 } 
    71  
    72  
    7360#endif  /* _VPR_PARAM_H_ */ 

  • juggler/trunk/modules/vrjuggler/Makefile.inc.in

    r18974 r19023  
    144144# Version information. 
    145145PARAM_HEADER=   vrj/vrjParam.h 
    146 PARAM_SOURCE=   vrj/vrjParam.cpp 
    147146BRANCH=         trunk 
    148147CANON_NAME=     Illuvatar 
    …… 
    163162 
    164163# Things to do before the object files and library are built. 
    165 beforebuild: 
    166         @$(MAKE) $(PARAM_HEADER) 
    167         @$(MAKE) $(PARAM_SOURCE) 
     164beforebuild: $(PARAM_HEADER) 
    168165 
    169166$(PARAM_HEADER): $(VJROOT_ABS)/$(PARAM_HEADER).in $(VJROOT_ABS)/VERSION 
    170167        @$(MAKE) clean-version-links 
    171         @$(SHELL) $(scriptdir)/make-ver.sh -o $@                \ 
    172           -i $(VJROOT_ABS)/$@.in $(VER_ARGS) 
    173  
    174 $(PARAM_SOURCE): $(PARAM_HEADER) $(VJROOT_ABS)/$(PARAM_SOURCE).in 
    175168        @$(SHELL) $(scriptdir)/make-ver.sh -o $@                \ 
    176169          -i $(VJROOT_ABS)/$@.in $(VER_ARGS) 

  • juggler/trunk/modules/vrjuggler/vrj/Kernel/Kernel.cpp

    r18824 r19023  
    3232#include <vrj/Kernel/Kernel.h> 
    3333#include <vrj/Util/Debug.h> 
     34#include <vrj/Util/Version.h> 
    3435#include <vrj/Draw/DrawManager.h> 
    3536#include <vrj/Display/DisplayManager.h> 

  • juggler/trunk/modules/vrjuggler/vrj/Makefile.in

    r18824 r19023  
    5353                Util 
    5454 
    55 SRCS=           vrjParam.cpp 
     55SRCS=            
    5656 
    5757include $(MKPATH)/dpp.obj-subdir.mk 

  • juggler/trunk/modules/vrjuggler/vrj/Util/Version.cpp

    r18824 r19023  
    3434{ 
    3535 
     36const char* VJ_VERSION(__VJ_VERSION_STRING__); 
     37 
    3638std::string getVersionString() 
    3739{ 

  • juggler/trunk/modules/vrjuggler/vrj/Util/Version.h

    r18824 r19023  
    3838 
    3939/** 
     40 * This is the "human-readable" VR Juggler version \em string. The full form 
     41 * includes the version number (major.minor.patch-build), the canonical name 
     42 * of the release, the threading subsystem, and the build date. The major 
     43 * version number is updated when major architectural changes are made; the 
     44 * minor when there are minor API changes; and the patch when there are bug 
     45 * fixes. The build number is usually representative of the nightly build 
     46 * process relative to a given version x.y.z. 
     47 * 
     48 * @see vrj::getVersionString() 
     49 */ 
     50extern VJ_DATA_API(const char*) VJ_VERSION; 
     51 
     52/** 
    4053 * Retruns the "human-readable" VR Juggler version \em string. The full form 
    4154 * includes the version number (major.minor.patch-build), the canonical name 

  • juggler/trunk/modules/vrjuggler/vrj/vrjParam.h.in

    r18889 r19023  
    2828#define _VJ_PARAM_H_ 
    2929 
    30 #include <vrj/vrjConfig.h> 
    31  
    32  
    3330/** 
    3431 * The 9-digit VR Juggler version integer. This form provides three digits for 
    …… 
    4037 
    4138/** 
     39 * The VR Juggler version \em string. Instead of referencing this symbol, use 
     40 * vrj::VJ_VERSION or vrj::getVersionString(). 
     41 */ 
     42#define __VJ_VERSION_STRING__ @VER_STRING@ 
     43 
     44/** 
    4245 * The individual VR Juggler version numbers. 
    4346 */ 
    …… 
    4649#define __VJ_PATCH__ @PATCH_VER_NUMBER@ 
    4750 
    48 namespace vrj 
    49 { 
    50    /** 
    51     * This is the "human-readable" VR Juggler version \em string. The full form 
    52     * includes the version number (major.minor.patch-build), the canonical 
    53     * name of the release, the threading subsystem, and the build date. The 
    54     * major version number is updated when major architectural changes are 
    55     * made; the minor when there are minor API changes; and the patch when 
    56     * there are bug fixes. The build number is usually representative of the 
    57     * nightly build process relative to a given version x.y.z. 
    58     * 
    59     * @see vrj::getVersionString() 
    60     */ 
    61    extern VJ_DATA_API(const char*) VJ_VERSION; 
    62 } 
    63  
    64  
    6551#endif  /* _VJ_PARAM_H_ */ 

  • juggler/trunk/vc7/Gadgeteer/Gadgeteer.vcproj

    r19018 r19023  
    334334                                RelativePath="..\..\modules\gadgeteer\gadget\VirtualDevice.cpp"> 
    335335                        </File> 
    336                         <File 
    337                                 RelativePath="gadget\gadgetParam.cpp"> 
    338                         </File> 
    339336                </Filter> 
    340337                <Filter 

  • juggler/trunk/vc7/JCCL/JCCL.vcproj

    r19018 r19023  
    158158                                RelativePath="..\..\modules\jackal\common\jccl\Util\Version.cpp"> 
    159159                        </File> 
    160                         <File 
    161                                 RelativePath="jccl\jcclParam.cpp"> 
    162                         </File> 
    163160                </Filter> 
    164161                <Filter 

  • juggler/trunk/vc7/Sonix/Sonix.vcproj

    <
    r19018 r19023  
    135135                        </File>