Files @ 6bcb69712a0e
Branch filter:

Location: EI/VirtualLeaf/src/VirtualLeaf-install.nsi - annotation

Roeland Merks
In response to referee's comment:

"However, (although it is probably not important for model developers), I was
still unable to load the model ‘Meinhardt 1976 with growth’ example from the
‘Models’ drop down menu, I got the ‘Fatal error’ message ‘stepwise underflow in

rkqs, with h=0.000000 and htry = 0.100000’. The model did work when I selected
the Meinhardt model in both the Models and the File -> Read leaf menus together,
it would be preferable if the models loaded from the Models menu worked

automatically. I am not sure that the update referred to in the author’s
response permits the loading of ‘My First Model in Virtual Leaf’ from the
‘Models’ drop down menu; I only got a cell that wiggled."

I made the following changes:

- meinhardt_plugin now reads "meinhardt_init.xml" by default
- changed the name of 'My First Model in Virtual Leaf’ to '0: Empty model template (does nothing)' to make it clear that the wiggle cell is the intended behavior for this model example.
- Added default parameter files for Tutorial1A-D and Tutorial2 to prevent variable behavior depending on the last parameter settings used.


--
user: Roeland Merks <roeland.merks@cwi.nl>
branch 'default'
added data/leaves/tutorial1_init.xml
added data/leaves/tutorial2_init.xml
changed data/leaves/auxin_growth.xml
changed data/leaves/meinhardt_init.xml
changed src/TutorialCode/Tutorial0/tutorial0.cpp
changed src/TutorialCode/Tutorial1A/tutorial1A.h
changed src/TutorialCode/Tutorial1B/tutorial1B.h
changed src/TutorialCode/Tutorial1C/tutorial1C.h
changed src/TutorialCode/Tutorial1D/tutorial1D.h
changed src/TutorialCode/Tutorial2/tutorial2.h
changed src/build_models/meinhardtplugin.h
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74d0cd1b41e
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
03df53cdf78b
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
a74fb4a40466
41d0f8948f63
41d0f8948f63
a74fb4a40466
a74fb4a40466
a74fb4a40466
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
41d0f8948f63
a74fb4a40466
b2521b04d47d
41d0f8948f63
5469f4c56a53
fba32897839a
41d0f8948f63
a74d0cd1b41e
a74d0cd1b41e
a74d0cd1b41e
a74d0cd1b41e
caa535c40937
caa535c40937
caa535c40937
a74d0cd1b41e
caa535c40937
a74d0cd1b41e
a74d0cd1b41e
a74d0cd1b41e
a74d0cd1b41e
a74d0cd1b41e
a74d0cd1b41e
a74d0cd1b41e
a74d0cd1b41e
a74d0cd1b41e
a74d0cd1b41e
a74d0cd1b41e
a74d0cd1b41e
a74fb4a40466
41d0f8948f63
b2521b04d47d
41d0f8948f63
5469f4c56a53
41d0f8948f63
a74fb4a40466
41d0f8948f63
b2521b04d47d
b2521b04d47d
5469f4c56a53
b2521b04d47d
b2521b04d47d
b2521b04d47d
03df53cdf78b
6ce49db23eee
6ce49db23eee
6ce49db23eee
6ce49db23eee
6ce49db23eee
41d0f8948f63
41d0f8948f63
41d0f8948f63
a74fb4a40466
41d0f8948f63
41d0f8948f63
41d0f8948f63
a74d0cd1b41e
41d0f8948f63
41d0f8948f63
a74d0cd1b41e
a74d0cd1b41e
41d0f8948f63
a74d0cd1b41e
41d0f8948f63
# $Id$

# appends \ to the path if missing
# example: !insertmacro GetCleanDir "c:\blabla"
# Pop $0 => "c:\blabla\"
!macro GetCleanDir INPUTDIR
  ; ATTENTION: USE ON YOUR OWN RISK!
  ; Please report bugs here: http://stefan.bertels.org/
  !define Index_GetCleanDir 'GetCleanDir_Line${__LINE__}'
  Push $R0
  Push $R1
  StrCpy $R0 "${INPUTDIR}"
  StrCmp $R0 "" ${Index_GetCleanDir}-finish
  StrCpy $R1 "$R0" "" -1
  StrCmp "$R1" "\" ${Index_GetCleanDir}-finish
  StrCpy $R0 "$R0\"
${Index_GetCleanDir}-finish:
  Pop $R1
  Exch $R0
  !undef Index_GetCleanDir
!macroend
 
# similar to "RMDIR /r DIRECTORY", but does not remove DIRECTORY itself
# example: !insertmacro RemoveFilesAndSubDirs "$INSTDIR"
!macro RemoveFilesAndSubDirs DIRECTORY
  # ATTENTION: USE ON YOUR OWN RISK!
  # Please report bugs here: http://stefan.bertels.org/
  !define Index_RemoveFilesAndSubDirs 'RemoveFilesAndSubDirs_${__LINE__}'
 
  Push $R0
  Push $R1
  Push $R2
 
  !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
!insertmacro MUI_PAGE_LICENSE "..\doc\gpl3.txt"

# 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\bin
  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\bin\models
  file ..\bin\models\*
sectionEnd

section "Virtual Leaf data"
  # define the output path for the Virtual Leaf models
  setOutPath $INSTDIR\data\leaves
  file ..\data\leaves\*
sectionEnd

section "Virtual Leaf docs"
  # 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