Changeset 20563

Timestamp:

07/17/07 12:06:01 (1 year ago)

Author:

patrick

Message:

Merge changess from the trunk that get the Flagpoll bits in Juggler to work
on Windows. This encompasses the result of changes on the trunk between
r20542 and r20562.

Files:

• juggler/branches/2.2/build_windows.py (modified) (17 diffs)
• juggler/branches/2.2/modules/vrjuggler/configure.ac (modified) (2 diffs)
• juggler/branches/2.2/modules/vrjuggler/vrjuggler.fpc.in (modified) (1 diff)

juggler/branches/2.2/build_windows.py

@@ -667 +667 @@
-         subst_vars['data_subdir']        = 'share'
-         subst_vars['USE_GCC']            = 'no'
-${prefix}\include
+"${prefix}\include"
-         subst_vars['libdir']             = r'${exec_prefix}\lib'
-
@@ -691 +691 @@
-
-   mods = []
+   rt_part = ""
-
-   vpr_subst_vars = {}
-   vpr_subst_vars['vpr_cxxflags'] = '/DBOOST_ALL_DYN_LINK /DCPPDOM_DYN_LINK /EHsc /GR'
-$libdir
+"$libdir"
-   vpr_subst_vars['vpr_libs'] = ''
-${VJ_DEPS_DIR}\lib
-vpr_extra
-c
+"${VJ_DEPS_DIR}\lib"
+subsystem
+
-   vpr_subst_vars['BOOST_VERSION_DOT'] = '.'.join(getBoostVersion())
-${prefix}\include
-${prefix}\lib
+"${prefix}\include"
+"${prefix}\lib"
-   vpr_subst_vars['CPPDOM_VERSION'] = '.'.join(getCppDOMVersion())
-   vpr_module = JugglerModule(r'modules\vapor', vcDir, 'VPR', 'VPR_VERSION',
@@ -729 +730 @@
-   tweek_subst_vars['tweek_cxxflags'] = '/EHsc /GR'
-   if tweek_have_cxx:
-$prefix\\include\\tweek\\idl
+"$prefix\\include\\tweek\\idl"
-      tweek_subst_vars['tweek_extra_libs'] = \
-         'omnithread%s_rt.lib omniORB%s_rt.lib omniDynamic%s_rt.lib' % \
@@ -735 +736 @@
-             os.environ['OMNIORB_VERSION'])
-
-$libdir
+"$libdir"
-   tweek_subst_vars['tweek_libs'] = ''
-${VJ_DEPS_DIR}\lib
-$prefix\include
-$prefix\include
+"${VJ_DEPS_DIR}\lib"
+"$prefix\include"
+"$prefix\include"
-   tweek_subst_vars['tweek_idl_inc_flag_java'] = '-I'
-   tweek_subst_vars['tweek_idl_inc_flag_cxx'] = '-I'
@@ -776 +777 @@
-   jccl_subst_vars = {}
-   jccl_subst_vars['jccl_cxxflags'] = '/EHsc /GR'
-$libdir
+"$libdir"
-   jccl_subst_vars['jccl_libs'] = ''
-   jccl_subst_vars['BUILD_CXX'] = tweek_subst_vars['BUILD_CXX']
@@ -795 +796 @@
-   snx_subst_vars = {}
-   snx_subst_vars['snx_cxxflags'] = '/EHsc /GR'
-$libdir
+"$libdir"
-   snx_subst_vars['snx_libs'] = ''
-   snx_subst_vars['VPR_VERSION'] = vpr_module.getVersion('.')
-
+MIN_
-   snx_module = JugglerModule(r'modules\sonix', vcDir, 'Sonix', 'SNX_VERSION',
-                              snx_subst_vars,
@@ -808 +809 @@
-   gadget_subst_vars = {}
-   gadget_subst_vars['gadget_cxxflags'] = '/EHsc /GR'
-$libdir
+"$libdir"
-   gadget_subst_vars['gadget_libs'] = ''
-   gadget_subst_vars['gadget_extra_libs'] = \
@@ -814 +815 @@
-   gadget_subst_vars['VPR_VERSION'] = jccl_subst_vars['VPR_VERSION']
-   gadget_subst_vars['JCCL_VERSION'] = jccl_module.getVersion('.')
-GMTL_VERSION'] = snx_subst_vars['
+MIN_GMTL_VERSION'] = snx_subst_vars['MIN_
-   gadget_module = JugglerModule(r'modules\gadgeteer', vcDir, 'Gadgeteer',
-                                 'GADGET_VERSION', gadget_subst_vars,
@@ -826 +827 @@
-   vrj_subst_vars = {}
-   vrj_subst_vars['vrj_cxxflags'] = '/EHsc /GR'
-$libdir
+"$libdir"
-   vrj_subst_vars['vrj_libs'] = ''
+   vrj_subst_vars['vrj_ogl_lib'] = ''
+   vrj_subst_vars['vrj_pf_lib'] = ''
-   vrj_subst_vars['vrj_ogl_extra_libs'] = 'opengl32.lib glu32.lib'
-   vrj_subst_vars['vrj_pf_extra_libs'] = \
-${PFROOT}\lib
+"${PFROOT}\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('.')
-c
+
-   vrj_subst_vars['BOOST_VERSION_DOT'] = '.'.join(getBoostVersion())
-${prefix}\include
-${prefix}\lib
-mods.append(
+"${prefix}\include"
+"${prefix}\lib"
+vrj_module = 
-                             'VRJ_VERSION', vrj_subst_vars,
-                             [(r'vrj\vrjParam.h',), ('vrjuggler.fpc',),
-                              (r'vrj\version.rc',
-
+
+
-
-   for m in mods:
@@ -1204 +1208 @@
-
-   destdir = os.path.join(prefix, 'lib', 'flagpoll')
-
-
-
+
+
-
-   destdir = os.path.join(prefix, 'share', 'vpr', 'test')
@@ -1612 +1615 @@
-
-   destdir = os.path.join(prefix, 'lib', 'flagpoll')
-
+
+
-
-   destdir = os.path.join(prefix, 'share', 'vrjuggler', 'data')
@@ -1780 +1784 @@
-      print ex
-
-
+, buildDir
-   makeTree(prefix)
-   installNSPR(prefix)
-   installCppDOM(prefix)
-
+, buildDir
-   installGMTL(prefix)
-   installAudiere(prefix)
@@ -1846 +1850 @@
-                 os.getenv('DOOZER_ROOT', ''), prefix, optional = True)
-
-
+, buildDir
-   printStatus("Installing Boost headers and libraries")
+
+   destdir = os.path.join(prefix, 'lib', 'flagpoll')
+   fpc_files = glob.glob(os.path.join(buildDir, 'VPR', 'boost*.fpc'))
+   fpc_files += glob.glob(os.path.join(buildDir, 'VRJuggler', 'boost*.fpc'))
+   for f in fpc_files:
+      smartCopy(f, destdir)
-
-   srcroot = os.environ['BOOST_ROOT']
@@ -1868 +1878 @@
-   simpleInstall('GMTL headers', os.environ['GMTL_ROOT'], prefix,
-                 os.environ['GMTL_INCLUDES'])
+
+   # Install all libraries.
+   srcdir = os.path.join(os.environ['GMTL_ROOT'], 'share', 'flagpoll')
+
+   if os.path.exists(srcdir):
+      destdir = os.path.join(prefix, 'lib', 'flagpoll')
+      installDir(srcdir, destdir)
-
-def installAudiere(prefix):
@@ -2312 +2329 @@
-
-   def installDeps(self):
-
+
+
-
-   def getFile(self, optionIndex, initialDir, toEntry):
@@ -2377 +2395 @@
-      if self.mRoot.CommandFrame.InstallJugglerDepsCheck.Variable.get() == "Yes":
-         self.printMessage("Installing Juggler Dependencies...")
-
+
+
-
-      self.printMessage("Build and Installation Finished.")
@@ -2510 +2529 @@
-               proceed = sys.stdin.readline().strip(" \n")
-               if proceed == '' or proceed.lower().startswith('y'):
-
+, os.path.join(gJugglerDir, vc_dir)
-      except OSError, osEx:
-         print "Could not execute %s: %s" % (devenv_cmd, osEx)

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

@@ -601 +601 @@
-vrj_extra_libs="$LDFLAGS $APP_EXTRA_LIBS_GL $APP_EXTRA_LIBS_X11 $LIBS"
-
-
-
+s
+s
-vrj_ogl_lib="-l$vrjogl_lib_name"
-vrj_ogl_prof_lib="-l$vrjogl_prof_lib_name"
@@ -685 +685 @@
-AC_SUBST(vrj64_flags)
-
-
+s
-AC_SUBST(vrj_ogl_lib)
-AC_SUBST(vrj_pf_lib)
-
+s
-AC_SUBST(vrj_ogl_prof_lib)
-AC_SUBST(vrj_pf_prof_lib)

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

@@ -35 +35 @@
-
-vrj_ldflags = @vrj_ldflags@
-
-
+s
+s
-
-vrj_ogl_lib = @vrj_ogl_lib@