diff --git a/3.2/descriptions.nsh b/3.2/descriptions.nsh index 30317c1..dbc33cd 100644 --- a/3.2/descriptions.nsh +++ b/3.2/descriptions.nsh @@ -37,6 +37,7 @@ LangString DESC_MODULE_SCIPY ${LANG_ENGLISH} "SciPy is open-source software for LangString DESC_MODULE_MATPLOTLIB ${LANG_ENGLISH} "2D plotting library which produces publication quality figures in a variety of hardcopy formats and interactive environments across platforms" LangString DESC_MODULE_LXML ${LANG_ENGLISH} "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." LangString DESC_MODULE_PYODBC ${LANG_ENGLISH} "Module that allows you to use ODBC to connect to almost any database from Windows, Linux, OS/X, and more." +LangString DESC_MODULE_PYGAME ${LANG_ENGLISH} "Pygame adds functionality on top of the excellent SDL library so that you can create fully featured games and multimedia programs." LangString DESC_MODULE_PYQT ${LANG_ENGLISH} "PYQT is a set of Python bindings for Nokia's Qt application framework implemented as a set of Python modules and contain over 300 classes and over 6,000 functions and methods." LangString DESC_MODULE_IPYTHON ${LANG_ENGLISH} "IPython provides a rich toolkit to help you make the most out of using Python interactively." LangString DESC_MODULE_PANDAS ${LANG_ENGLISH} "Pandas is a Python package providing fast, flexible, and expressive data structures designed to make working with structured (tabular, multidimensional, potentially heterogeneous) and time series data both easy and intuitive." @@ -56,4 +57,4 @@ LangString DESC_MODULE_PANDAS ${LANG_ENGLISH} "Pandas is a Python package provid !insertmacro MUI_DESCRIPTION_TEXT ${MODULE_PYODBC} $(DESC_MODULE_PYODBC) !insertmacro MUI_DESCRIPTION_TEXT ${MODULE_PYQT} $(DESC_MODULE_PYQT) !insertmacro MUI_DESCRIPTION_TEXT ${MODULE_IPYTHON} $(DESC_MODULE_IPYTHON) -!insertmacro MUI_FUNCTION_DESCRIPTION_END \ No newline at end of file +!insertmacro MUI_FUNCTION_DESCRIPTION_END diff --git a/3.2/modules.bat b/3.2/modules.bat index 459802b..e07ec54 100644 --- a/3.2/modules.bat +++ b/3.2/modules.bat @@ -36,6 +36,7 @@ call :UnpackMatplotlib call :UnpackLXML call :UnpackPySerial call :UnpackPyODBC +call :UnpackPyGame call :UnpackPyQT call :UnpackIPython call :UnpackPandas @@ -359,6 +360,31 @@ call COMMON :FixMSCRT %UNPACK_FOLDER%\pyodbc\ endlocal&goto :EOF ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:UnpackPyGame +:: +:: By: Perica Zivkovic +:: Func: Downloads and extracts PyGame +:: Args: none +::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +setlocal ENABLEEXTENSIONS + +:: Download +call COMMON :DownloadFile %PYGAME_DOWNLOAD% + +:: Unpack files +call COMMON :LogMessage "Extracting PyGame files" +msiexec /quiet /a "%BIN_FOLDER%\%PYGAME_FILE%" TARGETDIR="%UNPACK_FOLDER%\pygame\" + +:: Cleanup +del /F /Q "%UNPACK_FOLDER%\pygame\%PYGAME_FILE%" + +:: Fix +call COMMON :FixMSCRT %UNPACK_FOLDER%\pygame\ + +endlocal&goto :EOF +::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: + ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :UnpackPyQT :: @@ -525,4 +551,4 @@ call COMMON :LogMessage "Copy PyCharm shortcut" copy shortcuts\PyCharm-Portable.exe "%UNPACK_FOLDER%" >NUL endlocal&goto :EOF -::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: \ No newline at end of file +::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/3.2/modules.nsh b/3.2/modules.nsh index 561470a..dc463a8 100644 --- a/3.2/modules.nsh +++ b/3.2/modules.nsh @@ -75,6 +75,11 @@ SectionGroup "Modules" SetOutPath "$INSTDIR\App\Lib\site-packages\" File /r "${SOURCESFOLDER}\pyodbc\PLATLIB\*.*" SectionEnd + Section "PyGame 1.9.2a0" MODULE_PYGAME + SectionIn 1 + SetOutPath "$INSTDIR\App\" + File /r "${SOURCESFOLDER}\pygame\*.*" + SectionEnd Section "PyQT 4.9.6-1" MODULE_PYQT SectionIn 1 SetOutPath "$INSTDIR\App\Lib\" diff --git a/3.2/settings.bat b/3.2/settings.bat index 1b730b0..9797eaf 100644 --- a/3.2/settings.bat +++ b/3.2/settings.bat @@ -74,6 +74,9 @@ set PYODBC_DOWNLOAD="http://pyodbc.googlecode.com/files/pyodbc-3.0.2.win32-py3.2 set PYODBC_FILE=pyodbc-3.0.2.win32-py3.2.exe set PYODBC_SHA1=9abe8b36be9f3a2dbb427a4a049e9b70cd909c6d +set PYGAME_DOWNLOAD="http://pygame.org/ftp/pygame-1.9.2a0.win32-py3.2.msi" +set PYGAME_FILE=pygame-1.9.2a0.win32-py3.2.msi + set PYQT_DOWNLOAD="http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.9.6/PyQt-Py3.2-x86-gpl-4.9.6-1.exe" set PYQT_FILE=PyQt-Py3.2-x86-gpl-4.9.6-1.exe set PYQT_MD5=9c4a1b3b1246e936c3439c0e8a1d5774 @@ -88,4 +91,4 @@ set PANDAS_MD5=7f11d2f59284c5ba64e7d781e1023f95 set PYCHARM_DOWNLOAD="http://download-cf.jetbrains.com/python/pycharm-community-3.1.2.exe" set PYCHARM_FILE=pycharm-community-3.1.2.exe -set PYCHARM_MD5=4707668758b044bf5a4214557e7a15fa \ No newline at end of file +set PYCHARM_MD5=4707668758b044bf5a4214557e7a15fa