Changeset 20553

Timestamp:

07/15/07 10:26:05 (1 year ago)

Author:

patrick

Message:

We have to do some special handling for a 64-bit build on Windows. To enable
that handling, the user must pass in the —64 command line option or check
the "64-bit Build" option in the GUI.

Files:

• juggler/branches/2.2/README-WINDOWS.html (modified) (3 diffs)
• juggler/branches/2.2/build_windows.py (modified) (12 diffs)

juggler/branches/2.2/README-WINDOWS.html

@@ -29 +29 @@
-  <li>
-    Install <a href="http://www.python.org/">Python</a> 2.2 or newer. To build
- is
-required
+
+is <i>required</i>
-  </li>
-  <li>
@@ -55 +55 @@
-<a href="http://www.python.org/">Python</a> 2.2 or newer installed on your
-system. (To build a 64-bit version of VR Juggler, the 64-bit version of
-must
+<i>must</i>
-<a href="http://www.python.org/download/">download and install
-instructions</a>.
@@ -72 +72 @@
-VR Juggler's C++ dependencies into a convenient, centralized location.
-</p>
+
+<blockquote>
+<b>IMPORTANT:</b> To create a 64-bit build on Windows, the command line
+option <b><tt>--64</tt></b> must be used, or the <q>64-bit Build</q> option
+in the GUI must be selected.
+</blockquote>
-
-<blockquote>

juggler/branches/2.2/build_windows.py

@@ -48 +48 @@
-gJugglerDir      = os.path.dirname(os.path.abspath(sys.argv[0]))
-gOptionsFileName = "options.cache"
+gBuild64         = False
-
-gJdomJars = [
@@ -358 +359 @@
-
-   if os.environ['OMNIORB_ROOT'] != '' and os.path.exists(os.environ['OMNIORB_ROOT']):
+      # A 64-bit build of omniORB has to have been compiled against a 64-bit
+      # build of Python. Unfortunately, when omniidl.exe acts as the Python
+      # interpreter, it doesn't take care of setting PYTHONHOME, and this
+      # prevents it from being able to find core modules (such as sys.py or
+      # os.py). We'll assume that a 64-bit Python interpreter is being used
+      # to run this script and use its installation prefix as PYTHONHOME to
+      # help out omniidl.exe.
+      if gBuild64 and not os.environ.has_key('PYTHONHOME'):
+         os.environ['PYTHONHOME'] = sys.prefix
+
-      omni_bin = os.path.join(os.environ['OMNIORB_ROOT'], 'bin')
-
@@ -403 +414 @@
-   # Determine if al.h is in the base include directory or in include\AL.
-   if os.environ['OPENAL_ROOT'] != '':
-
+
+
+
+
+
-      lib_dirs = [os.path.join(os.environ['OPENAL_ROOT'], 'libs'),
-'Win32'
+subdir
-
-      for l in lib_dirs:
@@ -1776 +1791 @@
-   installDoozer(prefix)
-
-
+
+
-   if optional and root == '':
-      return
@@ -1793 +1809 @@
-
-   # Install all libraries.
-'lib'
+libDir
-
-   if os.path.exists(srcdir):
@@ -1818 +1834 @@
-
-def installCppDOM(prefix):
+   if gBuild64:
+      libdir = 'lib64'
+   else:
+      libdir = 'lib'
+
-   simpleInstall('CppDOM headers and libraries', os.environ['CPPDOM_ROOT'],
-
+, libdir
-
-def installDoozer(prefix):
@@ -1870 +1891 @@
-
-      # OpenAL 1.0 and 1.1 put the redistributable DLL in different places.
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-      for d in dll_dirs:
@@ -2138 +2167 @@
-      # CommandFrame Innards.
-      next_row = 0
+      self.mRoot.CommandFrame.Build64Check = \
+         Tkinter.Checkbutton(self.mRoot.CommandFrame,
+                             text="64-bit Build",
+                             bg = self.JugglerYellow,
+                             activebackground = self.JugglerYellow,
+                             onvalue = "Yes", offvalue = "No")
+      self.mRoot.CommandFrame.Build64Check.Variable = Tkinter.StringVar()
+      build64 = "No"
+      if gBuild64:
+         build64 = "Yes"
+      self.mRoot.CommandFrame.Build64Check.Variable.set(build64)
+      self.mRoot.CommandFrame.Build64Check["variable"] = \
+         self.mRoot.CommandFrame.Build64Check.Variable
+      self.mRoot.CommandFrame.Build64Check.grid(row = next_row, column = 0,
+                                                sticky = Tkinter.EW, pady = 4)
+      next_row = next_row + 1
-      self.mRoot.CommandFrame.OpenVSCheck = \
-         Tkinter.Checkbutton(self.mRoot.CommandFrame,
@@ -2259 +2304 @@
-         os.environ[k] = self.mTkOptions[k].get()
-
+      # This has to be done before calling postProcessOptions().
+      if self.mRoot.CommandFrame.Build64Check.Variable.get() == "Yes":
+         global gBuild64
+         gBuild64 = True
+
-      if True:#self.validateOptions():
-         postProcessOptions(self.mOptions)
@@ -2415 +2465 @@
-   try:
-      cmd_opts, cmd_args = getopt.getopt(sys.argv[1:], "cano:h",
-
+64", "
-                                          "options-file=", "help"])
-   except getopt.GetoptError:
@@ -2424 +2474 @@
-
-   global gOptionsFileName
+   global gBuild64
-   for o, a in cmd_opts:
-      if o in ("-c","--nogui"):
-         disable_tk = True
+      elif o == "--64":
+         gBuild64 = True
-      elif o in ("-o", "--options-file="):
-         gOptionsFileName = a
@@ -2483 +2536 @@
-   print "-c, --nogui              Disable the Tkinter GUI front end"
-   print "                         (i.e., Run in command line mode)."
+   print "--64                     Indicate that a 64-bit build will"
+   print "                         be made."
-   #print "-a, --auto               Does not interactively ask for values of any options.  Uses the Default values, 'options.cache' if it exists, or the file given by the -o option.  Only used in command line mode."
-   print "-o, --options-file=FILE  Uses FILE to Load/Save Options."