4.0 beta 2
diff --git a/documentation.php b/documentation.php
index 41b904a..e51c0ea 100644
--- a/documentation.php
+++ b/documentation.php
@@ -52,12 +52,23 @@
<a name="mm"></a><h3>Getting Started with Managed Make</h3>
<p>If your system has the GNU gfortran compiler installed, try this.</p>
<ol>
- <li>File | New | Managed Make Fortran Project </li>
- <li>Call it whatever; click Next</li>
- <li>Change the Project Type to Executable (Gnu Fortran),
- and click Next</li>
- <li>Click on the C/C++ Indexer tab; select "No Indexer"
- from the dropdown; click Finish</li>
+ <li>File | New | Fortran Project </li>
+ <li>Call it whatever</li>
+ <li>Choose the Executable (Gnu Fortran) from the project type list</li>
+ <li>Choose GCC Toolchain from the toolchain list (you may need to uncheck
+ the "Show project types..." check box at the bottom of the
+ window)
+ <li>Click Next</li>
+ <li>Click on Advanced Settings</li>
+ <li>Expand C/C++ Build in the list on the left, and click on Settings</li>
+ <li>Click on the Binary Parsers tab. Check the appropriate
+ parsers for your platform. If you are using Windows, check
+ PE Windows Parser and/or Cygwin PE Parser; if you are using Linux,
+ check Elf Parser; if you are using Mac, check Mach-O parser.</li>
+ <li>Click on the Error Parsers tab. Check the error parser(s) for the
+ Fortran compiler(s) you will use.</li>
+ <li>Click OK</li>
+ <li>Click Finish</li>
<li>Click File | New | Source File </li>
<li>Call it hello.f90; click Finish</li>
<li>Type the standard "Hello, World" program, and click
@@ -89,15 +100,22 @@
your system path, and the g95 libraries need to be copied into /usr/lib
(to make things easier for yourself, at least).</p>
<ol>
- <li>File | New | Standard Make Fortran Project </li>
- <li>Call it whatever; click Next </li>
- <li>Click on the Binary Parsers tab. If
- you are
- under Windows, you need to change it from Elf Parser to PE Windows
- Parser</li>
- <li>Click on the C/C++ Indexer tab; select "No Indexer"
- from the dropdown</li>
- <li>Click Finish </li>
+ <li>File | New | Fortran Project </li>
+ <li>Call it whatever</li>
+ <li>Choose Makefile Project from the project type list (it has a folder icon;
+ do not expand it)</li>
+ <li>Choose "-- Other Toolchain --" from the toolchain list
+ <--li>Click Next</li>
+ <li>Click on Advanced Settings</li>
+ <li>Expand C/C++ Build in the list on the left, and click on Settings</li>
+ <li>Click on the Binary Parsers tab. Check the appropriate
+ parsers for your platform. If you are using Windows, check
+ PE Windows Parser and/or Cygwin PE Parser; if you are using Linux,
+ check Elf Parser; if you are using Mac, check Mach-O parser.</li>
+ <li>Click on the Error Parsers tab. Check the error parser(s) for the
+ Fortran compiler(s) you will use.</li>
+ <li>Click OK</li-->
+ <li>Click Finish</li>
<li>File | New | File </li>
<li>Call it Makefile </li>
<li>Click Finish </li>
diff --git a/download-archive.php b/download-archive.php
index f6e086e..083b093 100755
--- a/download-archive.php
+++ b/download-archive.php
@@ -12,6 +12,39 @@
<h1>$pageTitle</h1>
<div class="homeitem3col">
+ <h3>Photran 4.0 Beta 1 for Eclipse 3.2.2 and CDT 3.1.2</h3>
+
+ <h4>Full Versions</h4>
+ <ul>
+ <li> <a
+ href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta1-full-linux.tgz">Full
+Photran for Linux/GTK</a>
+ <li> <a
+ href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta1-full-linux-x86_64.tgz">Full
+Photran for Linux/GTK x86_64</a>
+ <li> <a
+ href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta1-full-win32.zip">Full
+Photran for Windows</a>
+ <li> <a
+ href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta1-full-solaris.zip">Full
+Photran for Solaris</a>
+ <li> <a
+ href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta1-full-macosx.tgz">Full
+Photran for Mac OS X 10.4</a>
+ </ul>
+
+ <h4><small> <br></small>Eclipse Features</h4>
+ <ul>
+ <li> <a
+ href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta1.zip">Photran
+Feature</a> (requires Eclipse 3.2 and CDT 3.1)
+ <li> <a
+ href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-refactoring-4.0-beta1.zip">Refactoring
+Feature</a> (add-on for Photran 4.0)
+ </ul>
+ </div>
+
+ <div class="homeitem3col">
<h3>Photran 3.1 Beta 2 for Eclipse 3.1 and CDT 3.1.1</h3>
<p><i>A "full release" of Photran 3.1 was never
released; Photran 3.1 Beta 2 was followed immediately by
diff --git a/download.php b/download.php
index e51054c..eb6757e 100755
--- a/download.php
+++ b/download.php
@@ -21,53 +21,53 @@
and build Fortran programs.</p>
<ol>
<li>The <span style="font-style: italic;">full version</span>
- contains the Eclipse Platform with CDT, Photran, and
+ contains the Eclipse Platform with CDT and Photran, including
<a href="refactoring.php">Fortran refactoring support</a>.
Simply decompress the downloaded file, then run the included
<span style="font-family: monospace;">eclipse</span>
executable. A Java 1.5 JVM is required.
<li>The <span style="font-style: italic;">Photran feature</span>
can be added to an existing Eclipse 3.2 installation,
- <span style="font-style: italic;">as long as CDT 3.1 is already
+ <span style="font-style: italic;">as long as CDT 4.0.1 is already
installed.</span>
- The Photran feature, by itself, does not include refactoring
- support and will run on a Java 1.4 JVM.
- To add refactoring support to the Photran feature, the
- <span style="font-style: italic;">refactoring feature</span>
- must be installed separately. It requires a Java 1.5 JVM.
+ <li>A Photran feature without program analysis and refactoring support
+ is also available. This will run on a Java 1.4 JVM, but the Rename
+ and Introduce Implicit None refactorings will not be available,
+ Open Declaration will not work, and less information will be
+ available in the Outline view.
</ol>
</div>
<div class="homeitem3col">
- <h3>Photran 4.0 Beta 1 for Eclipse 3.2.2 and CDT 3.1.2</h3>
+ <h3>Photran 4.0 Beta 2 for Eclipse 3.3.1 and CDT 4.0.1</h3>
<h4>Full Versions</h4>
<ul>
<li> <a
- href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta1-full-linux.tgz">Full
+ href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta2-full-linux.tgz">Full
Photran for Linux/GTK</a>
<li> <a
- href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta1-full-linux-x86_64.tgz">Full
+ href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta2-full-linux-x86_64.tgz">Full
Photran for Linux/GTK x86_64</a>
<li> <a
- href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta1-full-win32.zip">Full
+ href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta2-full-win32.zip">Full
Photran for Windows</a>
<li> <a
- href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta1-full-solaris.zip">Full
+ href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta2-full-solaris.zip">Full
Photran for Solaris</a>
<li> <a
- href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta1-full-macosx.tgz">Full
+ href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta2-full-macosx.tgz">Full
Photran for Mac OS X 10.4</a>
</ul>
<h4><small> <br></small>Eclipse Features</h4>
<ul>
<li> <a
- href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta1.zip">Photran
-Feature</a> (requires Eclipse 3.2 and CDT 3.1)
- <li> <a
- href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-refactoring-4.0-beta1.zip">Refactoring
-Feature</a> (add-on for Photran 4.0)
+ href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-4.0-beta2.zip">Photran
+Feature (Complete)</a> (requires Eclipse 3.3.1, CDT 4.0.1, and Java 1.5)
+ <li> <small><a
+ href="http://www.eclipse.org/downloads/download.php?file=/technology/photran/photran-novpg-4.0-beta2.zip">Photran
+Feature <i>Without</i> Analysis & Refactoring</a> (for Java 1.4)</small>
</ul>
</div>
diff --git a/index.php b/index.php
index 4111cc0..2e22735 100644
--- a/index.php
+++ b/index.php
@@ -26,12 +26,20 @@
<li>GUI interface to <span style="font-style: italic;">gdb</span></li>
<li>Makefile-based compilation</li>
<li>Compiler error extraction</li>
- <li>Basic refactorings</li>
+ <li>Outline view</li>
+ <li>Open declaration*</li>
+ <li>Rename and Introduce Implicit None refactorings*</li>
</ul>
- <p> <span style="font-weight: bold;">June 13, 2007</span> •
-Photran 4.0 beta 1, for CDT 3.1.2 and Eclipse 3.2.1, is <a href="download.php">now
-available</a>. This is the first release to include basic
-<a href="refactoring.php">refactoring support</a> for Fortran.</p>
+
+ <p><small><small><i>* A project must explicitly have analysis support
+ enabled for these features to work.
+ <a href="refactoring.php">More Information</a></i></small></small></p>
+
+ <p> <span style="font-weight: bold;">October 19, 2007</span> •
+Photran 4.0 beta 2, for CDT 4.0.1 and Eclipse 3.3.1, is <a href="download.php">now
+available</a>. This release includes a number of bug fixes, particularly in the
+parser, more intelligent syntax highlighting.</p>
+
<p><small><small><i>Photran
is being developed at the University of Illinois at
Urbana-Champaign and Los Alamos National Laboratory and is closely
diff --git a/refactoring.php b/refactoring.php
index 8a29a88..944d09e 100644
--- a/refactoring.php
+++ b/refactoring.php
@@ -15,6 +15,9 @@
<h3>Refactoring</h3>
<p>Photran 4.0 is the first release to incorporate basic refactoring support.
Currently, only two refactorings are supported, but more are in development.</p>
+
+ <p><i>The instructions on this page are for Photran 4.0 Beta 2.</i>
+ The instructions for 4.0 Beta 1 were slightly different.</p>
<h4>On this page...</h4>
<ol>
@@ -28,21 +31,18 @@
<div class="homeitem3col">
<a name="prep"></a><h3>Preparing to Use Refactoring Support</h3>
<h2>Setting Up the Indexer</h2>
- <p>In order to perform refactorings, Photran must keep track of what modules, subprograms, etc.
- are declared in every file in your project. By default, it will do this by inspecting every
- file in your project as soon as you activate a refactoring, but this can take an annoyingly long
- time. Instead, you can instruct Photran to update this information every time you save a file.
- To do this,</p>
+ <p>In order to perform refactorings or to use the Open Declaration action,
+ Photran must keep track of what modules, subprograms, etc.
+ are declared in every file in your project. This information is updated every time you save a
+ file. Since this part of Photran is <i>experimental</i> and has not been optimized for speed,
+ it is disabled unless you explicitly enable it in your project.</p>
<ol>
<li> Right-click on your project's folder in the Fortran Projects view
<li> Click on Properties
- <li> Click on C/C++ Indexer (yes, C/C++ Indexer; we realize that's quirky)
- <li> Choose Photran Indexer from the drop-down list
+ <li> Expand Fortran General in the list on the left, and click on Analysis/Refactoring
+ <li> Check the "Enable Fortran analysis/refactoring" check box
<li> Click OK
</ol>
- <small>N.B. If you have a mixed C/C++ and Fortran project, you may not want to do this:
- Enabling the Photran Indexer will <i>disable</i> the CDT indexer, so features such as
- refactoring, Open Declaration, and content assist will no longer work in C/C++.</small>
<h2>Setting Up Module and Include Paths</h2>
<p>If your source code contains INCLUDE lines, or USE lines referencing modules in other files,
@@ -51,10 +51,10 @@
<ol>
<li> Right-click on your project's folder in the Fortran Projects view
<li> Click on Properties
- <li> Click on Fortran Refactoring
+ <li> Expand Fortran General in the list on the left, and click on Analysis/Refactoring
<li> List the folders in which Photran should search for INCLUDE files and modules when
refactoring. They will be searched in order from the first folder listed to the last.
- Subfolders are <i>not</i> searched automatically.
+ Subfolders are <i>not</i> searched automatically; you must include them explicitly.
<li> Click OK
</ol>
</div>
@@ -62,7 +62,7 @@
<div class="homeitem3col">
<a name="general"></a><h3>General Instructions for Using Refactorings</h3>
<p>
- In the Fortran editor (for free-format source code), select the name of
+ In the Fortran editor (for free-format source code), select (highlight) the name of
a variable, subprogram, etc. Then right-click on the selected name,
choose Refactoring from the context menu, and click
on the name of the appropriate refactoring.