diff --git a/README.cygwin b/README.cygwin
index 613bbdcbb22230c84b953b6392d9ba97836fb71c..74e5dcc680b2f65d5b7849cbe8cb7e4496c832b6 100644
--- a/README.cygwin
+++ b/README.cygwin
@@ -15,19 +15,19 @@ Cygwin setup
Start the Cygwin setup utility (see below), it will refresh your
installed Cygwin packages to the newest versions.
- If Cygwin is not installed yet:
-
+
(A) Download and execute the latest cygwin installer utility,
please use the 64-bit version installer:
https://cygwin.com/setup-x86_64.exe
-
+
(B) Select Install from Internet (recommended to save local disk space)
(C) Choose Cygwin installation root directory (C:\cygwin is recommended)
Select All Users, or Just Me.
-
+
(D) Select "Local Package Directory" (typically the same directory,
where the setup....exe Cygwin installer utility is stored).
-
+
(E) Use Internet Explorer Proxy Settings (recommended).
(F) Select a download mirror site.
@@ -41,35 +41,35 @@ Cygwin setup
Note: Cygwin installer will automatically select the packages the
manually selected ones are depending on; do NOT deselect
any automatically selected package!
- a) Test execution ONLY (command line or from Eclipse Executor):
- Base: <all packages> (Default setting of the installer)
- Net: openssl
- Tcl: expect
- b) Test case development: in addition to the above select the
- following packages:
- Devel: binutils
- Devel: gcc-g++
- Devel: make
- Libs: libxml2-devel
- Net: openssl-devel (automatically installs Net:openssl
- as well, if selected)
+ a) Test execution ONLY (command line or from Eclipse Executor):
+ Base: <all packages> (Default setting of the installer)
+ Net: openssl
+ Tcl: expect
+ b) Test case development: in addition to the above select the
+ following packages:
+ Devel: binutils
+ Devel: gcc-g++
+ Devel: make
+ Libs: libxml2-devel
+ Net: openssl-devel (automatically installs Net:openssl
+ as well, if selected)
c) To compile your own Titan Cygwin binary: in addition to the
above, select the following packages:
- Devel: bison
- Devel: ctags
- Devel: cygwin32-expat
- Devel: diffstat
- Devel: flex
- Devel: gcc-core
- Editors: <any editor of your preference> (optional)
- Libs: libncurses-devel
- Libs: libreadline-devel
-
- If, after selecting the required packages and clicking on the
- "Next" button, a "Resolving Dependcies" window lists further
- required packages, ensure that the "Select required packages
- (RECOMMENDED)" checkbox is checked and click the "Next" button.
-
+ Devel: bison
+ Devel: ctags
+ Devel: cygwin32-expat
+ Devel: diffstat
+ Devel: flex
+ Devel: gcc-core
+ Editors: <any editor of your preference> (optional)
+ Libs: libncurses-devel
+ Libs: libreadline-devel
+
+ If, after selecting the required packages and clicking on the
+ "Next" button, a "Resolving Dependcies" window lists further
+ required packages, ensure that the "Select required packages
+ (RECOMMENDED)" checkbox is checked and click the "Next" button.
+
(H) Select the Create icon on Desktop checkbox
(I) (Optional)
@@ -92,38 +92,40 @@ Cygwin setup
"/cygdrive/c/Users/<yourUserId>/Documents/My_Home"
WARNING: The path of your "unix" home directory shall not contain
any space!
- (I1) If you are working with Titan plugins for Eclipse or any Windows based program
- using cygwin commands, insert the Windows equivalent path of cygwin folders "/bin" or/and "/usr/bin"
- into the Windows environment variable "Path". For example if the cygwin root is "C:\cygwin64" then
- Path should contain "C:\cygwin64\bin;C:\cygwin64\usr\bin".
+
+ (I1)If you are working with Titan plugins for Eclipse or any Windows based program
+ using cygwin commands, insert the Windows equivalent path of cygwin folders "/bin" or/and "/usr/bin"
+ into the Windows environment variable "Path". For example if the cygwin root is "C:\cygwin64" then
+ Path should contain "C:\cygwin64\bin;C:\cygwin64\usr\bin".
+
(J) Using the binary Titan package: download the Titan package for from
GitHub. Unpack the Titan package into a folder of your choice.
Note: It is not a requirement, but is a kind of best practice to
place Titan into a subfolder within your "unix" home directory.
Edit the <your cygwin installation directory>/home/<yourUserId>/.bashrc
- file. Add these lines to it:
- export PATH=${TTCN3_DIR}/bin:${PATH}
- export LD_LIBRARY_PATH=${TTCN3_DIR}/lib:${LD_LIBRARY_PATH}
+ file. Add these lines to it:
+ export PATH=${TTCN3_DIR}/bin:${PATH}
+ export LD_LIBRARY_PATH=${TTCN3_DIR}/lib:${LD_LIBRARY_PATH}
(K) Compile Titan with Cygwin:
- Get the latest source code from GitHub.
- Download and install JDK from Oracle's download site:
- http://www.oracle.com/technetwork/java/javase/downloads/index.html
- Edit the <your cygwin installation directory>/home/<yourUserId>/.bashrc
- as above.
- Create titan/Makefile.personal with the following content:
- TTCN3_DIR := /home/<user id>/git/titan/Install
+ Get the latest source code from GitHub.
+ Download and install JDK from Oracle's download site:
+ http://www.oracle.com/technetwork/java/javase/downloads/index.html
+ Edit the <your cygwin installation directory>/home/<yourUserId>/.bashrc
+ as above.
+ Create titan/Makefile.personal with the following content:
+ TTCN3_DIR := /home/<user id>/git/titan/Install
JDKDIR := /home/<user id>/jdk
JNI := no
GUI := no
GEN_PDF := no
DEBUG := no
- Compile Titan:
- cd titan
- make -j
- make install
- The compiled files will be placed into the titan/Install directory.
-
+ Compile Titan:
+ cd titan
+ make -j
+ make install
+ The compiled files will be placed into the titan/Install directory.
+
(L) If you want to use graphical tools (like nedit for example), then you need to install the Cygwin/X
component too. The install procedure can be found at the homepage:
http://x.cygwin.com/docs/ug/cygwin-x-ug.html
diff --git a/usrguide/installationguide.doc b/usrguide/installationguide.doc
index 86819e0c7099cf0a603551a7a7718e3f3c355919..c72477bdf56b0c95ff8ddc4e423dc294ca6f406a 100644
Binary files a/usrguide/installationguide.doc and b/usrguide/installationguide.doc differ