From 9cacd9027ee52c9b8ec5103b5215da7a85108170 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Sat, 21 May 2011 19:08:55 +0000 Subject: [PATCH] Remove SIP and PyQt from the Windows installer, add the spotifyblob and the new Python .dll and .zip. --- dist/windows/clementine.nsi.in | 235 +++++++-------------------------- 1 file changed, 46 insertions(+), 189 deletions(-) diff --git a/dist/windows/clementine.nsi.in b/dist/windows/clementine.nsi.in index 69567c19c..6cb92cc3f 100644 --- a/dist/windows/clementine.nsi.in +++ b/dist/windows/clementine.nsi.in @@ -102,6 +102,7 @@ Section "Clementine" Clementine File "avformat-52.dll" File "avutil-50.dll" File "clementine.exe" + File "clementine-spotifyblob.exe" File "clementine.ico" File "glew32.dll" File "intl.dll" @@ -168,43 +169,9 @@ Section "Clementine" Clementine File "QtXml4.dll" File "zlib1.dll" - ; Python extensions - File "_bisect.pyd" - File "_codecs_iso2022.pyd" - File "_collections.pyd" - File "_csv.pyd" - File "_elementtree.pyd" - File "_functools.pyd" - File "_heapq.pyd" - File "_io.pyd" - File "_json.pyd" - File "_locale.pyd" - File "_md5.pyd" - File "_multibytecodec.pyd" - File "_random.pyd" - File "_sha.pyd" - File "_sha256.pyd" - File "_sha512.pyd" - File "_socket.pyd" - File "_struct.pyd" - File "array.pyd" - File "binascii.pyd" - File "cmath.pyd" - File "datetime.pyd" - File "future_builtins.pyd" - File "itertools.pyd" - File "math.pyd" - File "operator.pyd" - File "pyexpat.pyd" - File "select.pyd" - File "sip.pyd" - File "strop.pyd" - File "time.pyd" - File "unicodedata.pyd" - ; Python library - File "libpython2.7.dll" - File "libpython2.7.zip" + File "python27.dll" + File "Python27.zip" ; Check the OS. If Vista or newer, use Default Programs nsisos::osversion @@ -259,82 +226,28 @@ Section "Clementine" Clementine done: SectionEnd -Section "PyQt4" PyQt4 - SetOutPath "$INSTDIR\PyQt4" +Section "Python extensions" DLLs + SetOutPath "$INSTDIR\DLLs" - File "/oname=Qt.pyd" "PyQt4\Qt.pyd" - File "/oname=QtCore.pyd" "PyQt4\QtCore.pyd" - File "/oname=QtGui.pyd" "PyQt4\QtGui.pyd" - File "/oname=QtNetwork.pyd" "PyQt4\QtNetwork.pyd" - File "/oname=__init__.py" "PyQt4\__init__.py" - File "/oname=pyqtconfig.py" "PyQt4\pyqtconfig.py" -SectionEnd - -Section "PyQt4 uic" PyQt4-uic - SetOutPath "$INSTDIR\PyQt4\uic" - - File "/oname=__init__.py" "PyQt4\uic\__init__.py" - File "/oname=driver.py" "PyQt4\uic\driver.py" - File "/oname=exceptions.py" "PyQt4\uic\exceptions.py" - File "/oname=icon_cache.py" "PyQt4\uic\icon_cache.py" - File "/oname=objcreator.py" "PyQt4\uic\objcreator.py" - File "/oname=properties.py" "PyQt4\uic\properties.py" - File "/oname=pyuic.py" "PyQt4\uic\pyuic.py" - File "/oname=uiparser.py" "PyQt4\uic\uiparser.py" -SectionEnd - -Section "PyQt4 uic compiler" PyQt4-uic-compiler - SetOutPath "$INSTDIR\PyQt4\uic\Compiler" - - File "/oname=__init__.py" "PyQt4\uic\Compiler\__init__.py" - File "/oname=compiler.py" "PyQt4\uic\Compiler\compiler.py" - File "/oname=indenter.py" "PyQt4\uic\Compiler\indenter.py" - File "/oname=misc.py" "PyQt4\uic\Compiler\misc.py" - File "/oname=proxy_type.py" "PyQt4\uic\Compiler\proxy_type.py" - File "/oname=qobjectcreator.py" "PyQt4\uic\Compiler\qobjectcreator.py" - File "/oname=qtproxies.py" "PyQt4\uic\Compiler\qtproxies.py" -SectionEnd - -Section "PyQt4 uic loader" PyQt4-uic-loader - SetOutPath "$INSTDIR\PyQt4\uic\Loader" - - File "/oname=__init__.py" "PyQt4\uic\Loader\__init__.py" - File "/oname=loader.py" "PyQt4\uic\Loader\loader.py" - File "/oname=qobjectcreator.py" "PyQt4\uic\Loader\qobjectcreator.py" -SectionEnd - -Section "PyQt4 uic port_v2" PyQt4-uic-port_v2 - SetOutPath "$INSTDIR\PyQt4\uic\port_v2" - - File "/oname=__init__.py" "PyQt4\uic\port_v2\__init__.py" - File "/oname=as_string.py" "PyQt4\uic\port_v2\as_string.py" - File "/oname=ascii_upper.py" "PyQt4\uic\port_v2\ascii_upper.py" - File "/oname=invoke.py" "PyQt4\uic\port_v2\invoke.py" - File "/oname=load_plugin.py" "PyQt4\uic\port_v2\load_plugin.py" - File "/oname=proxy_base.py" "PyQt4\uic\port_v2\proxy_base.py" - File "/oname=string_io.py" "PyQt4\uic\port_v2\string_io.py" -SectionEnd - -Section "PyQt4 uic port_v3" PyQt4-uic-port_v3 - SetOutPath "$INSTDIR\PyQt4\uic\port_v3" - - File "/oname=__init__.py" "PyQt4\uic\port_v3\__init__.py" - File "/oname=as_string.py" "PyQt4\uic\port_v3\as_string.py" - File "/oname=ascii_upper.py" "PyQt4\uic\port_v3\ascii_upper.py" - File "/oname=invoke.py" "PyQt4\uic\port_v3\invoke.py" - File "/oname=load_plugin.py" "PyQt4\uic\port_v3\load_plugin.py" - File "/oname=proxy_base.py" "PyQt4\uic\port_v3\proxy_base.py" - File "/oname=string_io.py" "PyQt4\uic\port_v3\string_io.py" -SectionEnd - -Section "PyQt4 uic widget-plugins" PyQt4-uic-widget-plugins - SetOutPath "$INSTDIR\PyQt4\uic\widget-plugins" - - File "/oname=phonon.py" "PyQt4\uic\widget-plugins\phonon.py" - File "/oname=qaxcontainer.py" "PyQt4\uic\widget-plugins\qaxcontainer.py" - File "/oname=qscintilla.py" "PyQt4\uic\widget-plugins\qscintilla.py" - File "/oname=qtdeclarative.py" "PyQt4\uic\widget-plugins\qtdeclarative.py" - File "/oname=qtwebkit.py" "PyQt4\uic\widget-plugins\qtwebkit.py" + File "/oname=_bsddb.pyd" "DLLs\_bsddb.pyd" + File "/oname=_ctypes.pyd" "DLLs\_ctypes.pyd" + File "/oname=_ctypes_test.pyd" "DLLs\_ctypes_test.pyd" + File "/oname=_elementtree.pyd" "DLLs\_elementtree.pyd" + File "/oname=_hashlib.pyd" "DLLs\_hashlib.pyd" + File "/oname=_msi.pyd" "DLLs\_msi.pyd" + File "/oname=_multiprocessing.pyd" "DLLs\_multiprocessing.pyd" + File "/oname=_socket.pyd" "DLLs\_socket.pyd" + File "/oname=_sqlite3.pyd" "DLLs\_sqlite3.pyd" + File "/oname=_ssl.pyd" "DLLs\_ssl.pyd" + File "/oname=_testcapi.pyd" "DLLs\_testcapi.pyd" + File "/oname=bz2.pyd" "DLLs\bz2.pyd" + File "/oname=py.ico" "DLLs\py.ico" + File "/oname=pyc.ico" "DLLs\pyc.ico" + File "/oname=pyexpat.pyd" "DLLs\pyexpat.pyd" + File "/oname=select.pyd" "DLLs\select.pyd" + File "/oname=sqlite3.dll" "DLLs\sqlite3.dll" + File "/oname=unicodedata.pyd" "DLLs\unicodedata.pyd" + File "/oname=winsound.pyd" "DLLs\winsound.pyd" SectionEnd Section "Qt image format plugins" imageformats @@ -1049,6 +962,7 @@ Section "Uninstall" Delete "$INSTDIR\avutil-50.dll" Delete "$INSTDIR\clementine.ico" Delete "$INSTDIR\clementine.exe" + Delete "$INSTDIR\clementine-spotifyblob.exe" Delete "$INSTDIR\glew32.dll" Delete "$INSTDIR\intl.dll" Delete "$INSTDIR\libarchive.dll" @@ -1114,85 +1028,28 @@ Section "Uninstall" Delete "$INSTDIR\QtXml4.dll" Delete "$INSTDIR\zlib1.dll" - Delete "$INSTDIR\_bisect.pyd" - Delete "$INSTDIR\_codecs_iso2022.pyd" - Delete "$INSTDIR\_collections.pyd" - Delete "$INSTDIR\_csv.pyd" - Delete "$INSTDIR\_elementtree.pyd" - Delete "$INSTDIR\_functools.pyd" - Delete "$INSTDIR\_heapq.pyd" - Delete "$INSTDIR\_io.pyd" - Delete "$INSTDIR\_json.pyd" - Delete "$INSTDIR\_locale.pyd" - Delete "$INSTDIR\_md5.pyd" - Delete "$INSTDIR\_multibytecodec.pyd" - Delete "$INSTDIR\_random.pyd" - Delete "$INSTDIR\_sha.pyd" - Delete "$INSTDIR\_sha256.pyd" - Delete "$INSTDIR\_sha512.pyd" - Delete "$INSTDIR\_socket.pyd" - Delete "$INSTDIR\_struct.pyd" - Delete "$INSTDIR\array.pyd" - Delete "$INSTDIR\binascii.pyd" - Delete "$INSTDIR\cmath.pyd" - Delete "$INSTDIR\datetime.pyd" - Delete "$INSTDIR\future_builtins.pyd" - Delete "$INSTDIR\itertools.pyd" - Delete "$INSTDIR\math.pyd" - Delete "$INSTDIR\operator.pyd" - Delete "$INSTDIR\pyexpat.pyd" - Delete "$INSTDIR\select.pyd" - Delete "$INSTDIR\sip.pyd" - Delete "$INSTDIR\strop.pyd" - Delete "$INSTDIR\time.pyd" - Delete "$INSTDIR\unicodedata.pyd" + Delete "$INSTDIR\python27.dll" + Delete "$INSTDIR\Python27.zip" - Delete "$INSTDIR\libpython2.7.dll" - Delete "$INSTDIR\libpython2.7.zip" - - Delete "$INSTDIR\PyQt4\Qt.pyd" - Delete "$INSTDIR\PyQt4\QtCore.pyd" - Delete "$INSTDIR\PyQt4\QtGui.pyd" - Delete "$INSTDIR\PyQt4\QtNetwork.pyd" - Delete "$INSTDIR\PyQt4\__init__.py" - Delete "$INSTDIR\PyQt4\pyqtconfig.py" - Delete "$INSTDIR\PyQt4\uic\Compiler\__init__.py" - Delete "$INSTDIR\PyQt4\uic\Compiler\compiler.py" - Delete "$INSTDIR\PyQt4\uic\Compiler\indenter.py" - Delete "$INSTDIR\PyQt4\uic\Compiler\misc.py" - Delete "$INSTDIR\PyQt4\uic\Compiler\proxy_type.py" - Delete "$INSTDIR\PyQt4\uic\Compiler\qobjectcreator.py" - Delete "$INSTDIR\PyQt4\uic\Compiler\qtproxies.py" - Delete "$INSTDIR\PyQt4\uic\Loader\__init__.py" - Delete "$INSTDIR\PyQt4\uic\Loader\loader.py" - Delete "$INSTDIR\PyQt4\uic\Loader\qobjectcreator.py" - Delete "$INSTDIR\PyQt4\uic\__init__.py" - Delete "$INSTDIR\PyQt4\uic\driver.py" - Delete "$INSTDIR\PyQt4\uic\exceptions.py" - Delete "$INSTDIR\PyQt4\uic\icon_cache.py" - Delete "$INSTDIR\PyQt4\uic\objcreator.py" - Delete "$INSTDIR\PyQt4\uic\port_v2\__init__.py" - Delete "$INSTDIR\PyQt4\uic\port_v2\as_string.py" - Delete "$INSTDIR\PyQt4\uic\port_v2\ascii_upper.py" - Delete "$INSTDIR\PyQt4\uic\port_v2\invoke.py" - Delete "$INSTDIR\PyQt4\uic\port_v2\load_plugin.py" - Delete "$INSTDIR\PyQt4\uic\port_v2\proxy_base.py" - Delete "$INSTDIR\PyQt4\uic\port_v2\string_io.py" - Delete "$INSTDIR\PyQt4\uic\port_v3\__init__.py" - Delete "$INSTDIR\PyQt4\uic\port_v3\as_string.py" - Delete "$INSTDIR\PyQt4\uic\port_v3\ascii_upper.py" - Delete "$INSTDIR\PyQt4\uic\port_v3\invoke.py" - Delete "$INSTDIR\PyQt4\uic\port_v3\load_plugin.py" - Delete "$INSTDIR\PyQt4\uic\port_v3\proxy_base.py" - Delete "$INSTDIR\PyQt4\uic\port_v3\string_io.py" - Delete "$INSTDIR\PyQt4\uic\properties.py" - Delete "$INSTDIR\PyQt4\uic\pyuic.py" - Delete "$INSTDIR\PyQt4\uic\uiparser.py" - Delete "$INSTDIR\PyQt4\uic\widget-plugins\phonon.py" - Delete "$INSTDIR\PyQt4\uic\widget-plugins\qaxcontainer.py" - Delete "$INSTDIR\PyQt4\uic\widget-plugins\qscintilla.py" - Delete "$INSTDIR\PyQt4\uic\widget-plugins\qtdeclarative.py" - Delete "$INSTDIR\PyQt4\uic\widget-plugins\qtwebkit.py" + Delete "$INSTDIR\DLLs\_bsddb.pyd" + Delete "$INSTDIR\DLLs\_ctypes.pyd" + Delete "$INSTDIR\DLLs\_ctypes_test.pyd" + Delete "$INSTDIR\DLLs\_elementtree.pyd" + Delete "$INSTDIR\DLLs\_hashlib.pyd" + Delete "$INSTDIR\DLLs\_msi.pyd" + Delete "$INSTDIR\DLLs\_multiprocessing.pyd" + Delete "$INSTDIR\DLLs\_socket.pyd" + Delete "$INSTDIR\DLLs\_sqlite3.pyd" + Delete "$INSTDIR\DLLs\_ssl.pyd" + Delete "$INSTDIR\DLLs\_testcapi.pyd" + Delete "$INSTDIR\DLLs\bz2.pyd" + Delete "$INSTDIR\DLLs\py.ico" + Delete "$INSTDIR\DLLs\pyc.ico" + Delete "$INSTDIR\DLLs\pyexpat.pyd" + Delete "$INSTDIR\DLLs\select.pyd" + Delete "$INSTDIR\DLLs\sqlite3.dll" + Delete "$INSTDIR\DLLs\unicodedata.pyd" + Delete "$INSTDIR\DLLs\winsound.pyd" Delete "$INSTDIR\imageformats\qgif4.dll" Delete "$INSTDIR\imageformats\qjpeg4.dll"