Skip to content

Commit 42c5964

Browse files
cztomczakcztomczak
committed
Rename wx-subpackage/ to wx/ and update installer files.
1 parent e345d71 commit 42c5964

File tree

19 files changed

+8
-9
lines changed

19 files changed

+8
-9
lines changed

‎cefpython/linux/installer/make-setup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ def main():
138138
ret = os.system("mv "+package_dir+"/*.css "+package_dir+"/examples/")
139139
assert ret == 0
140140

141-
print("Copying wx-subpackage to wx dir in package dir")
142-
wx_subpackage_dir = os.path.abspath(installer_dir+"/../../wx-subpackage/")
141+
print("Copying wx/ to package dir")
142+
wx_subpackage_dir = os.path.abspath(installer_dir+"/../../wx/")
143143
ret = os.system("cp -rf "+wx_subpackage_dir+"/* "+package_dir+"/wx/")
144144
assert ret == 0
145145

‎cefpython/mac/installer/build_run_chromectrl.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pip install --upgrade cefpython3 --no-index --find-links=file://$cwd
1515
if [ $? -ne 0 ]; then echo "ERROR: pip install cefpython3..." && exit 1; fi;
1616
cd ../
1717

18-
cd ../../wx-subpackage/examples/
18+
cd ../../wx/examples/
1919

2020
python sample1.py
2121
#if [ $? -ne 0 ]; then echo "ERROR: python sample1.py" && exit 1; fi;

‎cefpython/mac/installer/make-setup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ def main():
140140
ret = os.system("mv "+package_dir+"/*.css "+package_dir+"/examples/")
141141
assert ret == 0
142142

143-
print("Copying wx-subpackage to wx dir in package dir")
144-
wx_subpackage_dir = os.path.abspath(installer_dir+"/../../wx-subpackage/")
143+
print("Copying wx/ to package dir")
144+
wx_subpackage_dir = os.path.abspath(installer_dir+"/../../wx/")
145145
ret = os.system("cp -rf "+wx_subpackage_dir+"/* "+package_dir+"/wx/")
146146
assert ret == 0
147147

‎cefpython/windows/installer/make-installer.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ def main():
4343
+ str(sys.version_info.major) + str(sys.version_info.minor)
4444
+ ".pyd")
4545
vars["INSTALLER_DIR"] = os.getcwd()
46-
vars["WX_SUBPACKAGE_DIR"] = os.path.realpath(os.getcwd()+r"\..\.."
47-
"\wx-subpackage")
46+
vars["WX_SUBPACKAGE_DIR"] = os.path.realpath(os.getcwd()+r"\..\..\wx")
4847
vars["PLATFORM"] = sysconfig.get_platform()
4948

5049
if BITS == "32bit":

‎cefpython/windows/installer/make-setup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ def main():
151151
glob_move(package_dir+"/*.css", package_dir+"/examples/")
152152
glob_move(package_dir+"/*.js", package_dir+"/examples/")
153153

154-
print("Copying wx-subpackage to wx dir in package dir")
155-
wx_subpackage_dir = os.path.abspath(installer_dir+"/../../wx-subpackage/")
154+
print("Copying wx/ to package dir")
155+
wx_subpackage_dir = os.path.abspath(installer_dir+"/../../wx/")
156156
glob_copy(wx_subpackage_dir+"/*", package_dir+"/wx/")
157157

158158
print("Moving wx examples from wx/examples to examples/wx")

cefpython/wx-subpackage/README.txt renamed to cefpython/wx/README.txt

File renamed without changes.

cefpython/wx-subpackage/__init__.py renamed to cefpython/wx/__init__.py

File renamed without changes.

cefpython/wx-subpackage/chromectrl.py renamed to cefpython/wx/chromectrl.py

File renamed without changes.

cefpython/wx-subpackage/examples/back.png renamed to cefpython/wx/examples/back.png

File renamed without changes.

cefpython/wx-subpackage/examples/forward.png renamed to cefpython/wx/examples/forward.png

File renamed without changes.

0 commit comments

Comments
 (0)