diff options
author | Roman Lacko <backup.rlacko@gmail.com> | 2012-07-16 16:15:40 +0200 |
---|---|---|
committer | Roman Lacko <backup.rlacko@gmail.com> | 2012-07-16 16:15:40 +0200 |
commit | fb0b8a3fec266077b5b686430bc3f973fafe06f8 (patch) | |
tree | 5cf296a37eb252b18fafb4b07eb1936e87ba1e9d | |
parent | ed8807b1589c3b0cf9c3b57e820ca6b15cb76c76 (diff) |
use standard string format function instead of custom implementation
-rw-r--r-- | README.txt | 31 | ||||
-rw-r--r-- | setup.py | 98 | ||||
-rw-r--r-- | utils.py | 25 |
3 files changed, 87 insertions, 67 deletions
diff --git a/README.txt b/README.txt index 883b4eb49..e3ebf5828 100644 --- a/README.txt +++ b/README.txt @@ -92,7 +92,7 @@ Optionally you can specify the path to OpenSSL libs: :: - c:\env> Scripts\pip install PySide --install-option="--openssl=c:\\Alfa\\OpenSSL32bit\\bin" --install-option="--qmake=c:\\Qt\\4.7.4\\bin\\qmake.exe" + c:\env> Scripts\pip install PySide --install-option="--openssl=c:\\OpenSSL32bit\\bin" --install-option="--qmake=c:\\Qt\\4.7.4\\bin\\qmake.exe" Building PySide installer ------------------------- @@ -113,7 +113,7 @@ Building PySide installer :: - c:\> c:\Python27\python setup.py bdist_wininst --qmake=c:\Qt\4.7.4\bin\qmake.exe + c:\> c:\Python27\python setup.py bdist_wininst --qmake=c:\Qt\4.7.4\bin\qmake.exe --openssl=c:\OpenSSL32bit\bin Installing PySide from source on a UNIX System (Ubuntu 12.04 LTS) ================================================================= @@ -188,6 +188,33 @@ You can also specify version of `PySide` when installing from github repository: $ env/bin/pip install git+https://github.com/PySide/pyside-setup.git@1.1.1 +Building PySide distribution egg +-------------------------------- + +#. Clone ``PySide`` from git repository: + + :: + + $ git clone https://github.com/PySide/pyside-setup.git pyside-setup + +#. Switch to the ``pyside-setup`` directory: + + :: + + $ cd pyside-setup + +#. Build ``PySide`` distribution egg: + + :: + + $ env/bin/python setup.py bdist_egg + +#. Optionally you can build standalone version of distribution egg with embedded Qt libs: + + :: + + $ env/bin/python setup.py bdist_egg --standalone + Feedback and getting involved ============================= @@ -447,31 +447,31 @@ class pyside_build(_build): def prepare_packages_linux(self, vars): # patchelf -> PySide/patchelf copyfile( - "${setup_dir}/patchelf", - "${setup_dir}/PySide/patchelf", + "{setup_dir}/patchelf", + "{setup_dir}/PySide/patchelf", logger=log, vars=vars) # <install>/lib/site-packages/PySide/* -> <setup>/PySide copydir( - "${install_dir}/lib/python${py_version}/site-packages/PySide", - "${setup_dir}/PySide", + "{install_dir}/lib/python{py_version}/site-packages/PySide", + "{setup_dir}/PySide", logger=log, vars=vars) # <install>/lib/site-packages/pysideuic/* -> <setup>/pysideuic copydir( - "${install_dir}/lib/python${py_version}/site-packages/pysideuic", - "${setup_dir}/pysideuic", + "{install_dir}/lib/python{py_version}/site-packages/pysideuic", + "{setup_dir}/pysideuic", force=False, logger=log, vars=vars) # <install>/bin/pyside-uic -> PySide/scripts/uic.py makefile( - "${setup_dir}/PySide/scripts/__init__.py", + "{setup_dir}/PySide/scripts/__init__.py", logger=log, vars=vars) copyfile( - "${install_dir}/bin/pyside-uic", - "${setup_dir}/PySide/scripts/uic.py", + "{install_dir}/bin/pyside-uic", + "{setup_dir}/PySide/scripts/uic.py", force=False, logger=log, vars=vars) # <install>/bin/* -> PySide/ copydir( - "${install_dir}/bin/", - "${setup_dir}/PySide", + "{install_dir}/bin/", + "{setup_dir}/PySide", filter=[ "pyside-lupdate", "pyside-rcc", @@ -480,8 +480,8 @@ class pyside_build(_build): recursive=False, logger=log, vars=vars) # <install>/lib/lib* -> PySide/ copydir( - "${install_dir}/lib/", - "${setup_dir}/PySide", + "{install_dir}/lib/", + "{setup_dir}/PySide", filter=[ "libpyside*.so.*", "libshiboken*.so.*", @@ -489,23 +489,23 @@ class pyside_build(_build): recursive=False, logger=log, vars=vars) # <install>/share/PySide/typesystems/* -> <setup>/PySide/typesystems copydir( - "${install_dir}/share/PySide/typesystems", - "${setup_dir}/PySide/typesystems", + "{install_dir}/share/PySide/typesystems", + "{setup_dir}/PySide/typesystems", logger=log, vars=vars) # <install>/include/* -> <setup>/PySide/include copydir( - "${install_dir}/include", - "${setup_dir}/PySide/include", + "{install_dir}/include", + "{setup_dir}/PySide/include", logger=log, vars=vars) # <sources>/pyside-examples/examples/* -> <setup>/PySide/examples copydir( - "${sources_dir}/pyside-examples/examples", - "${setup_dir}/PySide/examples", + "{sources_dir}/pyside-examples/examples", + "{setup_dir}/PySide/examples", force=False, logger=log, vars=vars) # Copy Qt libs to package if OPTION_STANDALONE: # <qt>/bin/* -> <setup>/PySide - copydir("${qt_bin_dir}", "${setup_dir}/PySide", + copydir("{qt_bin_dir}", "{setup_dir}/PySide", filter=[ "designer", "linguist", @@ -515,87 +515,87 @@ class pyside_build(_build): ], recursive=False, logger=log, vars=vars) # <qt>/lib/* -> <setup>/PySide - copydir("${qt_lib_dir}", "${setup_dir}/PySide", + copydir("{qt_lib_dir}", "{setup_dir}/PySide", filter=[ "libQt*.so.?", "libphonon.so.?", ], recursive=False, logger=log, vars=vars) # <qt>/plugins/* -> <setup>/PySide/plugins - copydir("${qt_plugins_dir}", "${setup_dir}/PySide/plugins", + copydir("{qt_plugins_dir}", "{setup_dir}/PySide/plugins", filter=["*.so"], logger=log, vars=vars) # <qt>/imports/* -> <setup>/PySide/imports if float(vars["qt_version"][:3]) > 4.6: - copydir("${qt_imports_dir}", "${setup_dir}/PySide/imports", + copydir("{qt_imports_dir}", "{setup_dir}/PySide/imports", filter=["qmldir", "*.so"], logger=log, vars=vars) # <qt>/translations/* -> <setup>/PySide/translations - copydir("${qt_translations_dir}", "${setup_dir}/PySide/translations", + copydir("{qt_translations_dir}", "{setup_dir}/PySide/translations", filter=["*.qm"], logger=log, vars=vars) def prepare_packages_win32(self, vars): # <install>/lib/site-packages/PySide/* -> <setup>/PySide copydir( - "${install_dir}/lib/site-packages/PySide", - "${setup_dir}/PySide", + "{install_dir}/lib/site-packages/PySide", + "{setup_dir}/PySide", logger=log, vars=vars) if self.debug: # <build>/pyside/PySide/*.pdb -> <setup>/PySide copydir( - "${build_dir}/pyside/PySide", - "${setup_dir}/PySide", + "{build_dir}/pyside/PySide", + "{setup_dir}/PySide", filter=["*.pdb"], recursive=False, logger=log, vars=vars) # <install>/lib/site-packages/pysideuic/* -> <setup>/pysideuic copydir( - "${install_dir}/lib/site-packages/pysideuic", - "${setup_dir}/pysideuic", + "{install_dir}/lib/site-packages/pysideuic", + "{setup_dir}/pysideuic", force=False, logger=log, vars=vars) # <install>/bin/pyside-uic -> PySide/scripts/uic.py makefile( - "${setup_dir}/PySide/scripts/__init__.py", + "{setup_dir}/PySide/scripts/__init__.py", logger=log, vars=vars) copyfile( - "${install_dir}/bin/pyside-uic", - "${setup_dir}/PySide/scripts/uic.py", + "{install_dir}/bin/pyside-uic", + "{setup_dir}/PySide/scripts/uic.py", force=False, logger=log, vars=vars) # <install>/bin/*.exe,*.dll -> PySide/ copydir( - "${install_dir}/bin/", - "${setup_dir}/PySide", + "{install_dir}/bin/", + "{setup_dir}/PySide", filter=["*.exe", "*.dll"], recursive=False, logger=log, vars=vars) # <install>/lib/*.lib -> PySide/ copydir( - "${install_dir}/lib/", - "${setup_dir}/PySide", + "{install_dir}/lib/", + "{setup_dir}/PySide", filter=["*.lib"], recursive=False, logger=log, vars=vars) # <install>/share/PySide/typesystems/* -> <setup>/PySide/typesystems copydir( - "${install_dir}/share/PySide/typesystems", - "${setup_dir}/PySide/typesystems", + "{install_dir}/share/PySide/typesystems", + "{setup_dir}/PySide/typesystems", logger=log, vars=vars) # <install>/include/* -> <setup>/PySide/include copydir( - "${install_dir}/include", - "${setup_dir}/PySide/include", + "{install_dir}/include", + "{setup_dir}/PySide/include", logger=log, vars=vars) # <sources>/pyside-examples/examples/* -> <setup>/PySide/examples copydir( - "${sources_dir}/pyside-examples/examples", - "${setup_dir}/PySide/examples", + "{sources_dir}/pyside-examples/examples", + "{setup_dir}/PySide/examples", force=False, logger=log, vars=vars) # <ssl_libs>/* -> <setup>/PySide/ - copydir("${ssl_libs_dir}", "${setup_dir}/PySide", + copydir("{ssl_libs_dir}", "{setup_dir}/PySide", filter=[ "libeay32.dll", "ssleay32.dll"], force=False, logger=log, vars=vars) # <qt>/bin/*.dll -> <setup>/PySide - copydir("${qt_bin_dir}", "${setup_dir}/PySide", + copydir("{qt_bin_dir}", "{setup_dir}/PySide", filter=[ "*.dll", "designer.exe", @@ -607,19 +607,19 @@ class pyside_build(_build): recursive=False, logger=log, vars=vars) if self.debug: # <qt>/bin/*d4.dll -> <setup>/PySide - copydir("${qt_bin_dir}", "${setup_dir}/PySide", + copydir("{qt_bin_dir}", "{setup_dir}/PySide", filter=["*d4.dll"], recursive=False, logger=log, vars=vars) # <qt>/plugins/* -> <setup>/PySide/plugins - copydir("${qt_plugins_dir}", "${setup_dir}/PySide/plugins", + copydir("{qt_plugins_dir}", "{setup_dir}/PySide/plugins", filter=["*.dll"], logger=log, vars=vars) # <qt>/imports/* -> <setup>/PySide/imports - copydir("${qt_imports_dir}", "${setup_dir}/PySide/imports", + copydir("{qt_imports_dir}", "{setup_dir}/PySide/imports", filter=["qmldir", "*.dll"], logger=log, vars=vars) # <qt>/translations/* -> <setup>/PySide/translations - copydir("${qt_translations_dir}", "${setup_dir}/PySide/translations", + copydir("{qt_translations_dir}", "{setup_dir}/PySide/translations", filter=["*.qm"], logger=log, vars=vars) @@ -18,17 +18,10 @@ def filter_match(name, patterns): return False -def subst_vars(input, **vars): - if vars is not None: - for key in vars: - input = input.replace("${%s}" % key, str(vars[key])) - return input - - def copyfile(src, dst, logger=None, force=True, vars=None, subst_content=False): if vars is not None: - src = subst_vars(src, **vars) - dst = subst_vars(dst, **vars) + src = src.format(**vars) + dst = dst.format(**vars) if not os.path.exists(src) and not force: if logger is not None: @@ -46,7 +39,7 @@ def copyfile(src, dst, logger=None, force=True, vars=None, subst_content=False): f = open(src, "rt") content = f.read() f.close() - content = subst_vars(content, **vars) + content = content.format(**vars) f = open(dst, "wt") f.write(content) f.close() @@ -55,8 +48,8 @@ def copyfile(src, dst, logger=None, force=True, vars=None, subst_content=False): def makefile(dst, content=None, logger=None, vars=None): if vars is not None: if content is not None: - content = subst_vars(content, **vars) - dst = subst_vars(dst, **vars) + content = content.format(**vars) + dst = dst.format(**vars) if logger is not None: logger.info("Making file %s." % (dst)) @@ -75,14 +68,14 @@ def copydir(src, dst, logger=None, filter=None, ignore=None, force=True, recursive=True, vars=None, subst_files_content=False): if vars is not None: - src = subst_vars(src, **vars) - dst = subst_vars(dst, **vars) + src = src.format(**vars) + dst = dst.format(**vars) if filter is not None: for i in range(len(filter)): - filter[i] = subst_vars(filter[i], **vars) + filter[i] = filter[i].format(**vars) if ignore is not None: for i in range(len(ignore)): - ignore[i] = subst_vars(ignore[i], **vars) + ignore[i] = ignore[i].format(**vars) if not os.path.exists(src) and not force: if logger is not None: |