anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-31 07:45:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Install complete Python instead of subset. Fixes #7485 and #7405.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38527 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Joost Verburg 2011-04-26 21:29:32 +00:00
parent 27903f82f5
commit 0f7b2cde6a
3 changed files with 9 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
development/Win32/packaging/installer/include/filelist.nsh
View File

@ -93,188 +93,6 @@ Lists of files to include in the installer
!macroend
!macro FileListPythonBin COMMAND DIRECTORY
${FILE}python.exe"
${FILE}python26.dll"
${FILE}unicodedata.pyd"
!macroend
!macro FileListPythonLib COMMAND DIRECTORY
${FILE}__future__.py"
${FILE}_abcoll.py"
${FILE}UserDict.py"
${FILE}abc.py"
${FILE}codecs.py"
${FILE}compileall.py"
${FILE}copy_reg.py"
${FILE}csv.py"
${FILE}functools.py"
${FILE}fnmatch.py"
${FILE}genericpath.py"
${FILE}getopt.py"
${FILE}gettext.py"
${FILE}glob.py"
${FILE}gzip.py"
${FILE}linecache.py"
${FILE}locale.py"
${FILE}ntpath.py"
${FILE}os.py"
${FILE}optparse.py"
${FILE}pipes.py"
${FILE}posixpath.py"
${FILE}py_compile.py"
${FILE}random.py"
${FILE}re.py"
${FILE}shutil.py"
${FILE}site.py"
${FILE}sre.py"
${FILE}sre_compile.py"
${FILE}sre_constants.py"
${FILE}sre_parse.py"
${FILE}stat.py"
${FILE}string.py"
${FILE}struct.py"
${FILE}subprocess.py"
${FILE}tempfile.py"
${FILE}tempfile.py"
${FILE}textwrap.py"
${FILE}traceback.py"
${FILE}types.py"
${FILE}warnings.py"
!macroend
!macro FileListPythonLibEncodings COMMAND DIRECTORY
${FILE}aliases.py"
${FILE}ascii.py"
${FILE}base64_codec.py"
${FILE}big5.py"
${FILE}big5hkscs.py"
${FILE}bz2_codec.py"
${FILE}charmap.py"
${FILE}cp037.py"
${FILE}cp1006.py"
${FILE}cp1026.py"
${FILE}cp1140.py"
${FILE}cp1250.py"
${FILE}cp1251.py"
${FILE}cp1252.py"
${FILE}cp1253.py"
${FILE}cp1254.py"
${FILE}cp1255.py"
${FILE}cp1256.py"
${FILE}cp1257.py"
${FILE}cp1258.py"
${FILE}cp424.py"
${FILE}cp437.py"
${FILE}cp500.py"
${FILE}cp737.py"
${FILE}cp775.py"
${FILE}cp850.py"
${FILE}cp852.py"
${FILE}cp855.py"
${FILE}cp856.py"
${FILE}cp857.py"
${FILE}cp860.py"
${FILE}cp861.py"
${FILE}cp862.py"
${FILE}cp863.py"
${FILE}cp864.py"
${FILE}cp865.py"
${FILE}cp866.py"
${FILE}cp869.py"
${FILE}cp874.py"
${FILE}cp875.py"
${FILE}cp932.py"
${FILE}cp949.py"
${FILE}cp950.py"
${FILE}euc_jisx0213.py"
${FILE}euc_jis_2004.py"
${FILE}euc_jp.py"
${FILE}euc_kr.py"
${FILE}gb18030.py"
${FILE}gb2312.py"
${FILE}gbk.py"
${FILE}hex_codec.py"
${FILE}hp_roman8.py"
${FILE}hz.py"
${FILE}idna.py"
${FILE}iso2022_jp.py"
${FILE}iso2022_jp_1.py"
${FILE}iso2022_jp_2.py"
${FILE}iso2022_jp_2004.py"
${FILE}iso2022_jp_3.py"
${FILE}iso2022_jp_ext.py"
${FILE}iso2022_kr.py"
${FILE}iso8859_1.py"
${FILE}iso8859_10.py"
${FILE}iso8859_11.py"
${FILE}iso8859_13.py"
${FILE}iso8859_14.py"
${FILE}iso8859_15.py"
${FILE}iso8859_16.py"
${FILE}iso8859_2.py"
${FILE}iso8859_3.py"
${FILE}iso8859_4.py"
${FILE}iso8859_5.py"
${FILE}iso8859_6.py"
${FILE}iso8859_7.py"
${FILE}iso8859_8.py"
${FILE}iso8859_9.py"
${FILE}johab.py"
${FILE}koi8_r.py"
${FILE}koi8_u.py"
${FILE}latin_1.py"
${FILE}mac_arabic.py"
${FILE}mac_centeuro.py"
${FILE}mac_croatian.py"
${FILE}mac_cyrillic.py"
${FILE}mac_farsi.py"
${FILE}mac_greek.py"
${FILE}mac_iceland.py"
${FILE}mac_latin2.py"
${FILE}mac_roman.py"
${FILE}mac_romanian.py"
${FILE}mac_turkish.py"
${FILE}mbcs.py"
${FILE}palmos.py"
${FILE}ptcp154.py"
${FILE}punycode.py"
${FILE}quopri_codec.py"
${FILE}raw_unicode_escape.py"
${FILE}rot_13.py"
${FILE}shift_jis.py"
${FILE}shift_jisx0213.py"
${FILE}shift_jis_2004.py"
${FILE}string_escape.py"
${FILE}tis_620.py"
${FILE}undefined.py"
${FILE}unicode_escape.py"
${FILE}unicode_internal.py"
${FILE}utf_16.py"
${FILE}utf_16_be.py"
${FILE}utf_16_le.py"
${FILE}utf_7.py"
${FILE}utf_8.py"
${FILE}utf_8_sig.py"
${FILE}uu_codec.py"
${FILE}zlib_codec.py"
${FILE}__init__.py"
!macroend
!macro FileListPythonLibLogging COMMAND DIRECTORY
${FILE}__init__.py"
${FILE}config.py"
${FILE}handlers.py"
!macroend
!macro FileListMetaFile2EPS COMMAND DIRECTORY
${FILE}metafile2eps.exe"

