Changeset 2344

Timestamp:

07/21/08 03:30:02 (4 months ago)

Author:

arj..@yirdis.nl

Message:

fixed some issues in installer

Files:

• gaphor-win32-installer/trunk/config.nsi (modified) (1 diff)
• gaphor-win32-installer/trunk/download.nsi (modified) (1 diff)
• gaphor-win32-installer/trunk/gaphor-setup.nsi (modified) (5 diffs)

gaphor-win32-installer/trunk/config.nsi

@@ +1 @@
+
+!define LOGFILE "$INSTDIR\install.log"
-
-!define PYTHON_VERSION "${PYVERSION}${PYPATCH}"
-!define PYTHON_FN "python-${PYTHON_VERSION}.msi"
-!define PYTHON_URL "http://www.python.org/ftp/python/${PYTHON_VERSION}/${PYTHON_FN}"
-
+/l*+ $\"${LOGFILE}$\" 
-
-!define GTK_FN "gtk-2.12.9-win32-2.exe"

gaphor-win32-installer/trunk/download.nsi

@@ -23 +23 @@
-                MessageBox MB_OK "${DAI_NAME} download cancelled."
-                Push 2
+                Abort
-        ${Else}
-                MessageBox MB_OK "Download failed: $DAI_RET"

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

@@ -48 +48 @@
-
-  !define MUI_ABORTWARNING
+  !define MUI_CUSTOMFUNCTION_ABORT "GaphorAbort"
-
-;--------------------------------
@@ -77 +78 @@
-Var /GLOBAL PYGOBJECTOK
-Var /GLOBAL PYCAIROOK
-;Var /GLOBAL PYINSTALLED
-
-Var /GLOBAL PATH
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-!include "config.nsi"
-!include "detect.nsi"
-;!include "dependencies.nsi"
-!include "download.nsi"
-
@@ -98 +107 @@
-;--------------------------------
-;Installer Sections
-
-
-; download and install dependencies first
@@ -107 +115 @@
-        Pop $PYOK
-        Pop $PYPATH
-== 'N
+!= '
-          MessageBox MB_OK "Python installation appears to have failed"
+          
-        ${EndIf}
-SectionEnd
@@ -156 +165 @@
-
-        ; Check the dependencies of the PyGTK GUI before proceding...
-== 'N
+!= '
-                MessageBox MB_OK "PyGTK GUI can not be installed, because Python was not found on this system.$\nIf you do want to use the PyGTK GUI, please check the installation instructions$\n$\n(PYPATH=$PYPATH)"
-== 'N
+!= '
-                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)"
-== "N
+!= "
-                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)"
-== "N
+!= "
-                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)"
-== "N
+!= "
-                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)"
-        ${Else}