Updated linux installers and README.

cztomczak · cztomczak · commit be22609b04d8 · 2014-12-01T09:01:39.000+01:00
diff --git a/cefpython/cef3/linux/installer/README.txt.template b/cefpython/cef3/linux/installer/README.txt.template
@@ -1,21 +1,40 @@
-1. To install CEF Python 3 type:
+1. To install CEF Python 3 package type:
    
-       sudo python setup.py install
+   sudo python setup.py install
 
-       This will install the cefpython3 package to
-       /usr/local/lib/python2.7/dist-packages/
+   This will install the cefpython3 package to
+   /usr/local/lib/python2.7/dist-packages/
 
-2. In the same directory that setup.py resides there is 
+2. It may also be required to install "libnss3" and "libnspr4" dependencies:
+
+   sudo apt-get install libnss3-1d libnspr4-0d
+
+3. On Ubuntu 12 everything should work out of the box. But on Ubuntu 13,
+   Ubuntu 14, Fedora 20 and possibly some other OS'es there may be issues
+   with wrong version of libudev library. For example to fix it on Ubuntu
+   64bit it is required to create a symbolic link "libudev.so.0" to
+   the "libudev.so.1" library with this command:
+
+   cd /lib/x86_64-linux-gnu/
+   sudo ln -sf libudev.so.1 libudev.so.0
+
+   The path to libudev.so.1 may be different on other OS'es, see:
+   * Ubuntu, Xubuntu, Mint - /lib/x86_64-linux-gnu/
+   * SUSE, Fedora - /usr/lib64/
+   * Arch, Fedora 32bit - /usr/lib/
+   * Ubuntu 32bit - /lib/i386-linux-gnu/
+
+4. In the same directory that setup.py resides there is 
    an examples/ directory, run some example scripts from there:
 
-       cd examples/
-       python wxpython.py
-       python kivy_.py
+   cd examples/
+   python wxpython.py
+   python kivy_.py
 
-       cd wx/
-       python sample1.py
-       python sample2.py
-       python sample3.py
+   cd wx/
+   python sample1.py
+   python sample2.py
+   python sample3.py
 
 Note:
     Examples directory can also be found in the cefpython3 package directory:
diff --git a/cefpython/cef3/linux/installer/make-deb.py b/cefpython/cef3/linux/installer/make-deb.py
@@ -24,6 +24,10 @@
 BITS = platform.architecture()[0]
 assert (BITS == "32bit" or BITS == "64bit")
 ARCHITECTURE = "i386" if (BITS == "32bit") else "amd64"
+IF BITS == "32bit":
+    LINUX_BITS = "linux32"
+ELSE:
+    LINUX_BITS = "linux64"
 
 PACKAGE_NAME = "cefpython3"
 PYTHON_NAME ="python2.7" # Directory name in deb archive
@@ -296,8 +300,8 @@ def main():
     
     # Paths
     global DISTUTILS_SETUP
-    DISTUTILS_SETUP = INSTALLER+"/"+PACKAGE_NAME+"-"+args.version+"-linux-"+\
-            BITS+"-setup"
+    DISTUTILS_SETUP = INSTALLER+"/"+PACKAGE_NAME+"-"+args.version+"-"+\
+            LINUX_BITS+"-setup"
 
     remove_directories_from_previous_run()
     create_distutils_setup_package()
diff --git a/cefpython/cef3/linux/installer/make-setup.py b/cefpython/cef3/linux/installer/make-setup.py
@@ -15,6 +15,10 @@
 
 BITS = platform.architecture()[0]
 assert (BITS == "32bit" or BITS == "64bit")
+IF BITS == "32bit":
+    LINUX_BITS = "linux32"
+ELSE:
+    LINUX_BITS = "linux64"
 PACKAGE_NAME = "cefpython3"
 
 README_TEMPLATE = os.getcwd()+r"/README.txt.template"
@@ -49,7 +53,7 @@ def main():
 
     installer_dir = os.path.dirname(os.path.abspath(__file__))
 
-    setup_dir = installer_dir+"/"+PACKAGE_NAME+"-"+vars["APP_VERSION"]+"-linux-"+BITS+"-setup"
+    setup_dir = installer_dir+"/"+PACKAGE_NAME+"-"+vars["APP_VERSION"]+"-"+LINUX_BITS+"-setup"
     print("Creating setup dir: "+setup_dir)
     os.mkdir(setup_dir)
 
