mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-18 01:30:07 +02:00
134 lines
4.1 KiB
Diff
134 lines
4.1 KiB
Diff
Index: pylib/gyp/haiku_tool.py
|
|
===================================================================
|
|
--- pylib/gyp/haiku_tool.py (revision 0)
|
|
+++ pylib/gyp/haiku_tool.py (revision 0)
|
|
@@ -0,0 +1,49 @@
|
|
+#!python
|
|
+# Copyright (c) 2011 Google Inc. All rights reserved.
|
|
+# Use of this source code is governed by a BSD-style license that can be
|
|
+# found in the LICENSE file.
|
|
+
|
|
+"""These functions are executed via gyp-haiku-tool when using the Makefile
|
|
+generator."""
|
|
+
|
|
+import fcntl
|
|
+import os
|
|
+import struct
|
|
+import subprocess
|
|
+import sys
|
|
+
|
|
+
|
|
+def main(args):
|
|
+ executor = HaikuTool()
|
|
+ executor.Dispatch(args)
|
|
+
|
|
+
|
|
+class HaikuTool(object):
|
|
+ """This class performs all the Haiku tooling steps. The methods can either be
|
|
+ executed directly, or dispatched from an argument list."""
|
|
+
|
|
+ def Dispatch(self, args):
|
|
+ """Dispatches a string command to a method."""
|
|
+ if len(args) < 1:
|
|
+ raise Exception("Not enough arguments")
|
|
+
|
|
+ method = "Exec%s" % self._CommandifyName(args[0])
|
|
+ getattr(self, method)(*args[1:])
|
|
+
|
|
+ def _CommandifyName(self, name_string):
|
|
+ """Transforms a tool name like copy-info-plist to CopyInfoPlist"""
|
|
+ return name_string.title().replace('-', '')
|
|
+
|
|
+ def ExecFlock(self, lockfile, *cmd_list):
|
|
+ """Emulates the most basic behavior of Linux's flock(1)."""
|
|
+ # Rely on exception handling to report errors.
|
|
+ fd = os.open(lockfile, os.O_RDONLY|os.O_NOCTTY|os.O_CREAT, 0o666)
|
|
+ fcntl.flock(fd, fcntl.LOCK_EX)
|
|
+ ret = subprocess.call(cmd_list)
|
|
+ # Haiki bug -- lock is not released on file close?
|
|
+ fcntl.flock(fd, fcntl.LOCK_UN)
|
|
+ return ret
|
|
+
|
|
+
|
|
+if __name__ == '__main__':
|
|
+ sys.exit(main(sys.argv[1:]))
|
|
|
|
Property changes on: pylib/gyp/haiku_tool.py
|
|
___________________________________________________________________
|
|
Added: svn:executable
|
|
+ *
|
|
|
|
Index: pylib/gyp/generator/make.py
|
|
===================================================================
|
|
--- pylib/gyp/generator/make.py (revision 1773)
|
|
+++ pylib/gyp/generator/make.py (working copy)
|
|
@@ -497,6 +497,13 @@
|
|
cmd_infoplist = $(CC.$(TOOLSET)) -E -P -Wno-trigraphs -x c $(INFOPLIST_DEFINES) "$<" -o "$@"
|
|
"""
|
|
|
|
+SHARED_HEADER_HAIKU_COMMANDS = """
|
|
+# gyp-haiku-tool is written next to the root Makefile by gyp.
|
|
+# Use $(4) for the command, since $(2) and $(3) are used as flag by do_cmd
|
|
+# already.
|
|
+quiet_cmd_haiku_tool = HAIKUTOOL $(4) $<
|
|
+cmd_haiku_tool = ./gyp-haiku-tool $(4) $< "$@"
|
|
+"""
|
|
|
|
def WriteRootHeaderSuffixRules(writer):
|
|
extensions = sorted(COMPILABLE_EXTENSIONS.keys(), key=str.lower)
|
|
@@ -2010,6 +2017,12 @@
|
|
'flock': './gyp-flock-tool flock',
|
|
'flock_index': 2,
|
|
})
|
|
+ elif flavor == 'haiku':
|
|
+ header_params.update({
|
|
+ 'flock': './gyp-haiku-tool flock',
|
|
+ 'flock_index': 2,
|
|
+ 'extra_commands': SHARED_HEADER_HAIKU_COMMANDS,
|
|
+ })
|
|
|
|
header_params.update({
|
|
'CC.target': GetEnvironFallback(('CC_target', 'CC'), '$(CC)'),
|
|
Index: pylib/gyp/common.py
|
|
===================================================================
|
|
--- pylib/gyp/common.py (revision 1773)
|
|
+++ pylib/gyp/common.py (working copy)
|
|
@@ -411,12 +411,14 @@
|
|
return 'openbsd'
|
|
if sys.platform.startswith('aix'):
|
|
return 'aix'
|
|
+ if sys.platform.startswith('haiku'):
|
|
+ return 'haiku'
|
|
|
|
return 'linux'
|
|
|
|
|
|
def CopyTool(flavor, out_path):
|
|
- """Finds (flock|mac|win)_tool.gyp in the gyp directory and copies it
|
|
+ """Finds (flock|mac|win|haiku)_tool.gyp in the gyp directory and copies it
|
|
to |out_path|."""
|
|
# aix and solaris just need flock emulation. mac and win use more complicated
|
|
# support scripts.
|
|
@@ -424,7 +426,8 @@
|
|
'aix': 'flock',
|
|
'solaris': 'flock',
|
|
'mac': 'mac',
|
|
- 'win': 'win'
|
|
+ 'win': 'win',
|
|
+ 'haiku': 'haiku',
|
|
}.get(flavor, None)
|
|
if not prefix:
|
|
return
|
|
Index: gyptest.py
|
|
===================================================================
|
|
--- gyptest.py (revision 1773)
|
|
+++ gyptest.py (working copy)
|
|
@@ -225,6 +225,7 @@
|
|
'linux2': ['make', 'ninja'],
|
|
'linux3': ['make', 'ninja'],
|
|
'darwin': ['make', 'ninja', 'xcode'],
|
|
+ 'haiku1': ['make'],
|
|
}[sys.platform]
|
|
|
|
for format in format_list:
|