Ticket #441: scons-1.0.1.patch

engine/SCons/Platform/__init__.py

@@ -76 +76 @@
             return 'aix'
         elif string.find(sys.platform, 'darwin') != -1:
             return 'darwin'
+        elif string.find(sys.platform, 'haiku') != -1:
+            return 'haiku'
         else:
             return 'posix'
     elif os.name == 'os2':

engine/SCons/Platform/haiku.py

@@ +1 @@
+"""SCons.Platform.haiku
+
+Platform-specific initialization for Haiku systems.
+
+There normally shouldn't be any need to import this module directly.  It
+will usually be imported through the generic SCons.Platform.Platform()
+selection method.
+"""
+
+#
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The SCons Foundation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = ""
+
+import posix
+
+def generate(env):
+    posix.generate(env)
+    env['ENV']['PATH'] = '.:/boot/home/config/bin:/boot/common/bin:/boot/system/bin:/boot/develop/tools/gnupro/bin'
+    # help the linker find the startfiles
+    env['ENV']['BELIBRARIES'] = '/boot/develop/lib/x86'

script/scons

@@ -1 @@
-#! /usr/bin/env python
+#! /bin/env python
 #
 # SCons - a Software Constructor
 #

script/scons-time

@@ -1 @@
-#!/usr/bin/env python
+#!/bin/env python
 #
 # scons-time - run SCons timings and collect statistics
 #

script/sconsign

@@ -1 @@
-#! /usr/bin/env python
+#! /bin/env python
 #
 # SCons - a Software Constructor
 #

scons-1.0.

@@ -28 +28 @@
 import stat
 import string
 import sys
+import commands
+import platform
 
 Version = "1.0.1"
 
@@ -354 +356 @@
                 dir = 'Doc'
             else:
                 dir = os.path.join('man', 'man1')
-            self.data_files = [(dir, man_pages)]
-            man_dir = os.path.join(self.install_dir, dir)
-            msg = "Installed SCons man pages into %s" % man_dir
-            Installed.append(msg)
+                if (platform.system() == 'Haiku'):
+                    doc_dir = commands.getoutput('finddir B_COMMON_DOCUMENTATION_DIRECTORY')
+                    man_dir = os.path.join(doc_dir, dir)
+                else:
+                    dir = os.path.join('man', 'man1')
+                    self.data_files = [(dir, man_pages)]
+                    man_dir = os.path.join(self.install_dir, dir)
+                msg = "Installed SCons man pages into %s" % man_dir
+                Installed.append(msg)
         else:
             self.data_files = []