EI/VirtualLeaf Changeset - 32ba6ee9c7d9 · Centrum Wiskunde & Informatica (CWI)

Changeset - 32ba6ee9c7d9

Parent rev.

Child rev.

[Not reviewed]

default

0 14 10

Michael Guravage - 15 years ago 2010-06-23 15:06:19
michael.guravage@cwi.nl

Corrected windows library path problem. Added -f Makefile to every make invocation.

--
user: Michael Guravage <michael.guravage@cwi.nl>
branch 'default'
added src/TutorialCode/ChangeLog
added src/TutorialCode/Tutorial0/ChangeLog
added src/TutorialCode/Tutorial1A/ChangeLog
added src/TutorialCode/Tutorial1B/ChangeLog
added src/TutorialCode/Tutorial1C/ChangeLog
added src/TutorialCode/Tutorial1D/ChangeLog
added src/TutorialCode/Tutorial2/ChangeLog
added src/TutorialCode/Tutorial3/ChangeLog
added src/TutorialCode/Tutorial4/ChangeLog
added src/TutorialCode/Tutorial5/ChangeLog
changed doc/installation.pdf
changed doc/installation.rst
changed src/ChangeLog
changed src/Makefile
changed src/TutorialCode/Makefile
changed src/TutorialCode/Tutorial0/tutorial0.pro
changed src/TutorialCode/Tutorial1A/tutorial1A.pro
changed src/TutorialCode/Tutorial1B/tutorial1B.pro
changed src/TutorialCode/Tutorial1C/tutorial1C.pro
changed src/TutorialCode/Tutorial1D/tutorial1D.pro
changed src/TutorialCode/Tutorial2/tutorial2.pro
changed src/TutorialCode/Tutorial3/tutorial3.pro
changed src/TutorialCode/Tutorial4/tutorial4.pro
changed src/TutorialCode/Tutorial5/tutorial5.pro

24 files changed with 270 insertions and 119 deletions:

doc/installation.pdf

151

doc/installation.rst

src/ChangeLog

src/Makefile

src/TutorialCode/ChangeLog

src/TutorialCode/Makefile

src/TutorialCode/Tutorial0/ChangeLog

src/TutorialCode/Tutorial0/tutorial0.pro

src/TutorialCode/Tutorial1A/ChangeLog

src/TutorialCode/Tutorial1A/tutorial1A.pro

src/TutorialCode/Tutorial1B/ChangeLog

src/TutorialCode/Tutorial1B/tutorial1B.pro

src/TutorialCode/Tutorial1C/ChangeLog

src/TutorialCode/Tutorial1C/tutorial1C.pro

src/TutorialCode/Tutorial1D/ChangeLog

src/TutorialCode/Tutorial1D/tutorial1D.pro

src/TutorialCode/Tutorial2/ChangeLog

src/TutorialCode/Tutorial2/tutorial2.pro

src/TutorialCode/Tutorial3/ChangeLog

src/TutorialCode/Tutorial3/tutorial3.pro

src/TutorialCode/Tutorial4/ChangeLog

src/TutorialCode/Tutorial4/tutorial4.pro

src/TutorialCode/Tutorial5/ChangeLog

src/TutorialCode/Tutorial5/tutorial5.pro

0 comments (0 inline, 0 general)

doc/installation.pdf

➞

Show inline comments

@@ @@ -6,7 +6,7 @@ 1 0 obj @@
 << /F1 2 0 R
  /F2 3 0 R
  /F3 5 0 R
- /F4 6 0 R >>
+ /F4 7 0 R >>
 endobj
 % 'F1': class PDFType1Font
 0 obj
@@ @@ -50,17 +50,8 @@ 5 0 obj @@
  /Subtype /Type1
  /Type /Font >>
 endobj
-% 'F4': class PDFType1Font
+% 'Page1': class PDFPage
 0 obj
 % Font Helvetica-Oblique
 << /BaseFont /Helvetica-Oblique
  /Encoding /WinAnsiEncoding
  /Name /F4
  /Subtype /Type1
  /Type /Font >>
 endobj
 % 'Page1': class PDFPage
 0 obj
 % Page dictionary
 << /Annots [ 4 0 R ]
  /Contents 18 0 R
@@ @@ -79,6 +70,15 @@ 7 0 obj @@
  /Trans <<  >>
  /Type /Page >>
 endobj
 % 'F4': class PDFType1Font
 0 obj
 % Font Helvetica-Oblique
 << /BaseFont /Helvetica-Oblique
  /Encoding /WinAnsiEncoding
  /Name /F4
  /Subtype /Type1
  /Type /Font >>
 endobj
 % 'Page2': class PDFPage
 0 obj
 % Page dictionary
@@ @@ -110,7 +110,7 @@ endobj @@
 % 'R10': class PDFInfo
 0 obj
 << /Author ()
