Changeset 19206

Timestamp:

08/14/06 16:31:48 (2 years ago)

Author:

patrick

Message:

Install the Flagpoll .fpc files for each of the Juggler modules on Windows.
I do not have a way to test these at the moment, so I do not know if they
are fully functional yet.

Files:

• juggler/trunk/build_windows.py (modified) (21 diffs)

juggler/trunk/build_windows.py

@@ -46 +46 @@
-gJugglerDir      = os.path.dirname(os.path.abspath(sys.argv[0]))
-gOptionsFileName = "options.cache"
+
+gJdomJars = [
+   'jdom.jar',
+   'jaxen-core.jar',
+   'jar',
+   'jaxen-jdom.jar',
+   'xerces.jar',
+   'xml-apis.jar',
+   'saxpath.jar'
+]
+
+gTweekJars = [
+   'Tweek.jar',
+   'TweekBeanDelivery.jar',
+   'TweekBeans.jar',
+   'TweekEvents.jar',
+   'TweekNet.jar',
+   'TweekServices.jar',
+   'kunststoff-mod.jar'
+]
+
+gTweekExtJars = [
+   'ui.jar',
+   'wizard.jar'
+]
+
+gJcclJars = [
+   'jccl_config.jar',
+   'jccl_editors.jar'
+]
+
+gJcclRtrcJars = [
+   'jccl_rtrc.jar'
+]
-
-gHaveTk = False
@@ -394 +428 @@
-   cache_file.close()
-
-
+, options
-   class JugglerModule:
-
+ substVars,
-                   genFiles = None):
-         self.source_dir          = os.path.join(gJugglerDir, srcDir)
@@ -404 +438 @@
-         self.version_env_var     = versionEnvVar
-         self.version_env_var_dot = versionEnvVar + '_DOT'
+         self.subst_vars          = substVars
-         self.param_files         = []
-         self.proj_dir            = os.path.join(gJugglerDir, vcDir, projDir)
@@ -454 +489 @@
-      branch_re       = re.compile(r'BRANCH\s*=\s*([\w\d-]+)')
-      canon_name_re   = re.compile(r'CANON_NAME\s*=\s*(\S.+)')
-
-
-
-
-
-
+
-      zero_strip_re   = re.compile(r'^0*([^0]\d+)')
-
@@ -508 +538 @@
-         version_number = self.zero_strip_re.match(version_number).group(1)
-
+         subst_vars = self.subst_vars
+         subst_vars['VER_NUMBER']         = version_number
+         subst_vars['MAJOR_VER_NUMBER']   = str(major)
+         subst_vars['MAJOR_VERSION']      = str(major)
+         subst_vars['MINOR_VER_NUMBER']   = str(minor)
+         subst_vars['MINOR_VERSION']      = str(minor)
+         subst_vars['PATCH_VER_NUMBER']   = str(patch)
+         subst_vars['MICRO_VERSION']      = str(patch)
+         subst_vars['BUILD_VER_NUMBER']   = str(build)
+         subst_vars['VER_STRING']         = version_string
+         subst_vars['VERSION_DOT']        = '%d.%d.%d' % (major, minor, patch)
+         subst_vars['SUBSYSTEM']          = 'NSPR'
+         subst_vars['PLATFORM']           = 'Windows'
+         subst_vars['data_subdir']        = 'share'
+         subst_vars['USE_GCC']            = 'no'
+         subst_vars['includedir']         = r'${prefix}\include'
+         subst_vars['libdir']             = r'${exec_prefix}\lib'
+
-         try:
-            input_file  = open(template, 'r')
@@ -514 +562 @@
-
-            for i in xrange(len(input_lines)):
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-            printStatus("Generating updated " + output)
@@ -542 +577 @@
-
-   mods = []
+
+   vpr_subst_vars = {}
+   vpr_subst_vars['vpr_ldflags_compiler'] = r'/link /libpath:$libdir'
+   vpr_subst_vars['vpr_ldflags_linker'] = r'/libpath:$libdir'
+   vpr_subst_vars['vpr_libs'] = ''
-   mods.append(JugglerModule(r'modules\vapor', vcDir, 'VPR', 'VPR_VERSION',
-
+
+
-                              (r'vpr\version.rc',
-                               os.path.join(gJugglerDir, 'version.rc.in'))]))
+
+   # XXX: These are pretty weak assumptions.
+   tweek_have_cxx  = options.get('OMNIORB_ROOT', '') != ''
+   tweek_have_java = options.get('JAVA_HOME', '') != ''
+
+   tweek_jars = []
+   hack_jars = ['looks.jar', 'liquidlnf.jar', 'metouia.jar']
+   for j in gTweekJars + hack_jars + gJdomJars:
+      tweek_jars.append(os.path.join('${prefix}', 'share', 'tweek', 'java', j))
+
+   tweek_ext_jars = []
+   for j in gTweekExtJars:
+      tweek_ext_jars.append(os.path.join('${prefix}', 'share', 'tweek',
+                                         'java', j))
+
+   tweek_subst_vars = {}
+   if tweek_have_cxx:
+      tweek_subst_vars['tweek_cxxflags'] = '/DTWEEK_HAVE_CXX /D__WIN32__=1 /D__x86__=1 /D__NT__=1 /D__OSVERSION__=5 /DUSE_core_stub_in_nt_dll /DUSE_core_stub_in_nt_dll_NOT_DEFINED_Subject /I$prefix\\include\\tweek\\idl'
+   tweek_subst_vars['tweek_ldflags_compiler'] = r'/link /libpath:$libdir'
+   tweek_subst_vars['tweek_ldflags_linker'] = r'/libpath:$libdir'
+   tweek_subst_vars['tweek_libs'] = ''
+   tweek_subst_vars['tweek_idlflags_java'] = r'-I$prefix\include'
+   tweek_subst_vars['tweek_idlflags_cxx'] = r'-bcxx -Wbh=.h,s=.cpp -I$prefix\include'
+   tweek_subst_vars['tweek_idl_inc_flag_java'] = '-I'
+   tweek_subst_vars['tweek_idl_inc_flag_cxx'] = '-I'
+   tweek_subst_vars['tweek_idl_inc_flag_python'] = '-I'
+   tweek_subst_vars['tweek_idlgendir_java'] = '-d '
+   tweek_subst_vars['tweek_idlgendir_cxx'] = '-C'
+   tweek_subst_vars['tweek_idlgendir_python'] = '-C'
+   tweek_subst_vars['tweek_java_api_jars'] = ';'.join(tweek_jars)
+   tweek_subst_vars['tweek_ext_jars'] = ';'.join(tweek_ext_jars)
+
+   if tweek_have_cxx:
+      tweek_subst_vars['BUILD_CXX'] = 'Y'
+   else:
+      tweek_subst_vars['BUILD_CXX'] = 'N'
+
+   if tweek_have_java:
+      tweek_subst_vars['BUILD_JAVA'] = 'Y'
+   else:
+      tweek_subst_vars['BUILD_JAVA'] = 'N'
+
+   tweek_subst_vars['BUILD_PYTHON_IDL'] = 'N'
-   mods.append(JugglerModule(r'modules\tweek', vcDir, 'Tweek_CXX',
-
-
+ tweek_subst_vars,
+ ('tweek.fpc',),
-                              (r'tweek\version.rc',
-                               os.path.join(gJugglerDir, 'version.rc.in'))]))
+
+   jccl_jars = []
+   for j in gJcclJars + gJcclRtrcJars:
+      jccl_jars.append(os.path.join('${prefix}', 'share', 'jccl', 'java', j))
+
+   jccl_subst_vars = {}
+   jccl_subst_vars['jccl_ldflags_compiler'] = r'/link /libpath:$libdir'
+   jccl_subst_vars['jccl_ldflags_linker'] = r'/libpath:$libdir'
+   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)
-   mods.append(JugglerModule(r'modules\jackal', vcDir, 'JCCL', 'JCCL_VERSION',
+                             jccl_subst_vars,
-                             [(r'jccl\jcclParam.h',
-                               os.path.join(gJugglerDir,
-                                            r'modules\jackal\common\jccl\jcclParam.h.in')),
+                              ('jccl.fpc',),
-                              (r'jccl\version.rc',
-                               os.path.join(gJugglerDir, 'version.rc.in'))
-                             ]))
+
+   snx_subst_vars = {}
+   snx_subst_vars['snx_ldflags_compiler'] = r'/link /libpath:$libdir'
+   snx_subst_vars['snx_ldflags_linker'] = r'/libpath:$libdir'
+   snx_subst_vars['snx_libs'] = ''
-   mods.append(JugglerModule(r'modules\sonix', vcDir, 'Sonix', 'SNX_VERSION',
-
+
+
-                              (r'snx\version.rc',
-                               os.path.join(gJugglerDir, 'version.rc.in'))]))
+
+   gadget_subst_vars = {}
+   gadget_subst_vars['gadget_ldflags_compiler'] = r'/link /libpath:$libdir'
+   gadget_subst_vars['gadget_ldflags_linker'] = r'/libpath:$libdir'
+   gadget_subst_vars['gadget_libs'] = ''
-   mods.append(JugglerModule(r'modules\gadgeteer', vcDir, 'Gadgeteer',
-
-
+ gadget_subst_vars,
+ ('gadgeteer.fpc',),
-                              (r'gadget\version.rc',
-                               os.path.join(gJugglerDir, 'version.rc.in'))]))
+
+   vrj_subst_vars = {}
+   vrj_subst_vars['vrj_ldflags_compiler'] = r'/link /libpath:$libdir'
+   vrj_subst_vars['vrj_ldflags_linker'] = r'/libpath:$libdir'
+   vrj_subst_vars['vrj_libs'] = ''
-   mods.append(JugglerModule(r'modules\vrjuggler', vcDir, 'VRJuggler',
-
-
+ vrj_subst_vars,
+ ('vrjuggler.fpc',),
-                              (r'vrj\version.rc',
-                               os.path.join(gJugglerDir, 'version.rc.in'))]))
@@ -617 +731 @@
-            sys.exit(EXIT_STATUS_INVALID_PATH)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-      # This form of regular expressions appears to be necessary because
@@ -660 +766 @@
-      java3d_jars_re    = re.compile(r'^(.*)@JAVA3D_JAR@(.*)$')
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-      jogl_jars = [
@@ -828 +932 @@
-   mkinstalldirs(os.path.join(prefix, 'include'))
-   mkinstalldirs(os.path.join(prefix, 'lib'))
+   mkinstalldirs(os.path.join(prefix, 'lib', 'flagpoll'))
-   mkinstalldirs(os.path.join(prefix, 'share'))
-
@@ -936 +1041 @@
-   installLibs(srcroot, destdir)
-
+   destdir = os.path.join(prefix, 'lib', 'flagpoll')
+   smartCopy(os.path.join(buildDir, 'VPR', 'vpr.fpc'), destdir)
+
-   destdir = os.path.join(prefix, 'share', 'vpr', 'test')
-   srcdir  = os.path.join(gJugglerDir, 'modules', 'vapor', 'test')
@@ -963 +1071 @@
-   installLibs(srcroot, destdir)
-
+   destdir = os.path.join(prefix, 'lib', 'flagpoll')
+   smartCopy(os.path.join(buildDir, 'Tweek_CXX', 'tweek.fpc'), destdir)
+
-   destdir = os.path.join(prefix, 'share', 'tweek', 'test')
-   srcdir  = os.path.join(gJugglerDir, 'modules', 'tweek', 'test')
@@ -983 +1094 @@
-   srcdir = os.path.join(buildDir, 'Tweek_Java')
-
-'Tweek.jar'
+gTweekJars[0]
-      printStatus("Installing Tweek Java libraries and data files ...")
-
-      jars = [
-         'Tweek.jar',
-         'TweekBeanDelivery.jar',
-         'TweekBeans.jar',
-         'TweekEvents.jar',
-         'TweekNet.jar',
-         'TweekServices.jar',
-         'kunststoff-mod.jar',
-         'ui.jar',
-         'wizard.jar'
-      ]
-
-      beans     = ['Viewers']
@@ -1005 +1104 @@
-
-      # Install the base JAR files that make up the Tweek Java API.
-j
+gTweekJars + gTweekExtJ
-         smartCopy(os.path.join(srcdir, j), destdir)
-
@@ -1093 +1192 @@
-   installLibs(srcroot, destdir)
-
+   destdir = os.path.join(prefix, 'lib', 'flagpoll')
+   smartCopy(os.path.join(buildDir, 'JCCL', 'jccl.fpc'), destdir)
+
-   destdir = os.path.join(prefix, 'share', 'jccl', 'test')
-   srcdir  = os.path.join(gJugglerDir, 'modules', 'jackal', 'test')
@@ -1172 +1274 @@
-   srcdir = os.path.join(buildDir, 'JCCL_Java', 'RTRC_Plugin_Java')
-
-'jccl_rtrc.jar'
+gJcclRtrcJars[0]
-      printStatus("Installing JCCL Java plug-ins ...")
-
-      destdir = os.path.join(prefix, 'share', 'jccl', 'beans')
-
+
+
-
-      srcdir = os.path.join(gJugglerDir, 'modules', 'jackal', 'plugins',
@@ -1198 +1301 @@
-   installLibs(srcroot, destdir)
-
+   destdir = os.path.join(prefix, 'lib', 'flagpoll')
+   smartCopy(os.path.join(buildDir, 'Sonix', 'sonix.fpc'), destdir)
+
-   destdir = os.path.join(prefix, 'share', 'sonix', 'samples')
-   srcdir  = os.path.join(gJugglerDir, 'modules', 'sonix', 'samples')
@@ -1251 +1357 @@
-   installLibs(srcroot, destdir)
-
+   destdir = os.path.join(prefix, 'lib', 'flagpoll')
+   smartCopy(os.path.join(buildDir, 'Gadgeteer', 'gadgeteer.fpc'), destdir)
+
-   destdir = os.path.join(prefix, 'share', 'gadgeteer', 'data')
-   srcdir  = os.path.join(gJugglerDir, 'modules', 'gadgeteer', 'data')
@@ -1329 +1438 @@
-   srcroot = os.path.join(buildDir, 'VRJuggler', 'Performer_Draw_Manager')
-   installLibs(srcroot, destdir)
+
+   destdir = os.path.join(prefix, 'lib', 'flagpoll')
+   smartCopy(os.path.join(buildDir, 'VRJuggler', 'vrjuggler.fpc'), destdir)
-
-   destdir = os.path.join(prefix, 'share', 'vrjuggler', 'data')
@@ -2049 +2161 @@
-      #print "updateVersions()"
-      self.printMessage("Generating Version Headers.")
-
+, self.mOptions
-      self.printMessage("Generating Ant Build Files.")
-      generateAntBuildFiles(self.mVcDir)
@@ -2136 +2248 @@
-      (cl_ver_major, cl_ver_minor, vc_dir) = chooseVisualStudioDir()
-      options = setVars(cl_ver_major, cl_ver_minor)
-
+, options
-      generateAntBuildFiles(vc_dir)
-