Skip to content

Commit 99d03d0

Browse files
cztomczakcztomczak
committed
Fix paths in compile scripts - issue caused by moving the cef3/ directory.
1 parent b6e0a9b commit 99d03d0

File tree

8 files changed

+17
-29
lines changed

8 files changed

+17
-29
lines changed

‎cefpython/linux/compile.py‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
# fails and then run the compile.py script again and this time
5353
# make should succeed.
5454

55-
os.chdir("./../../cpp_utils/")
55+
os.chdir("./../cpp_utils/")
5656
subprocess.call("rm -f *.o *.a", shell=True)
5757

5858
ret = subprocess.call("make -f Makefile", shell=True)
@@ -90,13 +90,6 @@
9090
# .copy() will also copy Permission bits
9191
shutil.copy("./subprocess", subprocess_exe)
9292

93-
# os.chdir("./../v8function_handler/")
94-
# ret = subprocess.call("make -f Makefile", shell=True)
95-
# if ret != 0:
96-
# what = raw_input("make failed, press 'y' to continue, 'n' to stop: ")
97-
# if what != "y":
98-
# sys.exit(1)
99-
10093
os.chdir("./../linux/")
10194

10295
try:

‎cefpython/linux/setup/fix_pyx_files.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def ExceptAllMissing(content):
5959
print("\n")
6060
mainfile = "cefpython.pyx"
6161

62-
pyxfiles = glob.glob("../../../*.pyx")
62+
pyxfiles = glob.glob("../../*.pyx")
6363
if not len(pyxfiles):
6464
sys.exit(1)
6565
pyxfiles = [file for file in pyxfiles if file.find(mainfile) == -1]
@@ -81,7 +81,7 @@ def ExceptAllMissing(content):
8181
# Copying pyxfiles and reading its contents.
8282

8383
print("Copying .pyx files to /setup/: %s" % pyxfiles)
84-
shutil.copy("../../../%s" % mainfile, "./%s" % mainfile)
84+
shutil.copy("../../%s" % mainfile, "./%s" % mainfile)
8585
# Rest of the files will be copied in for loop below.
8686

8787
print("Fixing includes in .pyx files:")

‎cefpython/linux/setup/setup.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
def CompileTimeConstants():
2525