- /CreationDate (D:20100623123520-01'00')
+ /CreationDate (D:20100623150545-01'00')
  /Keywords ()
  /Producer (ReportLab http://www.reportlab.com)
  /Subject (\(unspecified\))
@@ @@ -125,7 +125,7 @@ 11 0 obj @@
 endobj
 % 'Outline.0': class OutlineEntryObject
 0 obj
-<< /Dest [ 7 0 R
+<< /Dest [ 6 0 R
  /XYZ
 .69291
 .0236
@@ @@ -136,7 +136,7 @@ 12 0 obj @@
 endobj
 % 'Outline.1': class OutlineEntryObject
 0 obj
-<< /Dest [ 7 0 R
+<< /Dest [ 6 0 R
  /XYZ
 .69291
 .0236
@@ @@ -148,7 +148,7 @@ 13 0 obj @@
 endobj
 % 'Outline.2': class OutlineEntryObject
 0 obj
-<< /Dest [ 7 0 R
+<< /Dest [ 6 0 R
  /XYZ
 .69291
 .0236
@@ @@ -160,10 +160,10 @@ 14 0 obj @@
 endobj
 % 'Outline.3': class OutlineEntryObject
 0 obj
-<< /Dest [ 7 0 R
+<< /Dest [ 6 0 R
  /XYZ
 .69291
-.4236
+.2236
 ]
  /Next 16 0 R
  /Parent 11 0 R
@@ @@ -175,7 +175,7 @@ 16 0 obj @@
 << /Dest [ 8 0 R
  /XYZ
 .69291
-.8236
+.8236
 ]
  /Parent 11 0 R
  /Prev 15 0 R
@@ @@ -185,14 +185,14 @@ endobj @@
 0 obj
 % page tree
 << /Count 2
- /Kids [ 7 0 R
+ /Kids [ 6 0 R
 0 R ]
  /Type /Pages >>
 endobj
 % 'R18': class PDFStream
 0 obj
 % page stream
-<< /Length 6935 >>
+<< /Length 6382 >>
 stream
 0 0 1 0 0 cm BT /F1 12 Tf 14.4 TL ET
+q
@@ @@ -235,11 +235,38 @@ Q @@
+q
 0 0 1 62.69291 468.0236 cm
+q
 0 0 rg
 BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Open the terminal window and unpack the VirtualLeaf source package into your home folder, by typing:) Tj T* ET
+Q
+Q
+q
 0 0 1 62.69291 422.8236 cm
+q
+q
 0 0 1 0 0 cm
+q
 0 0 1 6.6 6.6 cm
+q
 .662745 .662745 .662745 RG
 .5 w
 .960784 .960784 .862745 rg
 n -6 -6 468.6898 36 re B*
+Q
+q
 BT 1 0 0 1 0 17.71 Tm 12 TL /F3 10 Tf 0 0 0 rg (>) Tj ( cd) Tj T* (>) Tj ( tar xzf VirtualLeaf-V1.0.tgz) Tj T* ET
+Q
+Q
+Q
+Q
+Q
+q
 0 0 1 62.69291 402.8236 cm
+q
 BT 1 0 0 1 0 4.82 Tm 12 TL /F1 10 Tf 0 0 0 rg (So the Makefiles can find ) Tj /F3 10 Tf (qmake) Tj /F1 10 Tf (, prepend the QT bin directory to your execution path, for example:) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 434.8236 cm
+0 0 1 62.69291 369.6236 cm
+q
+q
 0 0 1 0 0 cm
@@ @@ -259,13 +286,13 @@ Q @@
+Q
+Q
+q
-0 0 1 62.69291 402.8236 cm
+0 0 1 62.69291 337.6236 cm
+q
 BT 1 0 0 1 0 16.82 Tm 1.09936 Tw 12 TL /F1 10 Tf 0 0 0 rg (If you wish to use some other ) Tj /F3 10 Tf (make ) Tj /F1 10 Tf (or ) Tj /F3 10 Tf (qmake ) Tj /F1 10 Tf (utilities other than the defaults, instantiate environment) Tj T* 0 Tw (variables named ) Tj /F3 10 Tf (MAKE ) Tj /F1 10 Tf (and ) Tj /F3 10 Tf (QMAKE) Tj /F1 10 Tf (, for example:) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 357.6236 cm
+0 0 1 62.69291 292.4236 cm
+q
+q
 0 0 1 0 0 cm
@@ @@ -285,13 +312,13 @@ Q @@
+Q
+Q
+q
-0 0 1 62.69291 337.6236 cm
+0 0 1 62.69291 272.4236 cm
+q
 BT 1 0 0 1 0 4.82 Tm 12 TL /F1 10 Tf 0 0 0 rg (To compile the VirtualLeaf, go to the VirtualLeaf ) Tj /F3 10 Tf (src ) Tj /F1 10 Tf (directory and invoke ) Tj /F3 10 Tf (make) Tj /F1 10 Tf (, for example:) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 292.4236 cm
+0 0 1 62.69291 227.2236 cm
+q
+q
 0 0 1 0 0 cm
@@ @@ -304,40 +331,34 @@ q @@
 n -6 -6 468.6898 36 re B*
+Q
+q
 BT 1 0 0 1 0 17.71 Tm 12 TL /F3 10 Tf 0 0 0 rg (>) Tj ( cd /home/michael/VirtualLeaf/v1.0/src) Tj T* (>) Tj ( make) Tj T* ET
+BT 1 0 0 1 0 17.71 Tm 12 TL /F3 10 Tf 0 0 0 rg (>) Tj ( cd /home/michael/VirtualLeaf/v1.0/src) Tj T* (>) Tj ( make -f Makefile) Tj T* ET
+Q
+Q
+Q
+Q
+Q
+q
-0 0 1 62.69291 260.4236 cm
+0 0 1 62.69291 195.2236 cm
+q
 BT 1 0 0 1 0 16.82 Tm .059985 Tw 12 TL /F1 10 Tf 0 0 0 rg (Once the compilation is complete, you will find the ) Tj /F3 10 Tf (VirtualLeaf ) Tj /F1 10 Tf (binary in ) Tj /F3 10 Tf (v1.0/bin ) Tj /F1 10 Tf (and the plugins in) Tj T* 0 Tw /F3 10 Tf (v1.0/bin/models) Tj /F1 10 Tf (.) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 227.4236 cm
+0 0 1 62.69291 162.2236 cm
+q
 BT 1 0 0 1 0 8.435 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (Windows) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 173.4236 cm
+0 0 1 62.69291 132.2236 cm
+q
-BT 1 0 0 1 0 40.82 Tm 3.219979 Tw 12 TL /F1 10 Tf 0 0 0 rg (For convenience sake, three required development libraries: ) Tj /F3 10 Tf (libiconv) Tj /F1 10 Tf (, ) Tj /F3 10 Tf (libxml2 ) Tj /F1 10 Tf (and ) Tj /F3 10 Tf (libz ) Tj /F1 10 Tf (are) Tj T* 0 Tw .387318 Tw (distributed with the VirtualLeaf code, and the VirtualLeaf will compile correctly with them. If, however, you) Tj T* 0 Tw .590651 Tw (wish to use other versions of these libraries, you will need to reassign the ) Tj /F3 10 Tf (LIBICONVDIR) Tj /F1 10 Tf (, ) Tj /F3 10 Tf (LIBZML2DIR) Tj T* 0 Tw /F1 10 Tf (and ) Tj /F3 10 Tf (LIBZDIR ) Tj /F1 10 Tf (variables in all the project files.) Tj T* ET
+BT 1 0 0 1 0 16.82 Tm 1.165318 Tw 12 TL /F1 10 Tf 0 0 0 rg (Unpack the VirtualLeaf source package somewhere in your folder hierarchy. The result might be in, for) Tj T* 0 Tw (example: ) Tj /F3 10 Tf (c:\\Documents and Settings\\michael\\VirtualLeaf\\v1.0) Tj /F1 10 Tf (.) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 131.4236 cm
+0 0 1 62.69291 90.22362 cm
+q
 BT 1 0 0 1 0 28.82 Tm 3.513555 Tw 12 TL /F1 10 Tf 0 0 0 rg (As stated earlier, the Makefiles rely on two environment variables: ) Tj /F3 10 Tf (MAKE ) Tj /F1 10 Tf (and ) Tj /F3 10 Tf (QMAKE) Tj /F1 10 Tf (. Since QT) Tj T* 0 Tw 1.479147 Tw (executable names are consistent across platforms, the ) Tj /F3 10 Tf (QMAKE ) Tj /F1 10 Tf (default value, ) Tj /F3 10 Tf (QMAKE=qmake) Tj /F1 10 Tf (, will work) Tj T* 0 Tw (fine. You will have to create an environment named ) Tj /F3 10 Tf (MAKE ) Tj /F1 10 Tf (though.) Tj T* ET
+Q
+Q
+q
 0 0 1 62.69291 89.42362 cm
+q
 BT 1 0 0 1 0 28.82 Tm .928488 Tw 12 TL /F1 10 Tf 0 0 0 rg (To add an environment variable call up the ) Tj /F4 10 Tf (system tool) Tj /F1 10 Tf (, either with a left click on the ) Tj /F4 10 Tf (start menu ) Tj /F1 10 Tf (then a ) Tj T* 0 Tw .439986 Tw (right click on ) Tj /F4 10 Tf (My Computer ) Tj /F1 10 Tf (and choosing ) Tj /F4 10 Tf (properties ) Tj /F1 10 Tf (from the drop down list, or by choosing ) Tj /F4 10 Tf (control panel ) Tj T* 0 Tw .069988 Tw /F1 10 Tf (from the ) Tj /F4 10 Tf (start menu ) Tj /F1 10 Tf (and then double clicking on the ) Tj /F4 10 Tf (system tool ) Tj /F1 10 Tf (itself. Once in the ) Tj /F4 10 Tf (system tool) Tj /F1 10 Tf (, choose the) Tj T* 0 Tw ET
 BT 1 0 0 1 0 28.82 Tm 3.219979 Tw 12 TL /F1 10 Tf 0 0 0 rg (For convenience sake, three required development libraries: ) Tj /F3 10 Tf (libiconv) Tj /F1 10 Tf (, ) Tj /F3 10 Tf (libxml2 ) Tj /F1 10 Tf (and ) Tj /F3 10 Tf (libz ) Tj /F1 10 Tf (are ) Tj T* 0 Tw .387318 Tw (distributed with the VirtualLeaf code, and the VirtualLeaf will compile correctly with them. If, however, you ) Tj T* 0 Tw .590651 Tw (wish to use other versions of these libraries, you will need to reassign the ) Tj /F3 10 Tf (LIBICONVDIR) Tj /F1 10 Tf (, ) Tj /F3 10 Tf (LIBZML2DIR) Tj T* 0 Tw ET
+Q
+Q
+q
@@ @@ -360,23 +381,35 @@ endobj @@
 % 'R19': class PDFStream
 0 obj
 % page stream
-<< /Length 2509 >>
+<< /Length 5804 >>
 stream
 0 0 1 0 0 cm BT /F1 12 Tf 14.4 TL ET
+q
-0 0 1 62.69291 705.0236 cm
+0 0 1 62.69291 741.0236 cm
+q
-BT 1 0 0 1 0 40.82 Tm .052651 Tw 12 TL /F4 10 Tf 0 0 0 rg (advanced ) Tj /F1 10 Tf (tab and then click the ) Tj /F4 10 Tf (environment variables ) Tj /F1 10 Tf (button. The environment variables screen is split in) Tj T* 0 Tw .503735 Tw (two with ) Tj /F4 10 Tf (User ) Tj /F1 10 Tf (variables above and ) Tj /F4 10 Tf (System ) Tj /F1 10 Tf (variables below. Add a new users variable named ) Tj /F3 10 Tf (Make ) Tj /F1 10 Tf (with) Tj T* 0 Tw .939213 Tw (the value, e.g. ) Tj /F3 10 Tf (mingw32-make) Tj /F1 10 Tf (. the QT\(SDK\) contains the ) Tj /F4 10 Tf (minimum gnu for windows ) Tj /F1 10 Tf (\(mingw\) compiler;) Tj T* 0 Tw (commonly installed in: ) Tj /F3 10 Tf (c:\\QT\\qt-version\\mingw\\bin) Tj /F1 10 Tf (. Look there for the make utility name.) Tj T* ET
+BT 1 0 0 1 0 4.82 Tm 12 TL /F1 10 Tf 0 0 0 rg (and ) Tj /F3 10 Tf (LIBZDIR ) Tj /F1 10 Tf (variables in all the project files.) Tj T* ET
+Q
+Q
+q
 0 0 1 62.69291 651.0236 cm
 0 0 1 62.69291 699.0236 cm
+q
 BT 1 0 0 1 0 28.82 Tm 3.513555 Tw 12 TL /F1 10 Tf 0 0 0 rg (As stated earlier, the Makefiles rely on two environment variables: ) Tj /F3 10 Tf (MAKE ) Tj /F1 10 Tf (and ) Tj /F3 10 Tf (QMAKE) Tj /F1 10 Tf (. Since QT) Tj T* 0 Tw 1.479147 Tw (executable names are consistent across platforms, the ) Tj /F3 10 Tf (QMAKE ) Tj /F1 10 Tf (default value, ) Tj /F3 10 Tf (QMAKE=qmake) Tj /F1 10 Tf (, will work) Tj T* 0 Tw (fine. You will have to create an environment named ) Tj /F3 10 Tf (MAKE ) Tj /F1 10 Tf (though.) Tj T* ET
+Q
+Q
+q
 0 0 1 62.69291 609.0236 cm
+q
 BT 1 0 0 1 0 76.82 Tm .928488 Tw 12 TL /F1 10 Tf 0 0 0 rg (To add an environment variable call up the ) Tj /F4 10 Tf (system tool) Tj /F1 10 Tf (, either with a left click on the ) Tj /F4 10 Tf (start menu ) Tj /F1 10 Tf (then a) Tj T* 0 Tw .439986 Tw (right click on ) Tj /F4 10 Tf (My Computer ) Tj /F1 10 Tf (and choosing ) Tj /F4 10 Tf (properties ) Tj /F1 10 Tf (from the drop down list, or by choosing ) Tj /F4 10 Tf (control panel) Tj T* 0 Tw .069988 Tw /F1 10 Tf (from the ) Tj /F4 10 Tf (start menu ) Tj /F1 10 Tf (and then double clicking on the ) Tj /F4 10 Tf (system tool ) Tj /F1 10 Tf (itself. Once in the ) Tj /F4 10 Tf (system tool) Tj /F1 10 Tf (, choose the) Tj T* 0 Tw .052651 Tw /F4 10 Tf (advanced ) Tj /F1 10 Tf (tab and then click the ) Tj /F4 10 Tf (environment variables ) Tj /F1 10 Tf (button. The environment variables screen is split in) Tj T* 0 Tw .503735 Tw (two with ) Tj /F4 10 Tf (User ) Tj /F1 10 Tf (variables above and ) Tj /F4 10 Tf (System ) Tj /F1 10 Tf (variables below. Add a new users variable named ) Tj /F3 10 Tf (MAKE ) Tj /F1 10 Tf (with) Tj T* 0 Tw .939213 Tw (the value, e.g. ) Tj /F3 10 Tf (mingw32-make) Tj /F1 10 Tf (. the QT\(SDK\) contains the ) Tj /F4 10 Tf (minimum gnu for windows ) Tj /F1 10 Tf (\(mingw\) compiler;) Tj T* 0 Tw (commonly installed in: ) Tj /F3 10 Tf (c:\\QT\\qt-version\\mingw\\bin) Tj /F1 10 Tf (. Look there for the ) Tj /F3 10 Tf (MAKE ) Tj /F1 10 Tf (utility name.) Tj T* ET
+Q
+Q
+q
 0 0 1 62.69291 555.0236 cm
+q
 BT 1 0 0 1 0 40.82 Tm 2.446235 Tw 12 TL /F1 10 Tf 0 0 0 rg (After installing QT and setting the ) Tj /F3 10 Tf (MAKE ) Tj /F1 10 Tf (environment variable, you should be able to invoke a QT) Tj T* 0 Tw .648651 Tw (command window from the ) Tj /F4 10 Tf (start menu) Tj /F1 10 Tf (. This shell automatically includes the necessary QT folder in your) Tj T* 0 Tw 1.380651 Tw (execution PATH. Within this command window, go to the VirtualLeaf ) Tj /F3 10 Tf (src ) Tj /F1 10 Tf (folder and invoke make, for) Tj T* 0 Tw (example:) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 605.8236 cm
+0 0 1 62.69291 509.8236 cm
+q
+q
 0 0 1 0 0 cm
@@ @@ -389,25 +422,89 @@ q @@
 n -6 -6 468.6898 36 re B*
+Q
+q
 BT 1 0 0 1 0 17.71 Tm 12 TL /F3 10 Tf 0 0 0 rg (>) Tj ( c:\\Documents and Settings\\michael\\VirtualLeaf\\v1.0\\src) Tj T* (>) Tj ( mingw32-make) Tj T* ET
+BT 1 0 0 1 0 17.71 Tm 12 TL /F3 10 Tf 0 0 0 rg (>) Tj ( c:\\Documents and Settings\\michael\\VirtualLeaf\\v1.0\\src) Tj T* (>) Tj ( mingw32-make -f Makefile) Tj T* ET
+Q
+Q
+Q
+Q
+Q
+q
-0 0 1 62.69291 573.8236 cm
+0 0 1 62.69291 477.8236 cm
+q
 BT 1 0 0 1 0 16.82 Tm 4.213059 Tw 12 TL /F1 10 Tf 0 0 0 rg (When complete, you will find the ) Tj /F3 10 Tf (VirtualLeaf.exe ) Tj /F1 10 Tf (binary in ) Tj /F3 10 Tf (v1.0/bin ) Tj /F1 10 Tf (and the plugins in) Tj T* 0 Tw /F3 10 Tf (v1.0/bin/models) Tj /F1 10 Tf (.) Tj T* ET
+Q
+Q
+q
-0 0 1 62.69291 540.8236 cm
+0 0 1 62.69291 444.8236 cm
+q
 BT 1 0 0 1 0 8.435 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (MacOS) Tj T* ET
+Q
+Q
+q
 0 0 1 62.69291 414.8236 cm
+q
 BT 1 0 0 1 0 16.82 Tm .918443 Tw 12 TL /F1 10 Tf 0 0 0 rg (Make sure that XCode development environment is installed from the MacOSX installations DVDs. Also) Tj T* 0 Tw (download and install a recent version of Qt as described above \(version >) Tj (4.4\).) Tj T* ET
+Q
+Q
+q
 0 0 1 62.69291 384.8236 cm
+q
 BT 1 0 0 1 0 16.82 Tm .297976 Tw 12 TL /F1 10 Tf 0 0 0 rg (Open the Terminal program \(in ) Tj /F3 10 Tf (/Applications/Utilities/) Tj /F1 10 Tf (\). Unpack the VirtualLeaf source package) Tj T* 0 Tw (into your home folder, by typing:) Tj T* ET
+Q
+Q
+q
 0 0 1 62.69291 339.6236 cm
+q
+q
 0 0 1 0 0 cm
+q
 0 0 1 6.6 6.6 cm
+q
 .662745 .662745 .662745 RG
 .5 w
 .960784 .960784 .862745 rg
 n -6 -6 468.6898 36 re B*
+Q
+q
 BT 1 0 0 1 0 17.71 Tm 12 TL /F3 10 Tf 0 0 0 rg (>) Tj ( cd) Tj T* (>) Tj ( tar xzf VirtualLeaf-V1.0.tgz) Tj T* ET
+Q
+Q
+Q
+Q
+Q
+q
 0 0 1 62.69291 307.6236 cm
+q
 BT 1 0 0 1 0 16.82 Tm .469987 Tw 12 TL /F1 10 Tf 0 0 0 rg (Now go to the VirtualLeaf ) Tj /F3 10 Tf (src ) Tj /F1 10 Tf (directory, set the right options for qmake, and invoke make, by typing, for) Tj T* 0 Tw (example:) Tj T* ET
+Q
+Q
+q
 0 0 1 62.69291 250.4236 cm
+q
+q
 0 0 1 0 0 cm
+q
 0 0 1 6.6 6.6 cm
+q
 .662745 .662745 .662745 RG
 .5 w
 .960784 .960784 .862745 rg
 n -6 -6 468.6898 48 re B*
+Q
+q
 BT 1 0 0 1 0 29.71 Tm 12 TL /F3 10 Tf 0 0 0 rg (>) Tj ( cd) Tj T* (>) Tj ( cd VirtualLeaf/v1.0/src) Tj T* (>) Tj ( export QMAKESPEC=macx-g++; make -f Makefile) Tj T* ET
+Q
+Q
+Q
+Q
+Q
+q
 0 0 1 62.69291 218.4236 cm
+q
 BT 1 0 0 1 0 16.82 Tm 6.059213 Tw 12 TL /F1 10 Tf 0 0 0 rg (When complete, you will find the ) Tj /F3 10 Tf (VirtualLeaf ) Tj /F1 10 Tf (binary in ) Tj /F3 10 Tf (v1.0/bin ) Tj /F1 10 Tf (and the plugins in) Tj T* 0 Tw /F3 10 Tf (v1.0/bin/models) Tj /F1 10 Tf (.) Tj T* ET
+Q
+Q
+q
 0 0 1 56.69291 773.1969 cm
+q
 BT 1 0 0 1 0 4.82 Tm 160.0749 0 Td 12 TL /F1 10 Tf 0 0 0 rg (Installation Instructions - 2010-06-23) Tj T* -160.0749 0 Td ET
@@ @@ -452,8 +549,8 @@ 0000000245 00000 n @@
 0000000410 00000 n
 0000000597 00000 n
 0000000841 00000 n
 0000001002 00000 n
 0000001181 00000 n
 0000001000 00000 n
 0000001301 00000 n
 0000001480 00000 n
 0000001759 00000 n
 0000001917 00000 n
@@ @@ -465,18 +562,18 @@ 0000002819 00000 n @@
 0000003001 00000 n
 0000003150 00000 n
 0000003265 00000 n
 0000010301 00000 n
 0000012915 00000 n
 0000013021 00000 n
 0000013098 00000 n
 0000009748 00000 n
 0000015657 00000 n
 0000015763 00000 n
 0000015840 00000 n
 trailer
 << /ID
  % ReportLab generated PDF document -- digest (http://www.reportlab.com)
- [(\247u5\225Y\035H\257\370\345\300\201\313\031U0) (\247u5\225Y\035H\257\370\345\300\201\313\031U0)]
+ [(\361i\357\326\223\205\376 cX\3301\266\222\010\004) (\361i\357\326\223\205\376 cX\3301\266\222\010\004)]
  /Info 10 0 R
  /Root 9 0 R
  /Size 23 >>
 startxref
 %%EOF

doc/installation.rst

➞

Show inline comments

@@ @@ -44,6 +44,13 @@ respectively. The fallback defaults are @@
 Linux
 -----
 Open the terminal window and unpack the VirtualLeaf source package
 into your home folder, by typing::
  > cd
  > tar xzf VirtualLeaf-V1.0.tgz
 So the Makefiles can find ``qmake``, prepend the QT bin directory to
 your execution path, for example::
@@ @@ -60,7 +67,7 @@ To compile the VirtualLeaf, go to the Vi @@
 and invoke ``make``, for example::
  > cd /home/michael/VirtualLeaf/v1.0/src
  > make
+ > make -f Makefile
 Once the compilation is complete, you will find the ``VirtualLeaf``
 binary in ``v1.0/bin`` and the plugins in ``v1.0/bin/models``.
@@ @@ -69,6 +76,10 @@ binary in ``v1.0/bin`` and the plugins i @@
 Windows
 -------
 Unpack the VirtualLeaf source package somewhere in your folder
 hierarchy. The result might be in, for example: ``c:\Documents and
 Settings\michael\VirtualLeaf\v1.0``.
 For convenience sake, three required development libraries:
 ``libiconv``, ``libxml2`` and ``libz`` are distributed with the
 VirtualLeaf code, and the VirtualLeaf will compile correctly with
@@ @@ -82,17 +93,18 @@ across platforms, the ``QMAKE`` default @@
 work fine. You will have to create an environment named ``MAKE``
 though.
 To add an environment variable call up the *system tool*, either with a
 left click on the *start menu* then a right click on *My Computer* and
 choosing *properties* from the drop down list, or by choosing *control
 panel* from the *start menu* and then double clicking on the *system
 tool* itself. Once in the *system tool*, choose the *advanced* tab and
 then click the *environment variables* button. The environment
 variables screen is split in two with *User* variables above and *System*
 variables below. Add a new users variable named ``Make`` with the
 value, e.g. ``mingw32-make``. the QT(SDK) contains the *minimum gnu
 for windows* (mingw) compiler; commonly installed in:
 ``c:\QT\qt-version\mingw\bin``. Look there for the make utility name.
 To add an environment variable call up the *system tool*, either with
 a left click on the *start menu* then a right click on *My Computer*
 and choosing *properties* from the drop down list, or by choosing
 *control panel* from the *start menu* and then double clicking on the
 *system tool* itself. Once in the *system tool*, choose the *advanced*
 tab and then click the *environment variables* button. The environment
 variables screen is split in two with *User* variables above and
 *System* variables below. Add a new users variable named ``MAKE`` with
 the value, e.g. ``mingw32-make``. the QT(SDK) contains the *minimum
 gnu for windows* (mingw) compiler; commonly installed in:
 ``c:\QT\qt-version\mingw\bin``. Look there for the ``MAKE`` utility
 name.
 After installing QT and setting the ``MAKE`` environment variable, you
 should be able to invoke a QT command window from the *start
@@ @@ -101,7 +113,7 @@ your execution PATH. Within this command @@
 ``src`` folder and invoke make, for example::
  > c:\Documents and Settings\michael\VirtualLeaf\v1.0\src
  > mingw32-make
+ > mingw32-make -f Makefile
 When complete, you will find the ``VirtualLeaf.exe`` binary in
 ``v1.0/bin`` and the plugins in ``v1.0/bin/models``.
@@ @@ -121,12 +133,12 @@ by typing:: @@
  > cd
  > tar xzf VirtualLeaf-V1.0.tgz
 Now go to the ``src`` directory, set the right options for qmake,
+Now go to the VirtualLeaf ``src`` directory, set the right options for qmake,
 and invoke make, by typing, for example::
  > cd
  > cd VirtualLeaf/v1.0/src
  > export QMAKESPEC=macx-g++; make
+ > export QMAKESPEC=macx-g++; make -f Makefile
 When complete, you will find the ``VirtualLeaf`` binary in
 ``v1.0/bin`` and the plugins in ``v1.0/bin/models``.

src/ChangeLog

➞

Show inline comments

 -06-23    <guravage@caterpie.sen.cwi.nl>
 	* Makefile (clean): Add -f Makefile argument to each make invocation.
 	* VirtualLeaf-install.nsi: New gpl license text.
 	* VirtualLeaf.pro: Disabled console mode.

src/Makefile

➞

Show inline comments

@@ @@ -28,17 +28,17 @@ Makefile.libplugin: libplugin.pro @@
 	$(QMAKE) -makefile -o $@ $<
 plugins:
 	$(MAKE) -C build_models
+	$(MAKE) -C build_models -f Makefile
 tutorials:
 	$(MAKE) -C build_models
 	$(MAKE) -C TutorialCode
 	$(MAKE) -C build_models -f Makefile
 	$(MAKE) -C TutorialCode -f Makefile
 clean:
 	$(MAKE) -f Makefile.libplugin clean
 	$(MAKE) -f Makefile.VirtualLeaf clean
 	$(MAKE) -C build_models clean
 	$(MAKE) -C TutorialCode clean
 	$(MAKE) -C build_models -f Makefile clean
 	$(MAKE) -C TutorialCode -f Makefile clean
 ifeq ($(MAKE),make)
 	touch VirtualLeaf.pro
 	touch libplugin.pro

src/TutorialCode/ChangeLog

➞

Show inline comments

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

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

src/TutorialCode/Makefile

➞

Show inline comments

@@ @@ -11,41 +11,41 @@ endif @@
 all: tutorial_0 tutorial_1A tutorial_1B tutorial_1C tutorial_1D tutorial_2 tutorial_3 tutorial_4 tutorial_5
 tutorial_0:
 	$(MAKE) -C Tutorial0
+	$(MAKE) -C Tutorial0 -f Makefile
 tutorial_1A:
 	$(MAKE) -C Tutorial1A
+	$(MAKE) -C Tutorial1A -f Makefile
 tutorial_1B:
 	$(MAKE) -C Tutorial1B
+	$(MAKE) -C Tutorial1B -f Makefile
 tutorial_1C:
 	$(MAKE) -C Tutorial1C
+	$(MAKE) -C Tutorial1C -f Makefile
 tutorial_1D:
 	$(MAKE) -C Tutorial1D
+	$(MAKE) -C Tutorial1D -f Makefile
 tutorial_2:
 	$(MAKE) -C Tutorial2
+	$(MAKE) -C Tutorial2 -f Makefile
 tutorial_3:
 	$(MAKE) -C Tutorial3
+	$(MAKE) -C Tutorial3 -f Makefile
 tutorial_4:
 	$(MAKE) -C Tutorial4
+	$(MAKE) -C Tutorial4 -f Makefile
 tutorial_5:
 	$(MAKE) -C Tutorial5
+	$(MAKE) -C Tutorial5 -f Makefile
 clean:
 	$(MAKE) -C Tutorial0  clean
 	$(MAKE) -C Tutorial1A clean
 	$(MAKE) -C Tutorial1B clean
 	$(MAKE) -C Tutorial1C clean
 	$(MAKE) -C Tutorial1D clean
 	$(MAKE) -C Tutorial2  clean
 	$(MAKE) -C Tutorial3  clean
 	$(MAKE) -C Tutorial4  clean
 	$(MAKE) -C Tutorial5  clean
 	$(MAKE) -C Tutorial0  -f Makefile clean
 	$(MAKE) -C Tutorial1A -f Makefile clean
 	$(MAKE) -C Tutorial1B -f Makefile clean
 	$(MAKE) -C Tutorial1C -f Makefile clean
 	$(MAKE) -C Tutorial1D -f Makefile clean
 	$(MAKE) -C Tutorial2  -f Makefile clean
 	$(MAKE) -C Tutorial3  -f Makefile clean
 	$(MAKE) -C Tutorial4  -f Makefile clean
 	$(MAKE) -C Tutorial5  -f Makefile clean
 # finis

src/TutorialCode/Tutorial0/ChangeLog

➞

Show inline comments

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

		* tutorial0.pro: Corrected windows library paths.

src/TutorialCode/Tutorial0/tutorial0.pro

➞

Show inline comments

@@ @@ -49,9 +49,9 @@ unix { @@
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBICONVDIR = C:\libiconv
  LIBZDIR = C:\libz
  LIBXML2DIR = $${LIBDIR}\libxml2
  LIBICONVDIR = $${LIBDIR}\libiconv
  LIBZDIR = $${LIBDIR}\libz
  LIBS += -L$${LIBDIR} -lvleaf
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include

src/TutorialCode/Tutorial1A/ChangeLog

➞

Show inline comments

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

		* tutorial1A.pro: corrected windows library path.

src/TutorialCode/Tutorial1A/tutorial1A.pro

➞

Show inline comments

@@ @@ -49,9 +49,9 @@ unix { @@
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBICONVDIR = C:\libiconv
  LIBZDIR = C:\libz
  LIBXML2DIR = $${LIBDIR}\libxml2
  LIBICONVDIR = $${LIBDIR}\libiconv
  LIBZDIR = $${LIBDIR}\libz
  LIBS += -L$${LIBDIR} -lvleaf
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include

src/TutorialCode/Tutorial1B/ChangeLog

➞

Show inline comments

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

		* tutorial1B.pro: Corrected windows library path.

src/TutorialCode/Tutorial1B/tutorial1B.pro

➞

Show inline comments

@@ @@ -49,9 +49,9 @@ unix { @@
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBICONVDIR = C:\libiconv
  LIBZDIR = C:\libz
  LIBXML2DIR = $${LIBDIR}\libxml2
  LIBICONVDIR = $${LIBDIR}\libiconv
  LIBZDIR = $${LIBDIR}\libz
  LIBS += -L$${LIBDIR} -lvleaf
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include

src/TutorialCode/Tutorial1C/ChangeLog

➞

Show inline comments

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

		* tutorial1C.pro: Corrected windows library path.

src/TutorialCode/Tutorial1C/tutorial1C.pro

➞

Show inline comments

@@ @@ -49,9 +49,9 @@ unix { @@
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBICONVDIR = C:\libiconv
  LIBZDIR = C:\libz
  LIBXML2DIR = $${LIBDIR}\libxml2
  LIBICONVDIR = $${LIBDIR}\libiconv
  LIBZDIR = $${LIBDIR}\libz
  LIBS += -L$${LIBDIR} -lvleaf
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include

src/TutorialCode/Tutorial1D/ChangeLog

➞

Show inline comments

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

		* tutorial1D.pro: Corrected windows library path.

src/TutorialCode/Tutorial1D/tutorial1D.pro

➞

Show inline comments

@@ @@ -49,9 +49,9 @@ unix { @@
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBICONVDIR = C:\libiconv
  LIBZDIR = C:\libz
  LIBXML2DIR = $${LIBDIR}\libxml2
  LIBICONVDIR = $${LIBDIR}\libiconv
  LIBZDIR = $${LIBDIR}\libz
  LIBS += -L$${LIBDIR} -lvleaf
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include

src/TutorialCode/Tutorial2/ChangeLog

➞

Show inline comments

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

		* tutorial2.pro: Corrected windows library path.

src/TutorialCode/Tutorial2/tutorial2.pro

➞

Show inline comments

@@ @@ -49,9 +49,9 @@ unix { @@
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBICONVDIR = C:\libiconv
  LIBZDIR = C:\libz
  LIBXML2DIR = $${LIBDIR}\libxml2
  LIBICONVDIR = $${LIBDIR}\libiconv
  LIBZDIR = $${LIBDIR}\libz
  LIBS += -L$${LIBDIR} -lvleaf
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include

src/TutorialCode/Tutorial3/ChangeLog

➞

Show inline comments

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

		* tutorial3.pro: Corrected windows library path.

src/TutorialCode/Tutorial3/tutorial3.pro

➞

Show inline comments

@@ @@ -49,9 +49,9 @@ unix { @@
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBICONVDIR = C:\libiconv
  LIBZDIR = C:\libz
  LIBXML2DIR = $${LIBDIR}\libxml2
  LIBICONVDIR = $${LIBDIR}\libiconv
  LIBZDIR = $${LIBDIR}\libz
  LIBS += -L$${LIBDIR} -lvleaf
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include

src/TutorialCode/Tutorial4/ChangeLog

➞

Show inline comments

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

		* tutorial4.pro: Corrected windows library path.

src/TutorialCode/Tutorial4/tutorial4.pro

➞

Show inline comments

@@ @@ -49,9 +49,9 @@ unix { @@
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBICONVDIR = C:\libiconv
  LIBZDIR = C:\libz
  LIBXML2DIR = $${LIBDIR}\libxml2
  LIBICONVDIR = $${LIBDIR}\libiconv
  LIBZDIR = $${LIBDIR}\libz
  LIBS += -L$${LIBDIR} -lvleaf
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include

src/TutorialCode/Tutorial5/ChangeLog

➞

Show inline comments

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

		* tutorial5.pro: Corrected windows library path.

src/TutorialCode/Tutorial5/tutorial5.pro

➞

Show inline comments

@@ @@ -49,9 +49,9 @@ unix { @@
+}
 win32 {
  LIBXML2DIR = C:\libxml2
  LIBICONVDIR = C:\libiconv
  LIBZDIR = C:\libz
  LIBXML2DIR = $${LIBDIR}\libxml2
  LIBICONVDIR = $${LIBDIR}\libiconv
  LIBZDIR = $${LIBDIR}\libz
  LIBS += -L$${LIBDIR} -lvleaf
  QMAKE_CXXFLAGS += -DLIBXML_STATIC
  QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include

0 comments (0 inline, 0 general)