Changeset - 013687d51a1d
[Not reviewed]
default
0 2 19
Michael Guravage - 15 years ago 2010-06-25 17:14:18
michael.guravage@cwi.nl
Added missing libxml2 and libz bin directories; caused by my overzealous .hgignore file.

--
user: Michael Guravage <michael.guravage@cwi.nl>
branch 'default'
added lib/libxml2/bin/runsuite.exe
added lib/libxml2/bin/runtest.exe
added lib/libxml2/bin/testAutomata.exe
added lib/libxml2/bin/testC14N.exe
added lib/libxml2/bin/testHTML.exe
added lib/libxml2/bin/testModule.exe
added lib/libxml2/bin/testReader.exe
added lib/libxml2/bin/testRegexp.exe
added lib/libxml2/bin/testRelax.exe
added lib/libxml2/bin/testSAX.exe
added lib/libxml2/bin/testSchemas.exe
added lib/libxml2/bin/testThreadsWin32.exe
added lib/libxml2/bin/testURI.exe
added lib/libxml2/bin/testXPath.exe
added lib/libxml2/bin/testapi.exe
added lib/libxml2/bin/xmlcatalog.exe
added lib/libxml2/bin/xmllint.exe
added lib/libz/bin/libz-1.dll
added lib/libz/bin/zlib1.dll
changed src/ChangeLog
changed src/VirtualLeaf-install.nsi
21 files changed with 4 insertions and 2 deletions:
0 comments (0 inline, 0 general)
lib/libxml2/bin/runsuite.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libxml2/bin/runtest.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libxml2/bin/testAutomata.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libxml2/bin/testC14N.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libxml2/bin/testHTML.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libxml2/bin/testModule.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libxml2/bin/testReader.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libxml2/bin/testRegexp.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libxml2/bin/testRelax.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libxml2/bin/testSAX.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libxml2/bin/testSchemas.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libxml2/bin/testThreadsWin32.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libxml2/bin/testURI.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libxml2/bin/testXPath.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libxml2/bin/testapi.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libxml2/bin/xmlcatalog.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libxml2/bin/xmllint.exe
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libz/bin/libz-1.dll
Show inline comments
 
new file 100755
 
binary diff not shown
lib/libz/bin/zlib1.dll
Show inline comments
 
new file 100755
 
binary diff not shown
src/ChangeLog
Show inline comments
 
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: Add missing libiconv/bin directory.
 
	* 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.
 

	
 

	
 
	* Makefile (clean): Add -f Makefile argument to each make invocation.
 

	
 
	* VirtualLeaf-install.nsi: New gpl license text.
 

	
 
	* VirtualLeaf.pro: Disabled console mode.
 

	
 
	* mesh.cpp (Clear): Added parentheses to qDebug statments.
 
	(TestIllegalWalls): Replaced qDebug().
 

	
 
	* canvas.cpp (mouseReleaseEvent): Replaced qDebug() with cerr since qDebug complains about *node_set.
 

	
 
	* wall.cpp (CorrectWall): Rplaced gDebug() with cerr in transform call and when printing *this.
 

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

	
 
	* Makefile (tutorials): Add tutorials target.
 

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

	
 
	* parameter.cpp: Added particular reassignment of datadir.
 

	
 
	* canvas.cpp (gpl): Added GPL3 License text. Display detail text only if the source text file exists.
src/VirtualLeaf-install.nsi
Show inline comments
 
@@ -33,97 +33,97 @@
 
 
 
  !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"
 
!insertmacro MUI_PAGE_LICENSE "..\src\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
 
  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
0 comments (0 inline, 0 general)