ViewVC logotype

Diff of /trunk/nsis/detect.nsi

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2606 by jpye, Tue Apr 24 06:14:23 2012 UTC revision 2607 by jpye, Tue Apr 24 23:16:19 2012 UTC
# Line 35  FunctionEnd Line 35  FunctionEnd
36  Function DetectGTK  Function DetectGTK
37  !ifdef INST64  !ifdef INST64
38      ${If} ${RunningX64}      SetRegView 64
39  !endif  !endif  
40        ; Search in the registry in the first instance
41        ReadRegStr $R6 HKLM "SOFTWARE\GTK+-${GTK_VER}" "InstallDir"
42        ${If} $R6 == ''
43            ; If not found in the registory, look in ${GTKSEARCHPATH}
44            ;MessageBox MB_OK "No GTK found in HKLM"
45          ${If} ${FileExists} "${GTKSEARCHPATH}\manifest\${GTK_MFT}"          ${If} ${FileExists} "${GTKSEARCHPATH}\manifest\${GTK_MFT}"
46                  MessageBox MB_OK "GTK OK in ${GTKSEARCHPATH}\manifest"                  ;MessageBox MB_OK "GTK OK in ${GTKSEARCHPATH}\manifest"
47                  StrCpy $GTKPATH "${GTKSEARCHPATH}\bin"                  StrCpy $GTKPATH "${GTKSEARCHPATH}\bin"
48                  StrCpy $HAVE_GTK "OK"                  StrCpy $HAVE_GTK "OK"
49                  Return                  Return
50          ${EndIf}          ${EndIf}
51  !ifdef INST64      ${Else}
52            ; Found in the registry. Check for the GTK DLL, but don't insist
53            ; on exactly matching manifest ID in this case.
54            ${If} ${FileExists} "$R6\bin\libgtk-win32-2.0-0.dll"
55                ;MessageBox MB_OK "GTK OK in $R6 (from registry)"
56                StrCpy $GTKPATH "$R6\bin"
57                StrCpy $HAVE_GTK "OK"
58                Return
59            ${EndIf}
60      ${EndIf}      ${EndIf}
61  !endif      ;MessageBox MB_OK "Failed to locate GTK (searched registry\nand also ${GTKSEARCHPATH})"
62      MessageBox MB_OK "Expected to find ${GTK_MFT} in ${GTKSEARCHPATH}\manifest"      StrCpy $GTKPATH "GTK not found in registry or ${GTKSEARCHPATH}"
     StrCpy $GTKPATH "gtk+-bundle manifest not found in ${GTKSEARCHPATH}\manifest"  
63      StrCpy $HAVE_GTK "NOK"      StrCpy $HAVE_GTK "NOK"
64  FunctionEnd  FunctionEnd
# Line 58  Function DetectPyGTK Line 70  Function DetectPyGTK
70      ${If} ${FileExists} "$PYPATH\Lib\site-packages\gtk-2.0\gtk\__init__.py"      ${If} ${FileExists} "$PYPATH\Lib\site-packages\gtk-2.0\gtk\__init__.py"
71          StrCpy $HAVE_PYGTK "OK"          StrCpy $HAVE_PYGTK "OK"
72      ${Else}      ${Else}
73          MessageBox MB_OK "No PyGTK in $PYPATH"                ;MessageBox MB_OK "No PyGTK in $PYPATH"    
74          StrCpy $HAVE_PYGTK "NOK"          StrCpy $HAVE_PYGTK "NOK"
75      ${EndIf}      ${EndIf}
76  FunctionEnd  FunctionEnd
# Line 67  Function DetectPyCairo Line 79  Function DetectPyCairo
79      ${If} ${FileExists} "$PYPATH\Lib\site-packages\cairo\__init__.py"      ${If} ${FileExists} "$PYPATH\Lib\site-packages\cairo\__init__.py"
80          StrCpy $HAVE_PYCAIRO "OK"          StrCpy $HAVE_PYCAIRO "OK"
81      ${Else}      ${Else}
82          MessageBox MB_OK "No PyCairo in $PYPATH"                  ;MessageBox MB_OK "No PyCairo in $PYPATH"      
83          StrCpy $HAVE_PYCAIRO "NOK"          StrCpy $HAVE_PYCAIRO "NOK"
84      ${EndIf}      ${EndIf}
85  FunctionEnd  FunctionEnd
# Line 76  Function DetectPyGObject Line 88  Function DetectPyGObject
88      ${If} ${FileExists} "$PYPATH\Lib\site-packages\gtk-2.0\gobject\__init__.py"      ${If} ${FileExists} "$PYPATH\Lib\site-packages\gtk-2.0\gobject\__init__.py"
89          StrCpy $HAVE_PYGOBJECT "OK"          StrCpy $HAVE_PYGOBJECT "OK"
90      ${Else}      ${Else}
91          MessageBox MB_OK "No PyGObject in $PYPATH"                ;MessageBox MB_OK "No PyGObject in $PYPATH"    
92          StrCpy $HAVE_PYGOBJECT "NOK"          StrCpy $HAVE_PYGOBJECT "NOK"
93      ${EndIf}      ${EndIf}
94  FunctionEnd  FunctionEnd

Removed from v.2606  
changed lines
  Added in v.2607

ViewVC Help
Powered by ViewVC 1.1.22