Updated Photran Git checkout instructions

7 files changed, 129 insertions, 109 deletions

diff --git a/org.eclipse.photran-dev-docs/dev-guide/app-git-cdt.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/app-git-cdt.ltx-inc
new file mode 100644
index 00000000..3a9731a3
--- /dev/null
+++ b/org.eclipse.photran-dev-docs/dev-guide/app-git-cdt.ltx-inc
@@ -0,0 +1,91 @@
+% Checking Out the CDT Sources from Git
+\vspace{-0.5in}
+
+{\scriptsize Last modified June 28, 2012}
+
+This describes how to check out the source code for the current \textit{development} version
+of CDT.  At any given time, this is the version of CDT that will be released the
+following June.
+
+In general, you should \textit{not} have to check out CDT's source code from Git, unless
+you are planning to modify CDT.  Photran developers generally do not need to modify/patch
+CDT; the instructions provided in Appendix~\ref{app:git} describe how to install the CDT SDK,
+which is usually sufficient for Photran development.
+
+This information is provided for information only and may be incomplete or out of date.
+The ``official'' instructions for checking out CDT from Git are on the Eclipse wiki; see
+\url{http://wiki.eclipse.org/Getting_started_with_CDT_development} and
+\url{http://wiki.eclipse.org/CDT/git}.
+
+\begin{enumerate}
+	\setcounter{enumi}{\value{running_counter}}
+	\item Switch to the ``CVS Repository Exploring'' perspective.  (From the ``Window'' menu, choose ``Open Perspective'', and ``Other...''; choose ``CVS Repository Exploring'', and click ``OK.'')
+	\item Right-click anywhere in the white area of the ``CVS Repositories'' view (on the left).  In the popup menu, click New $>$ Repository Location...
+	\item In the dialog box, enter the following information, then click Finish. \\
+	\begin{tabular}{ll}
+	        Host name:       & dev.eclipse.org \\
+	        Repository path: & /cvsroot/eclipse \\
+	        Username:        & anonymous \\
+	        Password:        & (no password) \\
+	        Connection type: & pserver \\
+	\end{tabular}
+	\item In the CVS Repositories view
+	       \begin{itemize}
+	       \item  Expand ``:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse''
+	       \item  Then expand ``HEAD''
+	       \item  Then click on ``org.eclipse.test.performance'' to select it
+	       \item  Then right-click on ``org.eclipse.test.performance'' and, in the popup menu, click ``Check Out''.
+	              A dialog box may appear for a few moments while its source code is retrieved.
+	       \item  Scroll back to the top of the CVS Repositories view, and collapse ``:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse''
+	       \end{itemize}
+	\item Again, right-click anywhere in the white area of the ``CVS Repositories'' view, and in the popup menu, click New $>$ Repository Location...
+	\item In the dialog box, enter the following information, then click Finish. \\
+	\begin{tabular}{ll}
+	        Host name:       & dev.eclipse.org \\
+	        Repository path: & /cvsroot/tools \\
+	        Username:        & anonymous \\
+	        Password:        & (no password) \\
+	        Connection type: & pserver \\
+	\end{tabular}
+	\item  In the CVS Repositories view
+	       \begin{itemize}
+	       \item  Expand ``:pserver:anonymous@dev.eclipse.org:/cvsroot/tools''
+	       \item  Then expand ``Versions''
+	       \item  Right-click on ``org.eclipse.orbit'', and from the popup menu, click ``Configure Branches and Versions...''.
+	       \end{itemize}
+	\item In the ``Configure Branches and Versions'' dialog,
+	       \begin{itemize}
+	       \item  In ``Browse files for tags'', expand net.sourceforge.lpg.lpgjavaruntime, and then click on ``.project''
+	       \item  Under ``New tags found in the selected files'', click the ``Deselect All'' button.  Then, check
+	              v1\_1 (at the top of the list), so it is the only item selected in the list.
+	       \item Click ``Add Checked Tags.''
+	       \item Under ``Remembered tags for these projects,'' expand Branches, and make sure ``v1\_1'' appears.
+	       \item Click ``OK'' to close the dialog.
+	       \end{itemize}
+	\item  Back in the CVS Repositories view
+	       \begin{itemize}
+	       \item  Under ``:pserver:anonymous@dev.eclipse.org:/cvsroot/tools'', expand ``Branches''
+	       \item  Then expand ``v1\_1''
+	       \item  Then expand ``org.eclipse.orbit v1\_1''
+	       \item  Then click on ``net.sourceforge.lpg.lpgjavaruntime'' to select it
+	       \item  Then right-click on ``net.sourceforge.lpg.lpgjavaruntime'' and, in the popup menu, click ``Check Out''.
+	              A dialog box may appear for a few moments while its source code is retrieved.
+	       \end{itemize}
+	\item Switch back to the Java perspective.  The Package Explorer view should now contain two new projects named
+	      org.eclipse.test.performance and net.sourceforge.lpg.lpgjavaruntime.
+	      There should be no compilation errors (although there may be a few warnings).
+	\item Switch to the ``Git Repository Exploring'' perspective.  (From the ``Window'' menu, choose ``Open Perspective'', and ``Other...''; choose ``Git Repository Exploring'', and click ``OK.'')
+	\item From the ``File'' menu, choose ``Import...''
+	\item Under ``Git'', choose ``Projects from Git'', and click ``OK''
+	\item Click ``Clone...''
+	\item For the URI, enter \texttt{git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git}
+	\item Click ``Next''
+	\item All branches will be selected by default; click ``Next''
+	\item Make sure the local directory is OK (or change it if you want your local Git repository stored somewhere else); then click ``Next''
+	\item The repository will be downloaded (it may spend several minutes ``receiving objects'').
+	\item Select the (newly-added) org.eclipse.cdt repository in the list, and click ``Next''
+	\item The defaults (``Import Existing Projects'') are OK; click ``Next''
+	\item All projects are selected by default.  Click ``Finish''.
+	\item Switch back to the Java perspective.  The Package Explorer view should now contain several new projects with CDT's source code.  There should be no compilation errors (although there will be a few warnings).
+	\setcounter{running_counter}{\value{enumi}}
+\end{enumerate}
diff --git a/org.eclipse.photran-dev-docs/dev-guide/app-git.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/app-git.ltx-inc
index 56a2be73..770a0ac6 100644
--- a/org.eclipse.photran-dev-docs/dev-guide/app-git.ltx-inc
+++ b/org.eclipse.photran-dev-docs/dev-guide/app-git.ltx-inc
@@ -1,7 +1,7 @@
 % Getting the Photran Sources from Git
 \vspace{-0.5in}
 
-{\scriptsize Last modified January 17, 2012}
+{\scriptsize Last modified June 29, 2012}
 
 This describes how to check out the source code for the current \textit{development} version
 of Photran.  At any given time, this is the version of Photran that will be released the
@@ -20,7 +20,7 @@ the instructions in this document, please ask for help on the ptp-dev mailing li
 \item Photran's source code \textit{will not compile} if you are using the wrong version of Eclipse!
       You will need to install \textit{Eclipse Classic}, also known as the \textit{Eclipse SDK},
       which includes the Eclipse Platform, Java development tools, and Plug-in Development Environment.
-      (Since Photran is a set of Eclipse plug-ins, you need a version of Eclipse that includes the Plug-in
+      (Since Photran is a set of Eclipse plug-ins, you need a distribution of Eclipse that includes the Plug-in
       Development Environment.)  What version you need depends on the time of year.
       \begin{itemize}
       \item Between January and June, you need to be running the most recent
@@ -29,9 +29,12 @@ the instructions in this document, please ask for help on the ptp-dev mailing li
             \centerline{\url{http://download.eclipse.org/eclipse/downloads/}} \\
             and click on the link for ``4.x Stream Stable Build.''
             This will take you to a page where you can download the Eclipse SDK.
+            (For example, in January--June, 2013, you will need the 4.3 Stable Stream Build
+            for the upcoming Eclipse Kepler release train.)
       \item Between July and December, you can use the latest release.
             Download Eclipse Classic from \\
             \centerline{\url{http://www.eclipse.org/downloads/}}.
+            (For example, in June--December, 2012, you will download Eclipse 4.2 Classic.)
       \end{itemize}
 \item You will need to be running a Java 6 or later Java Virtual Machine (JVM).
 \item \textit{(Optional)} You may want to install the following Eclipse plug-ins, although none of them are necessary:
@@ -44,7 +47,7 @@ the instructions in this document, please ask for help on the ptp-dev mailing li
 \end{enumerate}
 
 \newcounter{running_counter}
-\textbf{Part~I.  Install the CDT SDK, EGit, Photran, and Environment Descriptions}
+\textbf{Part~I.  Install the CDT SDK, EGit, and Photran}  %, and Environment Descriptions}
 
 First, you will need to install the C/C++ Development Tools Software Development Kit (CDT SDK),
 EGit, and the most recent stable release of Photran itself.  Photran reuses some parts of CDT, and the
@@ -67,21 +70,21 @@ It is also required when setting an API baseline in Part~II below.
       \item The wizard will show the complete list of plug-ins to be installed; click ``Next''
       \item Accept the terms of the license agreement, and click ``Finish''
       \item Installation may take several minutes. Restart Eclipse when prompted.
-      \item After Eclipse restarts, again click on the ``Help'' menu, and choose ``Install New Software...''
-      \item Click the ``Add...'' button.  In the ``Location'' field, type http://download.eclipse.org/eclipse/updates/3.8milestones
-      \item In the ``Work with:'' combo box, choose the update site you just entered, i.e.,
-            http://download.eclipse.org/eclipse/updates/3.8milestones
-      \item Expand the ``PDE/API Tools Environment Description'' category
-      \item Under ``PDE/API Tools Environment Description,'' check the boxes next to the following:
-      \begin{itemize}
-            \item PDE/API Tools Environment Descriptions J2SE 15
-            \item PDE/API Tools Environment Descriptions J2SE 16
-            \item PDE/API Tools Environment Descriptions J2SE 17
-      \end{itemize}
-      \item Click ``Next''
-      \item The wizard will show the list of environment descriptions to be installed; click ``Next''
-      \item Accept the terms of the license agreement, and click ``Finish''
-      \item Installation may take several minutes. Restart Eclipse when prompted.
+%      \item After Eclipse restarts, again click on the ``Help'' menu, and choose ``Install New Software...''
+%      \item Click the ``Add...'' button.  In the ``Location'' field, type http://download.eclipse.org/eclipse/updates/3.8milestones
+%      \item In the ``Work with:'' combo box, choose the update site you just entered, i.e.,
+%            http://download.eclipse.org/eclipse/updates/3.8milestones
+%      \item Expand the ``PDE/API Tools Environment Description'' category
+%      \item Under ``PDE/API Tools Environment Description,'' check the boxes next to the following:
+%      \begin{itemize}
+%            \item PDE/API Tools Environment Descriptions J2SE 15
+%            \item PDE/API Tools Environment Descriptions J2SE 16
+%            \item PDE/API Tools Environment Descriptions J2SE 17
+%      \end{itemize}
+%      \item Click ``Next''
+%      \item The wizard will show the list of environment descriptions to be installed; click ``Next''
+%      \item Accept the terms of the license agreement, and click ``Finish''
+%      \item Installation may take several minutes. Restart Eclipse when prompted.
 	\setcounter{running_counter}{\value{enumi}}
 \end{enumerate}
 
@@ -99,7 +102,7 @@ with the latest stable release, in order to detect API changes.
 	      Choose ``Preferences'' from the menu.
 	\item Expand the ``Plug-in Development'' category, and choose ``API Baselines''
 	\item Click ``Add Baseline...''
-	\item Enter ``Indigo'' for the name
+	\item Enter ``Default'' for the name
 	\item Click ``Reset''
 	\item Click ``Finish''
 	\item Click ``OK''
@@ -109,85 +112,7 @@ with the latest stable release, in order to detect API changes.
 \end{enumerate}
 
 \vspace{1em}
-\textbf{Part~III.  Clone the CDT Git repository and check out CDT's source code (and its prerequisites)}
-
-Since Photran depends on CDT, you need the source code for the upcoming release of CDT.
-
-\begin{enumerate}
-	\setcounter{enumi}{\value{running_counter}}
-	\item Switch to the ``CVS Repository Exploring'' perspective.  (From the ``Window'' menu, choose ``Open Perspective'', and ``Other...''; choose ``CVS Repository Exploring'', and click ``OK.'')
-	\item Right-click anywhere in the white area of the ``CVS Repositories'' view (on the left).  In the popup menu, click New $>$ Repository Location...
-	\item In the dialog box, enter the following information, then click Finish. \\
-	\begin{tabular}{ll}
-	        Host name:       & dev.eclipse.org \\
-	        Repository path: & /cvsroot/eclipse \\
-	        Username:        & anonymous \\
-	        Password:        & (no password) \\
-	        Connection type: & pserver \\
-	\end{tabular}
-	\item In the CVS Repositories view
-	       \begin{itemize}
-	       \item  Expand ``:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse''
-	       \item  Then expand ``HEAD''
-	       \item  Then click on ``org.eclipse.test.performance'' to select it
-	       \item  Then right-click on ``org.eclipse.test.performance'' and, in the popup menu, click ``Check Out''.
-	              A dialog box may appear for a few moments while its source code is retrieved.
-	       \item  Scroll back to the top of the CVS Repositories view, and collapse ``:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse''
-	       \end{itemize}
-	\item Again, right-click anywhere in the white area of the ``CVS Repositories'' view, and in the popup menu, click New $>$ Repository Location...
-	\item In the dialog box, enter the following information, then click Finish. \\
-	\begin{tabular}{ll}
-	        Host name:       & dev.eclipse.org \\
-	        Repository path: & /cvsroot/tools \\
-	        Username:        & anonymous \\
-	        Password:        & (no password) \\
-	        Connection type: & pserver \\
-	\end{tabular}
-	\item  In the CVS Repositories view
-	       \begin{itemize}
-	       \item  Expand ``:pserver:anonymous@dev.eclipse.org:/cvsroot/tools''
-	       \item  Then expand ``Versions''
-	       \item  Right-click on ``org.eclipse.orbit'', and from the popup menu, click ``Configure Branches and Versions...''.
-	       \end{itemize}
-	\item In the ``Configure Branches and Versions'' dialog,
-	       \begin{itemize}
-	       \item  In ``Browse files for tags'', expand net.sourceforge.lpg.lpgjavaruntime, and then click on ``.project''
-	       \item  Under ``New tags found in the selected files'', click the ``Deselect All'' button.  Then, check
-	              v1\_1 (at the top of the list), so it is the only item selected in the list.
-	       \item Click ``Add Checked Tags.''
-	       \item Under ``Remembered tags for these projects,'' expand Branches, and make sure ``v1\_1'' appears.
-	       \item Click ``OK'' to close the dialog.
-	       \end{itemize}
-	\item  Back in the CVS Repositories view
-	       \begin{itemize}
-	       \item  Under ``:pserver:anonymous@dev.eclipse.org:/cvsroot/tools'', expand ``Branches''
-	       \item  Then expand ``v1\_1''
-	       \item  Then expand ``org.eclipse.orbit v1\_1''
-	       \item  Then click on ``net.sourceforge.lpg.lpgjavaruntime'' to select it
-	       \item  Then right-click on ``net.sourceforge.lpg.lpgjavaruntime'' and, in the popup menu, click ``Check Out''.
-	              A dialog box may appear for a few moments while its source code is retrieved.
-	       \end{itemize}
-	\item Switch back to the Java perspective.  The Package Explorer view should now contain two new projects named
-	      org.eclipse.test.performance and net.sourceforge.lpg.lpgjavaruntime.
-	      There should be no compilation errors (although there may be a few warnings).
-	\item Switch to the ``Git Repository Exploring'' perspective.  (From the ``Window'' menu, choose ``Open Perspective'', and ``Other...''; choose ``Git Repository Exploring'', and click ``OK.'')
-	\item From the ``File'' menu, choose ``Import...''
-	\item Under ``Git'', choose ``Projects from Git'', and click ``OK''
-	\item Click ``Clone...''
-	\item For the URI, enter \texttt{git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git}
-	\item Click ``Next''
-	\item All branches will be selected by default; click ``Next''
-	\item Make sure the local directory is OK (or change it if you want your local Git repository stored somewhere else); then click ``Next''
-	\item The repository will be downloaded (it may spend several minutes ``receiving objects'').
-	\item Select the (newly-added) org.eclipse.cdt repository in the list, and click ``Next''
-	\item The defaults (``Import Existing Projects'') are OK; click ``Next''
-	\item All projects are selected by default.  Click ``Finish''.
-	\item Switch back to the Java perspective.  The Package Explorer view should now contain several new projects with CDT's source code.  There should be no compilation errors (although there will be a few warnings).
-	\setcounter{running_counter}{\value{enumi}}
-\end{enumerate}
-
-\vspace{1em}
-\textbf{Part~IV.  Clone the Photran Git repository and check out Photran's source code}
+\textbf{Part~III.  Clone the Photran Git repository and check out Photran's source code}
 
 \textit{\textbf{Important:} If you already have an earlier version of the Photran source code (e.g., if you checked it out from CVS before we moved to Git),
 you must \textit{delete} the existing projects from your workspace.  The Git import wizard will not overwrite them; it will give an error message and fail.}
@@ -196,9 +121,9 @@ you must \textit{delete} the existing projects from your workspace.  The Git imp
 	\setcounter{enumi}{\value{running_counter}}
 	\item Switch to the ``Git Repository Exploring'' perspective.  (From the ``Window'' menu, choose ``Open Perspective'', and ``Other...''; choose ``Git Repository Exploring'', and click ``OK.'')
 	\item From the ``File'' menu, choose ``Import...''
-	\item Under ``Git'', choose ``Projects from Git'', and click ``OK''
-	\item Click ``Clone...''
-	\item For the URI, enter one of the following.
+	\item Under ``Git'', choose ``Projects from Git'', and click ``Next''
+	\item Select ``URI'', and click ``Next''
+	\item In the URI field, enter one of the following.
 	    \begin{itemize}
 	    \item Most people will enter \\
 	      \centerline{\texttt{git://git.eclipse.org/gitroot/ptp/org.eclipse.photran.git}}
@@ -210,8 +135,7 @@ you must \textit{delete} the existing projects from your workspace.  The Git imp
 	\item All branches will be selected by default; click ``Next''
 	\item Make sure the local directory is OK (or change it if you want your local Git repository stored somewhere else); then click ``Next''
 	\item The repository will be downloaded (it may spend several minutes ``receiving objects'').
-	\item Select the (newly-added) org.eclipse.photran repository in the list, and click ``Next''
-	\item The defaults (``Import Existing Projects'') are OK; click ``Next''
+	\item Ensure that "Import existing projects" is selected and ``Working Directory'' is selected from the list; then click ``Next''
 	\item All projects are selected by default; click ``Finish''
 	\item Switch back to the Java perspective.  The Package Explorer view should now contain several new projects with Photran's source code.  There should be no compilation errors (although there will be a few warnings).
 	\setcounter{running_counter}{\value{enumi}}
diff --git a/org.eclipse.photran-dev-docs/dev-guide/app-history.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/app-history.ltx-inc
index e427e424..0b634de2 100644
--- a/org.eclipse.photran-dev-docs/dev-guide/app-history.ltx-inc
+++ b/org.eclipse.photran-dev-docs/dev-guide/app-history.ltx-inc
@@ -1,7 +1,7 @@
 % Photran Release History
 \vspace{-0.5in}
 
-{\scriptsize Last modified December 5, 2011}
+{\scriptsize Last modified June 29, 2011}
 
 {\footnotesize
 \begin{tabular}{clccl}
@@ -25,6 +25,7 @@ Photran & Date & Platform & CDT & Notes \\
 6.0.0 & Jun 2010 & 3.6     & 7.0.0 & First release as part of the train (Helios) \\
 7.0.0 & Jun 2011 & 3.7     & 8.0.0 & Indigo release train \\
 8.0.0 & Jun 2012 & 4.2     & 8.1.0 & Juno release train \\
+8.1.0 & Jun 2013 & 4.3     & 9.0.0 & Kepler release train (PLANNED) \\
 %Vers & Mon Year & Platfrm & CDT   & \\
 \end{tabular}
 }
diff --git a/org.eclipse.photran-dev-docs/dev-guide/dev-guide-general.ltx b/org.eclipse.photran-dev-docs/dev-guide/dev-guide-general.ltx
index f8cda819..197a7c3c 100644
--- a/org.eclipse.photran-dev-docs/dev-guide/dev-guide-general.ltx
+++ b/org.eclipse.photran-dev-docs/dev-guide/dev-guide-general.ltx
@@ -38,7 +38,7 @@ J. Overbey \\
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \appendix
 
-\chapter{Checking Out the Current Development Code}
+\chapter{Checking Out the Photran Sources from Git}
 \label{app:git}
 \input{app-git.ltx-inc}
 
@@ -60,6 +60,10 @@ J. Overbey \\
 \label{app:uiuc}
 \input{app-uiuc.ltx-inc}
 
+\chapter{Checking Out the CDT Sources}
+\label{app:git-cdt}
+\input{app-git-cdt.ltx-inc}
+
 \chapter{Contributing a New Feature or Bug Fix}
 \label{app:contributing}
 \input{app-contributing.ltx-inc}
diff --git a/org.eclipse.photran-dev-docs/dev-guide/dev-guide-general.pdf b/org.eclipse.photran-dev-docs/dev-guide/dev-guide-general.pdf
index 107c91f4..71c35af3 100644
--- a/org.eclipse.photran-dev-docs/dev-guide/dev-guide-general.pdf
+++ b/org.eclipse.photran-dev-docs/dev-guide/dev-guide-general.pdf
diff --git a/org.eclipse.photran-dev-docs/dev-guide/find-pdflatex.sh b/org.eclipse.photran-dev-docs/dev-guide/find-pdflatex.sh
index e0fc6c47..c392354f 100755
--- a/org.eclipse.photran-dev-docs/dev-guide/find-pdflatex.sh
+++ b/org.eclipse.photran-dev-docs/dev-guide/find-pdflatex.sh
@@ -5,14 +5,14 @@ if [ "$RESULT" == "" ]; then
   if [ "$OS" == "Darwin" ]; then
     HARDWARE=`uname -m`
     if [ "$HARDWARE" == "i386" ]; then
-      RESULT=`find /usr/local -name pdflatex | grep i386`
+      RESULT=`find /usr/local -name pdflatex 2>/dev/null | grep i386`
     elif [ "$HARDWARE" == "x86_64" ]; then
-      RESULT=`find /usr/local -name pdflatex | grep x86_64`
+      RESULT=`find /usr/local -name pdflatex 2>/dev/null | grep x86_64`
     else
-      RESULT=`find /usr/local -name pdflatex | grep ower`
+      RESULT=`find /usr/local -name pdflatex 2>/dev/null | grep ower`
     fi
   else
-    RESULT=`find /usr/local/tex* -name pdflatex | head -1`
+    RESULT=`find /usr/local/tex* -name pdflatex 2>/dev/null | head -1`
   fi
 fi
 if [ "$RESULT" == "" ]; then
diff --git a/org.eclipse.photran-dev-docs/dev-guide/git-instructions.pdf b/org.eclipse.photran-dev-docs/dev-guide/git-instructions.pdf
index 80648dd5..0f2be601 100644
--- a/org.eclipse.photran-dev-docs/dev-guide/git-instructions.pdf
+++ b/org.eclipse.photran-dev-docs/dev-guide/git-instructions.pdf