Changeset 505


Ignore:
Timestamp:
03/02/10 22:34:16 (10 years ago)
Author:
beliar
Message:

Changed download-URL of ActivePython? to the correct one, included "/trunk/tools/map_editor" and made some other minor adjustments to the install script.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/game/packaging/windows_packaging.nsi

    r503 r505  
    2727!insertmacro MUI_PAGE_INSTFILES 
    2828; Finish page 
    29 !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.rtf" 
     29!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\game\README.txt" 
    3030!insertmacro MUI_PAGE_FINISH 
    3131 
     
    4949Section "PARPG" PARPG 
    5050  SectionIn RO 
    51   SetOutPath "$INSTDIR" 
     51  SetOutPath "$INSTDIR\game" 
    5252  SetOverwrite try 
    5353   
    5454  ;Get all the core PARPG files 
    55   FILE /r "${PARPG_DIR}\*ttf" 
     55  FILE /r "${PARPG_DIR}\*.ttf" 
    5656  FILE /r "${PARPG_DIR}\*.py" 
    5757  FILE /r "${PARPG_DIR}\*.yaml" 
     
    6565 
    6666  RENAME "settings-dist.xml" "settings.xml" 
    67   RENAME "README" "README.rtf" 
    68    
    69   CreateDirectory "$INSTDIR\saves"   
     67  RENAME "README" "README.txt" 
     68   
     69  CreateDirectory "$INSTDIR\game\saves"   
    7070   
    7171  SetAutoClose true 
     72SectionEnd 
     73 
     74Section -Tools 
     75  SetOutPath "$INSTDIR\tools\map_editor" 
     76  SetOverwrite try 
     77   
     78  FILE /r "${PARPG_DIR}\..\tools\map_editor\*.ttf" 
     79  FILE /r "${PARPG_DIR}\..\tools\map_editor\*.py" 
     80  FILE /r /x "settings.xml" "${PARPG_DIR}\..\tools\map_editor\*.xml" 
     81  FILE /r "${PARPG_DIR}\..\tools\map_editor\*.png" 
     82  FILE /r "${PARPG_DIR}\..\tools\map_editor\*.txt" 
     83  RENAME "settings-dist.xml" "settings.xml" 
     84   
    7285SectionEnd 
    7386 
     
    8093  CreateShortCut "$SMPROGRAMS\PARPG\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url" 
    8194  CreateShortCut "$SMPROGRAMS\PARPG\Uninstall.lnk" "$INSTDIR\uninstall.exe" 
    82   SetOutPath $INSTDIR ;this makes the following shortcut run in the installed directory 
    83   CreateShortCut "$SMPROGRAMS\PARPG\PARPG.lnk" "$INSTDIR\run.py" 
     95  SetOutPath "$INSTDIR\game" ;this makes the following shortcut run in the installed directory 
     96  CreateShortCut "$SMPROGRAMS\PARPG\PARPG.lnk" "$INSTDIR\game\run.py" 
     97  CreateShortCut "$SMPROGRAMS\PARPG\Editor.lnk" "$INSTDIR\game\parpg_editor.py" 
    8498SectionEnd 
    8599 
     
    110124   
    111125  ;Remove all the code 
    112   RMDir /r "$INSTDIR\dialogue" 
    113   RMDir /r "$INSTDIR\editor" 
    114   RMDir /r "$INSTDIR\fonts" 
    115   RMDir /r "$INSTDIR\gui" 
    116   RMDir /r "$INSTDIR\lib" 
    117   RMDir /r "$INSTDIR\local_loaders" 
    118   RMDir /r "$INSTDIR\maps" 
    119   RMDir /r "$INSTDIR\music" 
    120   RMDir /r "$INSTDIR\objects" 
    121   RMDir /r "$INSTDIR\quests" 
    122   RMDir /r "$INSTDIR\saves" 
    123   RMDir /r "$INSTDIR\scripts" 
    124   RMDir /r "$INSTDIR\tests" 
    125   RMDir /r "$INSTDIR\utilities" 
    126    
    127   Delete "$INSTDIR\dialogue_demo.py" 
    128   Delete "$INSTDIR\dialogue_schema.yaml" 
    129   Delete "$INSTDIR\PARPG" 
    130   Delete "$INSTDIR\parpg_editor.py" 
    131   Delete "$INSTDIR\run.py" 
    132   Delete "$INSTDIR\run_tests.py" 
    133   Delete "$INSTDIR\settings.py" 
    134   Delete "$INSTDIR\settings.xml" 
    135   Delete "$INSTDIR\README.rtf" 
    136   Delete "$INSTDIR\log_parpg.bat" 
     126  RMDir /r "$INSTDIR\game\dialogue" 
     127  RMDir /r "$INSTDIR\game\editor" 
     128  RMDir /r "$INSTDIR\game\fonts" 
     129  RMDir /r "$INSTDIR\game\gui" 
     130  RMDir /r "$INSTDIR\game\lib" 
     131  RMDir /r "$INSTDIR\game\local_loaders" 
     132  RMDir /r "$INSTDIR\game\maps" 
     133  RMDir /r "$INSTDIR\game\music" 
     134  RMDir /r "$INSTDIR\game\objects" 
     135  RMDir /r "$INSTDIR\game\quests" 
     136  RMDir "$INSTDIR\game\saves" ;Test if the directory will get deleted when it contains files. The expected behaviour is that it will not. 
     137  RMDir /r "$INSTDIR\game\scripts" 
     138  RMDir /r "$INSTDIR\game\tests" 
     139  RMDir /r "$INSTDIR\game\utilities" 
     140   
     141  Delete "$INSTDIR\game\dialogue_demo.py" 
     142  Delete "$INSTDIR\game\dialogue_schema.yaml" 
     143  Delete "$INSTDIR\game\PARPG" 
     144  Delete "$INSTDIR\game\parpg_editor.py" 
     145  Delete "$INSTDIR\game\run.py" 
     146  Delete "$INSTDIR\game\run_tests.py" 
     147  Delete "$INSTDIR\game\settings.py" 
     148  Delete "$INSTDIR\game\settings.xml" 
     149  Delete "$INSTDIR\game\README.txt" 
     150  Delete "$INSTDIR\game\log_parpg.bat" 
     151  Delete "$INSTDIR\game\*.log" 
     152  Delete "$INSTDIR\game\*.pyc" 
    137153  Delete "$INSTDIR\${PRODUCT_NAME}.url" 
    138154  Delete "$INSTDIR\uninstall.exe" 
     155  RMDir "$INSTDIR\game" 
     156  RMDir /r "$INSTDIR\tools" 
    139157   
    140158  RMDir "$INSTDIR" 
     
    153171 
    154172  DetailPrint "Downloading Python" 
    155   NSISdl::download http://downloads.activestate.com/ActivePython/windows/2.6/ActivePython-2.6.4.8-win32-x86.msi $TEMP/pysetup.msi 
     173  NSISdl::download http://downloads.activestate.com/ActivePython/releases/2.6.4.10/ActivePython-2.6.4.10-win32-x86.msi $TEMP/pysetup.msi 
    156174  Pop $R0 ;Get the return value 
    157175    StrCmp $R0 "success" +3 
     
    186204  ;File "requs\msvcr71.dll" 
    187205  ;SetOverwrite on 
    188    
    189206  NSISdl::download http://pyyaml.org/download/pyyaml/PyYAML-3.09.win32-py2.6.exe $TEMP\pyaml_setup.exe 
    190207  Pop $R0 ;Get the return value 
Note: See TracChangeset for help on using the changeset viewer.