wind39
diff --git a/‎cefpython/cef1/linux/compile.sh‎ b/‎cefpython/cef1/linux/compile.sh‎
diff --git a/‎cefpython/cef1/linux/setup/fix_includes.py‎
Lines changed: 106 additions & 0 deletions b/‎cefpython/cef1/linux/setup/fix_includes.py‎
Lines changed: 106 additions & 0 deletions
diff --git a/‎cefpython/cef1/linux/setup/setup.py‎
Lines changed: 91 additions & 0 deletions b/‎cefpython/cef1/linux/setup/setup.py‎
Lines changed: 91 additions & 0 deletions
@@ -0,0 +1,106 @@
+# Copyright (c) 2012 CefPython Authors. All rights reserved.
+# License: New BSD License.
+# Website: http://code.google.com/p/cefpython/
+
+# First, it copies all .pyx files from upper directory to setup/.
+# Then, fixes repeating of "include" statements in pyx files.
+
+# Only the mainfile needs to have "include" statements,
+# but we're using PyCharm and to get rid of "unresolved references"
+# and other errors displayed in pycharm we are adding "include"
+# statements in all of the pyx files.
+
+# I'm not 100% sure how includes work in Cython, but I suspect that
+# a few includes of the same file will include the same content more
+# than once, it should work, but function and variable definitions are
+# duplicated, it is some kind of overhead and it could lead to some
+# problems in the future, better to fix it now.
+
+# It also checks cdef & cpdef functions whether they are not missing "except *",
+# it is required to add it when returning non-python type.
+
+import glob
+import os
+import re
+import shutil
+
+def ExceptAllMissing(content):
+
+    # This is not perfect, won't detect C++ custom types, but will find
+    # the built-in types, templates and pointers.
+    patterns = []
+    patterns.append(
+        r"\bcp?def\s+"
+        "((int|short|long|double|char|unsigned|float|double)\s+)+"
+        "\w+\([^)]*\)\s*(with\s+(gil|nogil))?\s*:")
+    patterns.append(
+        r"\bcp?def\s+"
+        # A template ends with bracket: CefRefPtr[CefBrowser]
+        # or a pointer ends with asterisk: CefBrowser*
+        "[^\s]+[\]*]\s+"
+        "\w+\([^)]*\)\s*(with\s+(gil|nogil))?\s*:")
+    patterns.append(
+        r"\bcp?def\s+"
+        # A reference, eg. CefString&
+        "[^\s]+&\s+"
+        "\w+\([^)]*\)\s*(with\s+(gil|nogil))?\s*:")
+
+    for pattern in patterns:
+        match = re.search(pattern, content)
+        if match: break
+
+    if match:
+        lineNumber = (content.count("\n", 0, match.start()) + 1)
+        return lineNumber
+
+print("\n")
+mainfile = "cefpython.pyx"
+
+pyxfiles = glob.glob("../../../*.pyx")
+if not len(pyxfiles):
+    exit(1)
+pyxfiles = [file for file in pyxfiles if file.find(mainfile) == -1]
+# Now, pyxfiles contains all pyx files except the mainfile (cefpython.pyx),
+# we do not fix includes in mainfile.
+
+# So that this is the right directory we're in.
+if os.path.exists("setup"):
+    print("Wrong directory, we should be inside setup!")
+    exit()
+
+# Remove old pyx files in setup directory.
+oldpyxfiles = glob.glob("./*.pyx")
+print("Removing old pyx files in /setup/: %s" % oldpyxfiles)
+for pyxfile in oldpyxfiles:
+    if os.path.exists(pyxfile):
+        os.remove(pyxfile)
+
+# Copying pyxfiles and reading its contents.
+
+print("Copying .pyx files to /setup/: %s" % pyxfiles)
+shutil.copy("../../../%s" % mainfile, "./%s" % mainfile)
+# Rest of the files will be copied in for loop below.
+
+print("Fixing includes in .pyx files:")
+for pyxfile in pyxfiles:
+    newfile = "./%s" % os.path.basename(pyxfile)
+    shutil.copy(pyxfile, newfile)
+    pyxfile = newfile
+    with open(pyxfile, "r") as pyxfileopened:
+        content = pyxfileopened.read()
+        lineNumber = ExceptAllMissing(content)
+        if lineNumber:
+            print("WARNING: 'except *' missing in a cdef/cpdef function, "
+                  "in file %s on line %d" % (os.path.basename(pyxfile), lineNumber))
+            exit(1)
+        # Do not remove the newline - so that line numbers are exact with originals.
+        (content, subs) = re.subn(r"^include[\t ]+[\"'][^\"'\n\r]+[\"'][\t ]*", "", content, flags=re.MULTILINE)
+        if subs:
+            print("%s includes removed in: %s" % (subs, os.path.basename(pyxfile)))
+    # Reading and writing with the same handle using "r+" mode doesn't work,
+    # you need to seek(0) and write the same amount of bytes that was in the
+    # file, otherwise old data from the end of file stays.
+    with open(pyxfile, "w") as pyxfileopened:
+        pyxfileopened.write(content)
+
+print("\n")
@@ -0,0 +1,91 @@
+from distutils.core import setup
+from distutils.extension import Extension
+from Cython.Distutils import build_ext
+import sys
+import platform
+from Cython.Compiler import Options
+
+# Stop on first error, otherwise hundreds of errors appear in the console.
+Options.fast_fail = True
+
+# Written to cython_includes/compile_time_constants.pxi
+CEF_VERSION = 1
+
+"""
+Building libcef_dll_wrapper
+---------------------------
+
+libcef_dll_wrapper needs to be compiled with /MD, otherwise you get linker errors
+of type "already defined". When you try to compile using /MD you may get warnings:
+
+  warning C4275: non dll-interface class 'stdext::exception' used as base for
+  dll-interface class 'std::bad_typeid' see declaration of 'stdext::exception'
+  see declaration of 'std::bad_typeid'
+
+Which results in build errors. To solve it you need to add command line option:
+
+  -D_HAS_EXCEPTIONS=1
+
+Enabling C++ exceptions ("/EHsc") is not required.
+"""
+
+# Python version string: "27" or "32".
+PYTHON_VERSION = str(sys.version_info.major) + str(sys.version_info.minor)
+
+def CompileTimeConstants():
+
+    print("Generating: cython_includes/compile_time_constants.pxi")
+    with open("./../../../cython_includes/compile_time_constants.pxi", "w") as fd:
+        fd.write('# This file was generated by setup.py\n')
+        # A way around Python 3.2 bug: UNAME_SYSNAME is not set.
+        fd.write('DEF UNAME_SYSNAME = "%s"\n' % platform.uname()[0])
+        fd.write('DEF CEF_VERSION = %s\n' % CEF_VERSION)
+
+CompileTimeConstants()
+
+ext_modules = [Extension(
+
+    "cefpython_py%s" % PYTHON_VERSION,
+    ["cefpython.pyx"],
+
+    language='c++',
+    include_dirs=[r'./../', r'./../../', r'./../../../', r'./../../../cython_includes/'],
+
+    library_dirs=[
+        r'./',
+        r"c:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86/",
+        r'./../../http_authentication/Release/',
+        r'./../../v8function_handler/Release_py%s/' % PYTHON_VERSION,
+        r'./../../client_handler/Release_py%s/' % PYTHON_VERSION,
+        r'./../../../cpp_utils/Release/cpp_utils.lib',
+    ],
+
+    libraries=[
+        'libcef',
+        'libcef_dll_wrapper',
+        'User32',
+        'Gdi32',
+        'http_authentication', # Build with /MD.
+        'v8function_handler_py%s' % PYTHON_VERSION, # Build with /MD.
+        'client_handler_py%s' % PYTHON_VERSION # Build with /MD.
+    ],
+
+    # /EHsc - using STL string, multimap and others that use C++ exceptions.
+    extra_compile_args=['/EHsc'],
+
+    # '/ignore:4217' - silence warnings: "locally defined symbol _V8FunctionHandler_Execute
+    #                  imported in function "public: virtual bool __thiscall V8FunctionHandler::Execute".
+    #                  client_handler or other vcprojects include setup/cefpython.h,
+    #                  this is a list of functions with "public" statement that is
+    #                  accessible from c++.
+    extra_link_args=['/ignore:4217'],
+
+    # Defining macros:
+    # define_macros = [("UNICODE","1"), ("_UNICODE","1"), ]
+)]
+
+setup(
+    name = 'cefpython_py%s' % PYTHON_VERSION,
+    cmdclass = {'build_ext': build_ext},
+    ext_modules = ext_modules
+)