Changeset 2347

Show
Ignore:
Timestamp:
07/22/08 00:33:33 (2 months ago)
Author:
arj..@yirdis.nl
Message:

The win32 installer now contains its own set of libraries (the gtk+ installer is no longer used).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gaphor-win32-installer/trunk/config.nsi

    r2344 r2347  
    11 
    22!define LOGFILE "$INSTDIR\install.log" 
     3 
     4!define WIN32_LIBS "../gaphor-win32-libs" 
    35 
    46!define PYTHON_VERSION "${PYVERSION}${PYPATCH}" 

  • gaphor-win32-installer/trunk/gaphor-setup.nsi

    r2346 r2347  
    102102!include "detect.nsi" 
    103103!include "download.nsi" 
    104  
    105104 
    106105 
    …… 
    123122 
    124123Section "GTK+" SecGtk 
    125         DetailPrint "--- DOWNLOAD GTK+ ---" 
    126         !insertmacro downloadAndInstall "GTK+" ${GTK_URL} ${GTK_FN} "${GTK_CMD}" 
    127         Call DetectGTK 
    128         Pop $GTKOK 
    129         Pop $GTKPATH 
     124 
     125        SectionIn RO 
     126 
     127        DetailPrint "--- INSTALL GTK+ ---" 
     128;       !insertmacro downloadAndInstall "GTK+" ${GTK_URL} ${GTK_FN} "${GTK_CMD}";       Call DetectGTK 
     129;       Pop $GTKOK 
     130;       Pop $GTKPATH 
     131        SetOverwrite ifnewer 
     132        File /r /x .svn /x run-gaphor.bat /x README.txt /x lib\python24 ${WIN32_LIBS}\*.* 
     133        StrCpy $GTKOK 'OK' 
     134        StrCpy $GTKPATH $INSTDIR\bin 
    130135SectionEnd 
    131136 
    …… 
    214219 
    215220 
    216                 CreateShortCut "$INSTDIR\gaphor.lnk" "$PYPATH\Scripts\gaphor.exe" "" "$PYPATH\gaphor.ico" 
     221                SetOutPath $INSTDIR 
     222 
     223                File gaphor.bat 
     224 
     225                CreateShortCut "gaphor.lnk" "$INSTDIR\gaphor.bat" "" "$PYPATH\gaphor.ico" 
    217226 
    218227                WriteUninstaller "uninstall.exe"