Changeset 20519

Timestamp:

07/09/07 15:40:15 (1 year ago)

Author:

patrick

Message:

Improve the Flagpoll situation on Windows. The generated .fpc files are now
more complete, and the Boost-related .fpc files are actually generated.

Files:

• juggler/trunk/build_windows.py (modified) (9 diffs)
• juggler/trunk/modules/vapor/boost_filesystem.fpc.in (modified) (2 diffs)
• juggler/trunk/modules/vapor/boost_signals.fpc.in (modified) (2 diffs)
• juggler/trunk/modules/vapor/configure.ac (modified) (4 diffs)
• juggler/trunk/modules/vrjuggler/boost_program_options.fpc.in (modified) (2 diffs)
• juggler/trunk/modules/vrjuggler/configure.ac (modified) (2 diffs)

juggler/trunk/build_windows.py

@@ -455 +455 @@
-   cache_file.close()
-
+def getBoostVersion():
+   boost_ver_re = re.compile(r'#define\s+BOOST_LIB_VERSION\s+"(.+)"')
+
+   info = ('0', '0', '0')
+   if os.environ.has_key('BOOST_INCLUDES'):
+      ver_file = open(os.path.join(os.environ['BOOST_INCLUDES'], 'boost',
+                                   'version.hpp'))
+      lines = ver_file.readlines()
+      ver_file.close()
+      for l in lines:
+         match = boost_ver_re.search(l)
+         if match is not None:
+            ver_info = match.group(1).split('_')
+            info = tuple(ver_info)
+            break
+
+   return info
+
+def buildVersion(inputFile, exps):
+   ver_file = open(inputFile)
+   lines = ver_file.readlines()
+   ver_file.close()
+
+   nums = [0 for e in exps]
+
+   for l in lines:
+      i = 0
+      while i < len(exps):
+         match = exps[i].search(l)
+         if match is not None:
+            nums[i] = match.group(1)
+            break
+         i = i + 1
+
+   return tuple(nums)
+
+def getCppDOMVersion():
+   exps = [
+      re.compile(r'#define\s+CPPDOM_VERSION_MAJOR\s+(\d+)'),
+      re.compile(r'#define\s+CPPDOM_VERSION_MINOR\s+(\d+)'),
+      re.compile(r'#define\s+CPPDOM_VERSION_PATCH\s+(\d+)')
+   ]
+
+   info = (0, 0, 0)
+   if os.environ.has_key('CPPDOM_INCLUDES'):
+      info = buildVersion(os.path.join(os.environ['CPPDOM_INCLUDES'], 'cppdom',
+                                       'version.h'),
+                          exps)
+
+   return info
+
+def getGMTLVersion():
+   exps = [
+      re.compile(r'#define\s+GMTL_VERSION_MAJOR\s+(\d+)'),
+      re.compile(r'#define\s+GMTL_VERSION_MINOR\s+(\d+)'),
+      re.compile(r'#define\s+GMTL_VERSION_PATCH\s+(\d+)')
+   ]
+
+   nums = [0, 0, 0]
+   if os.environ.has_key('GMTL_INCLUDES'):
+      info = buildVersion(os.path.join(os.environ['GMTL_INCLUDES'], 'gmtl',
+                                       'Version.h'),
+                          exps)
+
+   return info
+
-def updateVersions(vcDir, options):
-   class JugglerModule:
@@ -493 +559 @@
-               self.__genParamFile(output, template)
-
+      def getVersion(self, joinStr, versionInfo = None):
+         if versionInfo is None:
+            (version, major, minor, patch, build) = self.__getVersionInfo()
+         else:
+            (version, major, minor, patch, build) = versionInfo
+         return '%d%s%d%s%d' % (major, joinStr, minor, joinStr, patch)
+
-      def setVersionEnvVar(self):
-
-
-
-
+
+
+
-
-      def removeOldVersions(self):
@@ -606 +678 @@
-
-   vpr_subst_vars = {}
-
-
-
+
+
-   vpr_subst_vars['vpr_libs'] = ''
-_linker
+
-   vpr_subst_vars['vpr_extra_libs'] = 'libnspr4.lib libplc4.lib'
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-   # XXX: These are pretty weak assumptions.
@@ -641 +720 @@
-             os.environ['OMNIORB_VERSION'])
-
-
-
+
-   tweek_subst_vars['tweek_libs'] = ''
-   tweek_subst_vars['tweek_extra_ldflags'] = r'/libpath:${VJ_DEPS_DIR}\lib'
@@ -655 +733 @@
-   tweek_subst_vars['tweek_java_api_jars'] = ';'.join(tweek_jars)
-   tweek_subst_vars['tweek_ext_jars'] = ';'.join(tweek_ext_jars)
+   #tweek_subst_vars['CXX_ORB_DEPS'] = 'omniORB4 omnithread3 omniDynamic4'
+   tweek_subst_vars['VPR_VERSION'] = vpr_module.getVersion('.')
-
-   if tweek_have_cxx:
@@ -667 +747 @@
-
-   tweek_subst_vars['BUILD_PYTHON_IDL'] = 'N'
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-   jccl_jars = []
@@ -680 +761 @@
-   jccl_subst_vars = {}
-   jccl_subst_vars['jccl_cxxflags'] = '/EHsc /GR'
-
-
+
-   jccl_subst_vars['jccl_libs'] = ''
-   jccl_subst_vars['BUILD_CXX'] = tweek_subst_vars['BUILD_CXX']
-   jccl_subst_vars['BUILD_JAVA'] = tweek_subst_vars['BUILD_JAVA']
-   jccl_subst_vars['jccl_java_api_jars'] = ';'.join(jccl_jars)
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-   snx_subst_vars = {}
-   snx_subst_vars['snx_cxxflags'] = '/EHsc /GR'
-
-
+
-   snx_subst_vars['snx_libs'] = ''
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-   gadget_subst_vars = {}
-   gadget_subst_vars['gadget_cxxflags'] = '/EHsc /GR'
-
-
+
-   gadget_subst_vars['gadget_libs'] = ''
-   gadget_subst_vars['gadget_extra_libs'] = \
-      'comctl32.lib ws2_32.lib user32.lib'
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-   vrj_subst_vars = {}
-   vrj_subst_vars['vrj_cxxflags'] = '/EHsc /GR'
-
-
+
-   vrj_subst_vars['vrj_libs'] = ''
-   vrj_subst_vars['vrj_ogl_extra_libs'] = 'opengl32.lib glu32.lib'
-   vrj_subst_vars['vrj_pf_extra_libs'] = \
-      '/libpath:${PFROOT}\lib libpf.lib libpfdu-util.lib libpfui.lib opengl32.lib glu32.lib'
+   vrj_subst_vars['VPR_VERSION'] = jccl_subst_vars['VPR_VERSION']
+   vrj_subst_vars['JCCL_VERSION'] = gadget_subst_vars['JCCL_VERSION']
+   vrj_subst_vars['SNX_VERSION'] = snx_module.getVersion('.')
+   vrj_subst_vars['GADGET_VERSION'] = gadget_module.getVersion('.')
+   vrj_subst_vars['BOOST_ROOT'] = r'${fpc_file_cwd}\..\..'
+   vrj_subst_vars['BOOST_VERSION_DOT'] = '.'.join(getBoostVersion())
+   vrj_subst_vars['BOOST_INCLUDES'] = r'/I${prefix}\include'
+   vrj_subst_vars['BOOST_LDFLAGS'] = r'/libpath:${prefix}\lib'
-   mods.append(JugglerModule(r'modules\vrjuggler', vcDir, 'VRJuggler',
-                             'VRJ_VERSION', vrj_subst_vars,
-                             [(r'vrj\vrjParam.h',), ('vrjuggler.fpc',),
+                              ('boost_program_options.fpc',),
-                              (r'vrj\version.rc',
-                               os.path.join(gJugglerDir, 'version.rc.in'))]))
-
-   for m in mods:
-
+#
-      m.updateParamFiles()
-      m.removeOldVersions()
@@ -1093 +1190 @@
-
-   destdir = os.path.join(prefix, 'lib', 'flagpoll')
-
+
+
+
-
-   destdir = os.path.join(prefix, 'share', 'vpr', 'test')
@@ -1498 +1597 @@
-
-   destdir = os.path.join(prefix, 'lib', 'flagpoll')
-
+
+
+
-
-   destdir = os.path.join(prefix, 'share', 'vrjuggler', 'data')