14
development/Win32/packaging/installer/setup/install.nsh
View File

@ -42,16 +42,14 @@ Section -ProgramFiles SecProgramFiles
# recursively copy all files under Resources
File /r "${FILES_LYX}\Resources"
# Components of Python
# Python
SetOutPath "$INSTDIR"
# recursively copy all files under Python
File /r "${FILES_PYTHON}"
# add MSVC runtimes
SetOutPath "$INSTDIR\python"
!insertmacro FileListPythonBin File "${FILES_PYTHON}\"
!insertmacro FileListMSVC File "${FILES_MSVC}\"
SetOutPath "$INSTDIR\python\Lib"
!insertmacro FileListPythonLib File "${FILES_PYTHON}\Lib\"
SetOutPath "$INSTDIR\python\Lib\encodings"
!insertmacro FileListPythonLibEncodings File "${FILES_PYTHON}\Lib\encodings\"
SetOutPath "$INSTDIR\python\Lib\logging"
!insertmacro FileListPythonLibLogging File "${FILES_PYTHON}\Lib\logging\"
# Compile all Pyton files to byte-code
# The user using the scripts may not have write access

16
development/Win32/packaging/installer/setup/uninstall.nsh
View File

@ -23,22 +23,12 @@ Section "un.Program Files" un.SecProgramFiles
!insertmacro FileListMetaFile2EPS Delete "$INSTDIR\bin\"
RMDir "$INSTDIR\bin"
# Resources
RMDir /r "$INSTDIR\Resources"
# Components of Python
!insertmacro FileListPythonLibEncodings Delete "$INSTDIR\python\Lib\encodings\"
Delete "$INSTDIR\python\Lib\encodings\*.pyc"
RMDir "$INSTDIR\python\Lib\encodings"
!insertmacro FileListPythonLibLogging Delete "$INSTDIR\python\Lib\logging\"
Delete "$INSTDIR\python\Lib\logging\*.pyc"
RMDir "$INSTDIR\python\Lib\logging"
!insertmacro FileListPythonLib Delete "$INSTDIR\python\Lib\"
Delete "$INSTDIR\python\Lib\*.pyc"
RMDir "$INSTDIR\python\Lib"
!insertmacro FileListPythonBin Delete "$INSTDIR\python\"
!insertmacro FileListMSVC Delete "$INSTDIR\python\"
RMDir "$INSTDIR\python"
# Python
RMDir /r "$INSTDIR\python"
# Components of ImageMagick
!insertmacro FileListImageMagick Delete "$INSTDIR\imagemagick\"