2626
print("Generating: cython_includes/compile_time_constants.pxi")
27-
with open("./../../../cython_includes/compile_time_constants.pxi", "w") as fd:
27+
with open("./../../cython_includes/compile_time_constants.pxi", "w") as fd:
2828
fd.write('# This file was generated by setup.py\n')
2929
# A way around Python 3.2 bug: UNAME_SYSNAME is not set.
3030
fd.write('DEF UNAME_SYSNAME = "%s"\n' % platform.uname()[0])
@@ -51,8 +51,7 @@ def CompileTimeConstants():
5151
include_dirs=[
5252
r'./../',
5353
r'./../../',
54-
r'./../../../',
55-
r'./../../../cython_includes/',
54+
r'./../../cython_includes/',
5655
'/usr/include/gtk-2.0',
5756
'/usr/include/glib-2.0',
5857
'/usr/include/cairo',
@@ -74,10 +73,9 @@ def CompileTimeConstants():
7473
# http_authentication not implemented on Linux.
7574
library_dirs=[
7675
r'./lib_%s' % BITS,
77-
# r'./../../v8function_handler/',
7876
r'./../../client_handler/',
7977
r'./../../subprocess/', # libcefpythonapp
80-
r'./../../../cpp_utils/'
78+
r'./../../cpp_utils/'
8179
],
8280

8381
libraries=[

‎cefpython/mac/compile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
# fails and then run the compile.py script again and this time
7171
# make should succeed.
7272

73-
os.chdir("./../../cpp_utils/")
73+
os.chdir("./../cpp_utils/")
7474
subprocess.call("rm -f *.o *.a", shell=True)
7575

7676
ret = subprocess.call("make -f Makefile", shell=True)

‎cefpython/mac/setup/fix_pyx_files.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def ExceptAllMissing(content):
5959
print("\n")
6060
mainfile = "cefpython.pyx"
6161

62-
pyxfiles = glob.glob("../../../*.pyx")
62+
pyxfiles = glob.glob("../../*.pyx")
6363
if not len(pyxfiles):
6464
sys.exit(1)
6565
pyxfiles = [file for file in pyxfiles if file.find(mainfile) == -1]
@@ -81,7 +81,7 @@ def ExceptAllMissing(content):
8181
# Copying pyxfiles and reading its contents.
8282

8383
print("Copying .pyx files to /setup/: %s" % pyxfiles)
84-
shutil.copy("../../../%s" % mainfile, "./%s" % mainfile)
84+
shutil.copy("../../%s" % mainfile, "./%s" % mainfile)
8585
# Rest of the files will be copied in for loop below.
8686

8787
print("Fixing includes in .pyx files:")

‎cefpython/mac/setup/setup.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
def CompileTimeConstants():
3333

3434
print("Generating: cython_includes/compile_time_constants.pxi")
35-
with open("./../../../cython_includes/compile_time_constants.pxi", "w") as fd:
35+
with open("./../../cython_includes/compile_time_constants.pxi", "w") as fd:
3636
fd.write('# This file was generated by setup.py\n')
3737
# A way around Python 3.2 bug: UNAME_SYSNAME is not set.
3838
fd.write('DEF UNAME_SYSNAME = "%s"\n' % platform.uname()[0])
@@ -59,8 +59,7 @@ def CompileTimeConstants():
5959
include_dirs=[
6060
r'./../',
6161
r'./../../',
62-
r'./../../../',
63-
r'./../../../cython_includes/',
62+
r'./../../cython_includes/',
6463
'/usr/include/gtk-2.0',
6564
'/usr/include/glib-2.0',
6665
'/usr/include/cairo',
@@ -82,10 +81,9 @@ def CompileTimeConstants():
8281
# http_authentication not implemented on Linux.
8382
library_dirs=[
8483
r'./lib_%s' % BITS,
85-
# r'./../../v8function_handler/',
8684
r'./../../client_handler/',
8785
r'./../../subprocess/', # libcefpythonapp
88-
r'./../../../cpp_utils/'
86+
r'./../../cpp_utils/'
8987
],
9088

9189
libraries=[

‎cefpython/windows/setup/fix_pyx_files.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def ExceptAllMissing(content):
5757
print("\n")
5858
mainfile = "cefpython.pyx"
5959

60-
pyxfiles = glob.glob("../../../*.pyx")
60+
pyxfiles = glob.glob("../../*.pyx")
6161
if not len(pyxfiles):
6262
sys.exit(1)
6363
pyxfiles = [file for file in pyxfiles if file.find(mainfile) == -1]
@@ -79,7 +79,7 @@ def ExceptAllMissing(content):
7979
# Copying pyxfiles and reading its contents.
8080

8181
print("Copying .pyx files to /setup/: %s" % pyxfiles)
82-
shutil.copy("../../../%s" % mainfile, "./%s" % mainfile)
82+
shutil.copy("../../%s" % mainfile, "./%s" % mainfile)
8383
# Rest of the files will be copied in for loop below.
8484

8585
print("Fixing includes in .pyx files:")

‎cefpython/windows/setup/setup.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# Generate compile_time_constants.pxi
2828
def CompileTimeConstants():
2929
print("[setup.py] Generating: cython_includes/compile_time_constants.pxi")
30-
with open("../../../cython_includes/compile_time_constants.pxi", "w") as fd:
30+
with open("../../cython_includes/compile_time_constants.pxi", "w") as fd:
3131
fd.write('# This file was generated by setup.py\n')
3232
# A way around Python 3.2 bug: UNAME_SYSNAME is not set.
3333
fd.write('DEF UNAME_SYSNAME = "%s"\n' % platform.uname()[0])
@@ -63,16 +63,15 @@ def CompileTimeConstants():
6363
include_dirs=[
6464
r'./../',
6565
r'./../../',
66-
r'./../../../',
67-
r'./../../../cython_includes/'],
66+
r'./../../cython_includes/'],
6867

6968
library_dirs=[
7069
winsdk_lib,
7170
r'./',
7271
r'./lib_%s' % (BITS),
7372
r'./../../client_handler/Release_py%s_%s/' % (PYVER, BITS),
7473
r'./../../subprocess/Release_py%s_%s/' % (PYVER, BITS),
75-
r'./../../../cpp_utils/Release_%s/' % (BITS),
74+
r'./../../cpp_utils/Release_%s/' % (BITS),
7675
],
7776

7877
libraries=[

0 commit comments

Comments
 (0)