Changeset 20543

Timestamp:

07/14/07 18:42:12 (1 year ago)

Author:

aronb

Message:

Work on the windows build a little.

Files:

• juggler/trunk/build_windows.py (modified) (11 diffs)
• juggler/trunk/modules/vrjuggler/vrjuggler.fpc.in (modified) (1 diff)

juggler/trunk/build_windows.py

@@ -652 +652 @@
-         subst_vars['data_subdir']        = 'share'
-         subst_vars['USE_GCC']            = 'no'
-${prefix}\include
+"${prefix}\include"
-         subst_vars['libdir']             = r'${exec_prefix}\lib'
-
@@ -661 +661 @@
-
-            for i in xrange(len(input_lines)):
+               def f(m):
+                  print "match:", m.group(1)
+                  val = subst_vars.get(m.group(1), '')
+                  print "  replace:", val
+                  return val
+
+               #input_lines[i] = \
+               #   self.subst_re.sub(lambda m: subst_vars.get(m.group(1), ''),
+               #                     input_lines[i])
-               input_lines[i] = \
-lambda m: subst_vars.get(m.group(1), '')
+f
-                                    input_lines[i])
-
@@ -676 +685 @@
-
-   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
+"${VJ_DEPS_DIR}\lib"
-   vpr_subst_vars['vpr_extra_libs'] = 'libnspr4.lib libplc4.lib'
-c
+
-   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',
@@ -695 +705 @@
-                               (r'vpr\version.rc',
-                                os.path.join(gJugglerDir, 'version.rc.in'))])
+   lib_name = 'vpr' + rt_part + '-' + vpr_module.getVersion('_') + '.lib'
+   vpr_subst_vars['vpr_libs'] += lib_name
+
-   mods.append(vpr_module)
-
@@ -714 +727 @@
-   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' % \
@@ -720 +733 @@
-             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'
@@ -753 +766 @@
-                                 (r'tweek\version.rc',
-                                  os.path.join(gJugglerDir, 'version.rc.in'))])
+   lib_name = 'tweek' + rt_part + '-' + tweek_module.getVersion('_') + '.lib'
+   tweek_subst_vars['tweek_libs'] += lib_name
-   mods.append(tweek_module)
-
@@ -761 +776 @@
-   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']
@@ -776 +791 @@
-                                 os.path.join(gJugglerDir, 'version.rc.in'))
-                               ])
+   lib_name = 'jccl' + rt_part + '-' + jccl_module.getVersion('_') + '.lib'
+   jccl_subst_vars['jccl_libs'] += lib_name
-   mods.append(jccl_module)
-
-   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('.')
@@ -789 +806 @@
-                               (r'snx\version.rc',
-                                os.path.join(gJugglerDir, 'version.rc.in'))])
+   lib_name = 'snx' + rt_part + '-' + snx_module.getVersion('_') + '.lib'
+   snx_subst_vars['snx_libs'] += lib_name
-   mods.append(snx_module)
-
-   gadget_subst_vars = {}
-   gadget_subst_vars['gadget_cxxflags'] = '/EHsc /GR'
-$libdir
+"$libdir"
-   gadget_subst_vars['gadget_libs'] = ''
-   gadget_subst_vars['gadget_extra_libs'] = \
@@ -807 +826 @@
-                                   os.path.join(gJugglerDir, 'version.rc.in'))
-                                 ])
+   lib_name = 'gadget' + rt_part + '-' + gadget_module.getVersion('_') + '.lib'
+   gadget_subst_vars['gadget_libs'] += lib_name
-   mods.append(gadget_module)
-
-   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',),
-                              ('boost_program_options.fpc',),
-                              (r'vrj\version.rc',
-
+
+
+
+
+
+
+
+
-
-   for m in mods:

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

@@ -35 +35 @@
-
-vrj_ldflags = @vrj_ldflags@
-
+s
-vrj_prof_libs = @vrj_prof_lib@
-