2010-06-28    <guravage@caterpie.sen.cwi.nl>

	* canvas.cpp (gpl): move gpl3.txt back to the doc directory.

	* VirtualLeaf-install.nsi: Add VirtualLeaf doc directory.

2010-06-25    <guravage@caterpie.sen.cwi.nl>

	* gpl3.txt: Moved gpl3.txt from doc to src directory.

	* VirtualLeaf.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.

	* libplugin.pro: Ditto.

	* parameter.cpp: Result of adding datadir changes to make_parameter_source.pl.

	* parameter.h: Ditto.

	* output.h: Declared new function (AppendHomeDirIfPathRelative).

	* output.cpp (AppendHomeDirIfPathRelative): Added new function.

	* canvas.cpp (gpl): Moving gpl3.txt from doc to src obviates the need to docDir.cd("../doc").

	* VirtualLeaf-install.nsi: Grab gpl3.txt from src directory.

	Add missing libiconv/bin, libxml2bin and libz/bin directories.

	Copy libiconv-2.dll, libxml2.dll and zlib1.dll from relative paths.

	* VirtualLeaf.pro: copy gpl3.txt as part of QMAKE_POST_LINK.

2010-06-24    <guravage@caterpie.sen.cwi.nl>

	* libplugin.pro: Use correct library path.

	* VirtualLeaf.pro: Ditto.

	* VirtualLeaf.cpp (DrawCell): Iterate over NChem to construct info_string.

2010-06-23    <guravage@caterpie.sen.cwi.nl>

	* simitembase.cpp: Removed NULL assignments to unused variables.

	* VirtualLeaf.cpp: Ditto.

	* apoplastitem.cpp: Ditto.

	* canvas.cpp: Ditto.

	* cell.cpp: Ditto.

	* cellbase.h: Ditto.

	* forwardeuler.cpp: Ditto.

	* mainbase.h: Ditto.

	* nodeitem.cpp: Ditto.

	* qcanvasarrow.h: Ditto.

	* simitembase.cpp: Ditto.

  !insertmacro GetCleanDir "${DIRECTORY}"

  Pop $R2

  FindFirst $R0 $R1 "$R2*.*"

${Index_RemoveFilesAndSubDirs}-loop:

  StrCmp $R1 "" ${Index_RemoveFilesAndSubDirs}-done

  StrCmp $R1 "." ${Index_RemoveFilesAndSubDirs}-next

  StrCmp $R1 ".." ${Index_RemoveFilesAndSubDirs}-next

  IfFileExists "$R2$R1\*.*" ${Index_RemoveFilesAndSubDirs}-directory

  ; file

  Delete "$R2$R1"

  goto ${Index_RemoveFilesAndSubDirs}-next

${Index_RemoveFilesAndSubDirs}-directory:

  ; directory

  RMDir /r "$R2$R1"

${Index_RemoveFilesAndSubDirs}-next:

  FindNext $R0 $R1

  Goto ${Index_RemoveFilesAndSubDirs}-loop

${Index_RemoveFilesAndSubDirs}-done:

  FindClose $R0

  Pop $R2

  Pop $R1

  Pop $R0

  !undef Index_RemoveFilesAndSubDirs

!macroend

!define PRODUCT_NAME "The Virtual Leaf"

!define PRODUCT_VERSION "1.0"

!define PRODUCT_PUBLISHER "Center for Mathematics and Computer Science (CWI)"

!define PRODUCT_WEB_SITE "www.cwi.nl"

!define EXECUTABLE "VirtualLeaf.exe"

!define PROGICON "leaficon.ico"

!define SETUP_BITMAP "leaficon.ico"

# MUI 1.67 compatible ------

!include "MUI.nsh"

!include "EnvVarUpdate.nsh"

# MUI Settings

!define MUI_ABORTWARNING

!define MUI_ICON "leaficon.ico"

!define MUI_UNICON "leaficon.ico"

# Welcome page

!insertmacro MUI_PAGE_WELCOME

# License page

# Components page

!insertmacro MUI_PAGE_COMPONENTS

# Directory page

!insertmacro MUI_PAGE_DIRECTORY

# Instfiles page

!insertmacro MUI_PAGE_INSTFILES

# Finish page

!insertmacro MUI_PAGE_FINISH

# Uninstaller pages

!insertmacro MUI_UNPAGE_CONFIRM

!insertmacro MUI_UNPAGE_INSTFILES

!insertmacro MUI_UNPAGE_FINISH

# Language files

!insertmacro MUI_LANGUAGE "English"

# MUI end ------

# set the name of the installer

outfile "VirtualLeaf-install.exe"

Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"

ShowInstDetails show

ShowUnInstDetails show

# define the directory to install to

installDir C:\VirtualLeaf

# Request application privileges

RequestExecutionLevel user

section "Virtual Leaf executable"

  #sectionIn RO

  # define the output path for the Virtual Leaf executable

  setOutPath $INSTDIR

  writeUninstaller $INSTDIR\uninstaller.exe

  file ..\bin\VirtualLeaf.exe

  # Required DLLs

  setOutPath $INSTDIR\bin

  file ..\lib\libiconv\bin\libiconv-2.dll

  file ..\lib\libxml2\lib\libxml2.dll

  file ..\lib\libz\bin\zlib1.dll

  # Is the pegging of these DLLs to a specific QT version a problem?

  file C:\Qt\2010.02.1\mingw\bin\mingwm10.dll

  file C:\Qt\2010.02.1\mingw\bin\libgcc_s_dw2-1.dll

  file C:\Qt\2010.02.1\qt\bin\Qt3Support4.dll

  file C:\Qt\2010.02.1\qt\bin\QtCore4.dll

  file C:\Qt\2010.02.1\qt\bin\QtGui4.dll

  file C:\Qt\2010.02.1\qt\bin\QtNetwork4.dll

  file C:\Qt\2010.02.1\qt\bin\QtSql4.dll

  file C:\Qt\2010.02.1\qt\bin\QtXml4.dll

  # Prepend the Virtual Leaf bin directory to the installers PATH

  ${EnvVarUpdate} $0 "PATH" "P" "HKCU" "$INSTDIR\bin"  

sectionEnd

section "Virtual Leaf plugins"

  # define the output path for the Virtual Leaf models

  setOutPath $INSTDIR\models

  file ..\bin\models\*

sectionEnd

section "Virtual Leaf data"

  # define the output path for the Virtual Leaf models

  setOutPath $INSTDIR\leaves

  file ..\data\leaves\*

sectionEnd

  # define the output path for the Virtual Leaf documentation

  setOutPath $INSTDIR\doc

  file ..\doc\*

sectionEnd

# create a section to define what the uninstaller does.

# the section will always be named "Uninstall"

section "Uninstall"

  # Always delete uninstaller first

  delete $INSTDIR\uninstaller.exe

  # Now delete installed file

  !insertmacro RemoveFilesAndSubDirs "$INSTDIR"

  # Last but not least - delete the path  

  ${un.EnvVarUpdate} $0 "PATH" "R" "HKCU" "$INSTDIR\bin"

sectionEnd

# finis