Show
Ignore:
Timestamp:
08/21/08 03:23:29 (3 months ago)
Author:
arj..@yirdis.nl
Message:

fix issues with spaces in path names in Gaphor win32 installer.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2317 r2348  
    2929; Prefer the current user's installation of GTK, fall back to the local machine 
    3030 
    31 Function DetectGTK 
    32       ReadRegStr $R6 HKCU "SOFTWARE\GTK\2.0" "DllPath" 
    33       ${If} $R6 == '' 
    34               ReadRegStr $R6 HKLM "SOFTWARE\GTK\2.0" "DllPath" 
    35               ${If} $R6 == '' 
    36                       Push "No GTK registry key found" 
    37                       Push "NOK" 
    38                       Return 
    39               ${EndIf} 
    40       ${EndIf} 
    41  
    42       ${If} ${FileExists} "$R6\libgtk-win32-2.0-0.dll" 
    43               Push "$R6" 
    44               Push "OK" 
    45       ${Else} 
    46               Push "No libgtk-win32-2.0-0.dll found in'$R6'" 
    47               Push "NOK" 
    48       ${EndIf} 
    49 FunctionEnd 
     31;Function DetectGTK 
     32;     ReadRegStr $R6 HKCU "SOFTWARE\GTK\2.0" "DllPath" 
     33;     ${If} $R6 == '' 
     34;             ReadRegStr $R6 HKLM "SOFTWARE\GTK\2.0" "DllPath" 
     35;             ${If} $R6 == '' 
     36;                     Push "No GTK registry key found" 
     37;                     Push "NOK" 
     38;                     Return 
     39;             ${EndIf} 
     40;     ${EndIf} 
     41; 
     42;     ${If} ${FileExists} "$R6\libgtk-win32-2.0-0.dll" 
     43;             Push "$R6" 
     44;             Push "OK" 
     45;     ${Else} 
     46;             Push "No libgtk-win32-2.0-0.dll found in'$R6'" 
     47;             Push "NOK" 
     48;     ${EndIf} 
     49;FunctionEnd 
    5050 
    5151;-------------------------------------------------------------------- 
    5252; Are necessary PyGTK bits and pieces available? 
    5353 
    54 Function DetectPyGTK 
    55       ${If} ${FileExists} "$PYPATH\Lib\site-packages\gtk-2.0\gtk\__init__.py" 
    56               Push "OK" 
    57       ${Else} 
    58               Push "NOK" 
    59       ${EndIf} 
    60 FunctionEnd 
     54;Function DetectPyGTK 
     55;     ${If} ${FileExists} "$PYPATH\Lib\site-packages\gtk-2.0\gtk\__init__.py" 
     56;             Push "OK" 
     57;     ${Else} 
     58;             Push "NOK" 
     59;     ${EndIf} 
     60;FunctionEnd 
    6161 
    62 Function DetectPyCairo 
    63       ${If} ${FileExists} "$PYPATH\Lib\site-packages\cairo\__init__.py" 
    64               Push "OK" 
    65       ${Else} 
    66               Push "NOK" 
    67       ${EndIf} 
    68 FunctionEnd 
     62;Function DetectPyCairo 
     63;     ${If} ${FileExists} "$PYPATH\Lib\site-packages\cairo\__init__.py" 
     64;             Push "OK" 
     65;     ${Else} 
     66;             Push "NOK" 
     67;     ${EndIf} 
     68;FunctionEnd 
    6969 
    70 Function DetectPyGObject 
    71       ${If} ${FileExists} "$PYPATH\Lib\site-packages\gtk-2.0\gobject\__init__.py" 
    72               Push "OK" 
    73       ${Else} 
    74               Push "NOK" 
    75       ${EndIf} 
    76 FunctionEnd 
     70;Function DetectPyGObject 
     71;     ${If} ${FileExists} "$PYPATH\Lib\site-packages\gtk-2.0\gobject\__init__.py" 
     72;             Push "OK" 
     73;     ${Else} 
     74;             Push "NOK" 
     75;     ${EndIf} 
     76;FunctionEnd 
    7777 
    7878;-------------------------------------------------------------------- 

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

    r2347 r2348  
    7575Var /GLOBAL GTKOK 
    7676Var /GLOBAL GTKPATH 
    77 Var /GLOBAL PYGTKOK 
    78 Var /GLOBAL PYGOBJECTOK 
    79 Var /GLOBAL PYCAIROOK 
     77;Var /GLOBAL PYGTKOK 
     78;Var /GLOBAL PYGOBJECTOK 
     79;Var /GLOBAL PYCAIROOK 
    8080 
    8181Var /GLOBAL PATH 
    …… 
    136136 
    137137 
    138 Section "PyGobject" SecPyGobject 
    139       DetailPrint "--- DOWNLOAD PYGOBJECT ---" 
    140       ${If} $PYOK == 'OK' 
    141         !insertmacro downloadAndInstall "PyGObject" ${PYGOBJECT_URL} ${PYGOBJECT_FN} ${PYGOBJECT_CMD} 
    142         Call DetectPyGObject 
    143         Pop $PYGOBJECTOK 
    144         ${EndIf} 
    145 SectionEnd 
    146  
    147  
    148 Section "PyCairo" SecPyCairo 
    149       DetailPrint "--- DOWNLOAD PYCAIRO ---" 
    150       ${If} $PYOK == 'OK' 
    151         !insertmacro downloadAndInstall "PyCairo" ${PYCAIRO_URL} ${PYCAIRO_FN} ${PYCAIRO_CMD} 
    152         Call DetectPyCairo 
    153         Pop $PYCAIROOK 
    154         ${EndIf} 
    155 SectionEnd 
    156  
    157  
    158 Section "PyGtk" SecPyGtk 
    159       DetailPrint "--- DOWNLOAD PYGTK ---" 
    160       ${If} $PYOK == 'OK' 
    161         !insertmacro downloadAndInstall "PyGTK" ${PYGTK_URL} ${PYGTK_FN} ${PYGTK_CMD} 
    162         Call DetectPyGTK 
    163         Pop $PYGTKOK 
    164         ${EndIf} 
    165 SectionEnd 
     138;Section "PyGobject" SecPyGobject 
     139;     DetailPrint "--- DOWNLOAD PYGOBJECT ---" 
     140;     ${If} $PYOK == 'OK' 
     141;       !insertmacro downloadAndInstall "PyGObject" ${PYGOBJECT_URL} ${PYGOBJECT_FN} ${PYGOBJECT_CMD} 
     142;       Call DetectPyGObject 
     143;       Pop $PYGOBJECTOK 
     144;        ${EndIf} 
     145;SectionEnd 
     146 
     147 
     148;Section "PyCairo" SecPyCairo 
     149;     DetailPrint "--- DOWNLOAD PYCAIRO ---" 
     150;     ${If} $PYOK == 'OK' 
     151;       !insertmacro downloadAndInstall "PyCairo" ${PYCAIRO_URL} ${PYCAIRO_FN} ${PYCAIRO_CMD} 
     152;       Call DetectPyCairo 
     153;       Pop $PYCAIROOK 
     154;      ${EndIf} 
     155;SectionEnd 
     156 
     157 
     158;Section "PyGtk" SecPyGtk 
     159;     DetailPrint "--- DOWNLOAD PYGTK ---" 
     160;     ${If} $PYOK == 'OK' 
     161;       !insertmacro downloadAndInstall "PyGTK" ${PYGTK_URL} ${PYGTK_FN} ${PYGTK_CMD} 
     162;       Call DetectPyGTK 
     163;       Pop $PYGTKOK 
     164;      ${EndIf} 
     165;SectionEnd 
    166166 
    167167Section "Gaphor" SecGaphor 
    …… 
    174174        ${ElseIf} $GTKOK != 'OK' 
    175175                MessageBox MB_OK "PyGTK GUI cannot be installed, because GTK+ 2.x was not found on this system.$\nIf you do want to use the PyGTK GUI, please check the installation instructions$\n$\n(GTKPATH=$GTKPATH)" 
    176       ${ElseIf} $PYGTKOK != "OK" 
    177               MessageBox MB_OK "PyGTK GUI cannot be installed, because PyGTK was not found on this system.$\nPlease check the installation instructions.$\n$\n(PYPATH=$PYPATH)" 
    178       ${ElseIf} $PYCAIROOK != "OK" 
    179               MessageBox MB_OK "PyGTK GUI cannot be installed, because PyCairo was not found on this system.$\nPlease check the installation instructions.$\n$\n(PYPATH=$PYPATH)" 
    180       ${ElseIf} $PYGOBJECTOK != "OK" 
    181               MessageBox MB_OK "PyGTK GUI cannot be installed, because PyGObject was not found on this system.$\nPlease check the installation instructions.$\n$\n(PYPATH=$PYPATH)" 
     176;     ${ElseIf} $PYGTKOK != "OK" 
     177;             MessageBox MB_OK "PyGTK GUI cannot be installed, because PyGTK was not found on this system.$\nPlease check the installation instructions.$\n$\n(PYPATH=$PYPATH)" 
     178;     ${ElseIf} $PYCAIROOK != "OK" 
     179;             MessageBox MB_OK "PyGTK GUI cannot be installed, because PyCairo was not found on this system.$\nPlease check the installation instructions.$\n$\n(PYPATH=$PYPATH)" 
     180;     ${ElseIf} $PYGOBJECTOK != "OK" 
     181;             MessageBox MB_OK "PyGTK GUI cannot be installed, because PyGObject was not found on this system.$\nPlease check the installation instructions.$\n$\n(PYPATH=$PYPATH)" 
    182182        ${Else} 
    183183                ;MessageBox MB_OK "Python: $PYPATH, GTK: $GTKPATH" 
    …… 
    192192 
    193193                DetailPrint "Installing setuptools..." 
    194                 ExecWait "$PYPATH\python.exe $PYPATH\ez_setup.py" $0 
     194                ExecWait "$\"$PYPATH\python.exe$\" $\"$PYPATH\ez_setup.py$\"" $0 
    195195                DetailPrint "Return code: $0" 
    196196 
    …… 
    201201 
    202202                DetailPrint "Installing zope.interface..." 
    203                 ExecWait "$PYPATH\Scripts\easy_install.exe zope.interface==3.3.0" 
     203                ExecWait "$\"$PYPATH\Scripts\easy_install.exe$\" zope.interface==3.3.0" 
    204204                DetailPrint "Return code: $0" 
    205205 
    …… 
    210210 
    211211                DetailPrint "Installing gaphor..." 
    212                 ExecWait "$PYPATH\Scripts\easy_install.exe gaphor==${VERSION}" 
     212                ExecWait "$\"$PYPATH\Scripts\easy_install.exe$\" gaphor==${VERSION}" 
    213213                DetailPrint "Return code: $0" 
    214214 
    …… 
    255255        Pop $PYPATH 
    256256         
    257         Call DetectGTK 
    258         Pop $GTKOK 
    259         Pop $GTKPATH 
     257        ;Call DetectGTK 
     258        ;Pop $GTKOK 
     259        ;Pop $GTKPATH 
    260260 
    261261        ;Call DetectGlade 
    …… 
    263263        ;Pop $GLADEPATH  
    264264         
    265         Call DetectPyGTK 
    266         Pop $PYGTKOK 
    267  
    268         Call DetectPyGObject 
    269         Pop $PYGOBJECTOK 
    270  
    271         Call DetectPyCairo 
    272         Pop $PYCAIROOK 
     265        ;Call DetectPyGTK 
     266        ;Pop $PYGTKOK 
     267 
     268        ;Call DetectPyGObject 
     269        ;Pop $PYGOBJECTOK 
     270 
     271        ;Call DetectPyCairo 
     272        ;Pop $PYCAIROOK 
    273273         
    274         StrCpy $PATH "$DEFAULTPATH;$PYPATH;$GTKPATH" 
     274        ;StrCpy $PATH "$DEFAULTPATH;$PYPATH;$GTKPATH" 
     275        StrCpy $PATH "$DEFAULTPATH;$PYPATH" 
    275276 
    276277        ${If} $PYOK == "OK" 
    277278                !insertMacro UnselectSection ${SecPython} 
    278279        ${EndIf} 
    279         ${If} $GTKOK == "OK" 
    280               !insertMacro UnselectSection ${SecGtk} 
    281         ${EndIf} 
    282         ${If} $PYGTKOK == "OK" 
    283               !insertMacro UnselectSection ${SecPyGtk} 
    284         ${EndIf} 
    285         ${If} $PYGOBJECTOK == "OK" 
    286               !insertMacro UnselectSection ${SecPyGobject} 
    287         ${EndIf} 
    288         ${If} $PYCAIROOK == "OK" 
    289               !insertMacro UnselectSection ${SecPyCairo} 
    290         ${EndIf} 
     280        ;${If} $GTKOK == "OK" 
     281        ;     !insertMacro UnselectSection ${SecGtk} 
     282        ;${EndIf} 
     283        ;${If} $PYGTKOK == "OK" 
     284        ;     !insertMacro UnselectSection ${SecPyGtk} 
     285        ;${EndIf} 
     286        ;${If} $PYGOBJECTOK == "OK" 
     287        ;     !insertMacro UnselectSection ${SecPyGobject} 
     288        ;${EndIf} 
     289        ;${If} $PYCAIROOK == "OK" 
     290        ;     !insertMacro UnselectSection ${SecPyCairo} 
     291        ;${EndIf} 
    291292FunctionEnd 
    292293