juggler/trunk/modules/vapor/boost_filesystem.fpc.in

@@ -1 +1 @@
-# Private Variables
-prefix = @BOOST_ROOT@
+boost_ldflags = @BOOST_LDFLAGS@ @BOOST_FS_LINK@
-
-# Standard Flagpoll Variables
@@ -11 +12 @@
-Arch: @ISA@
-Cflags: @BOOST_INCLUDES@
--L@BOOST_LIBDIR@ -l@boost_fs_name@
+${boost_ldflags}

juggler/trunk/modules/vapor/boost_signals.fpc.in

@@ -1 +1 @@
-# Private Variables
-prefix = @BOOST_ROOT@
+boost_ldflags = @BOOST_LDFLAGS@ @BOOST_SIGNALS_LINK@
-
-# Standard Flagpoll Variables
@@ -11 +12 @@
-Arch: @ISA@
-Cflags: @BOOST_INCLUDES@
--L@BOOST_LIBDIR@ -l@boost_signals_name@
+${boost_ldflags}

juggler/trunk/modules/vapor/configure.ac

@@ -757 +757 @@
-if test "x$vpr_have_boost_fs" != "xyes" ; then
-   AC_MSG_ERROR([*** Boost.Filesystem required by VPR ***])
+else
+   BOOST_FS_LINK="-l$boost_fs_name"
-fi
-
@@ -799 +801 @@
-if test "x$vpr_have_boost_signals" != "xyes" ; then
-   AC_MSG_ERROR([*** Boost.Signals required by VPR ***])
+else
+   BOOST_SIGNALS_LINK="-l$boost_signals_name"
-fi
-
@@ -971 +975 @@
-UNIX_VPRROOT_ABS="$VPRROOT_ABS"
-
-at
+signals
-if test "x$OS_TYPE" = "xWin32" ; then
-    APP_EXTRA_LIBS="$LDFLAGS $LIBS $CPPDOM_LDFLAGS $CPPDOM_LIBS $BOOST_LDFLAGS_LINK_EXE $boost_signals_name.lib $boost_fs_name.lib $NSPR_LDFLAGS_LINK_EXE $NSPR_LIB_LINK_EXE $PLC_LIB_LINK_EXE ws2_32.lib"
@@ -1141 +1145 @@
-AC_SUBST(BOOST_VERSION_DOT)
-AC_SUBST(BOOST_LIBDIR)
+AC_SUBST(BOOST_FS_LINK)
-AC_SUBST(boost_fs_name)
+AC_SUBST(BOOST_SIGNALS_LINK)
-AC_SUBST(boost_signals_name)
-AC_SUBST(subsystem_cxxflags)

juggler/trunk/modules/vrjuggler/boost_program_options.fpc.in

@@ -1 +1 @@
-# Private Variables
-prefix = @BOOST_ROOT@
+boost_ldflags = @BOOST_LDFLAGS@ @BOOST_PO_LINK@
-
-# Standard Flagpoll Variables
@@ -11 +12 @@
-Arch: @ISA@
-Cflags: @BOOST_INCLUDES@
--L@BOOST_LIBDIR@ -l@boost_po_name@
+${boost_ldflags}

juggler/trunk/modules/vrjuggler/configure.ac

@@ -297 +297 @@
-if test "x$vrj_have_boost_po" != "xyes" ; then
-   AC_MSG_ERROR([*** Boost.program_options required by VR Juggler ***])
+else
+   BOOST_PO_LINK="-l$boost_po_name"
-fi
-
@@ -834 +836 @@
-AC_SUBST(BOOST_VERSION_DOT)
-AC_SUBST(BOOST_LIBDIR)
+AC_SUBST(BOOST_PO_LINK)
-AC_SUBST(boost_po_name)
-