Skip to content

Commit 47dec66

Browse files
committed
Final tweaks for 0.95 release.
A couple more corrections in the manual, and minor changes to the build file (executable jar file and correct upload path).
1 parent 3658265 commit 47dec66

File tree

3 files changed

+23
-14
lines changed

3 files changed

+23
-14
lines changed

build.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@
8181
prefix="${ant.project.name}.app"
8282
filemode="755"
8383
includes="Contents/MacOS/JavaApplicationStub"/>
84-
<zipfileset file="${basedir}/dist/single-jar/${ant.project.name}.jar" />
84+
<zipfileset file="${basedir}/dist/single-jar/${ant.project.name}.jar"
85+
filemode="755"/>
8586
<zipfileset dir="${basedir}/manual" prefix="Manual">
8687
<include name="manual.pdf" />
8788
<include name="manual.html" />
@@ -92,7 +93,7 @@
9293
</zip>
9394
</target>
9495

95-
<target name="upload-release" depends="create-release"
96+
<target name="upload-release"
9697
description="Uploads an archive of PuffinPlot binaries and documentation">
9798
<taskdef classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask"
9899
classpath="libs/ant-googlecode.jar" name="gcupload"/>
@@ -108,8 +109,8 @@
108109
username="${gc.username}"
109110
password="${gc.password}"
110111
projectname="puffinplot"
111-
filename="dist/single-jar/${ant.project.name}.jar"
112-
targetfilename="PuffinPlot.jar"
112+
filename="${release.pathname}.zip"
113+
targetfilename="puffinplot-${release.version}.zip"
113114
summary="PuffinPlot archive containing program and documentation."
114115
labels="Type-Archive, OpSys-All" />
115116
</target>

manual/manual.tex

+17-9
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ \subsubsection{\label{sec:menu-file}File menu}
490490

491491
\caption{\label{tbl:export-site} List of fields in exported site data file}
492492

493-
\begin{tabular}{p{6.5em}p{\textwidth-6.5em}} \toprule
493+
\begin{tabular}{lp{90mm}} \toprule
494494
Field name & Description \\ \midrule
495495
site & Name of site \\
496496
Fisher dec. & Mean declination of \caps{pca} directions (\textdegree) \\
@@ -508,15 +508,23 @@ \subsubsection{\label{sec:menu-file}File menu}
508508
\caps{gc m} & Number of \caps{pca} directions used in great-circle fit \\
509509
\caps{gc} min points & the smallest number of points used to define
510510
any of the great circles fitted at this site \\
511-
\caps{t}1min\newline \caps{t}1max\newline \caps{t}2min\newline \caps{t}2max
512-
& These four parameters give the ranges of demagnetization steps used to fit
513-
the circles. \caps{t}1 is the first (lowest) demagnetization step in a circle
514-
path for an individual sample, and \caps{t}2 the last (highest). \caps{t}1min
515-
is the minimum of the \caps{t}1 values across all the circles for the site,
516-
and \caps{t}2 the maximum. Similarly, \caps{t}2 is the last step used in a
517-
single circle, and \caps{t}2min--\caps{t}2max is the range of its values
518-
across all the samples at a site. \\ \bottomrule
511+
\caps{t}1min & See note below \\
512+
\caps{t}1max & See note below \\
513+
\caps{t}2min & See note below \\
514+
\caps{t}2max & See note below \\ \bottomrule
519515
\end{tabular}
516+
517+
\smallskip
518+
519+
Note on \caps{t}1min, \caps{t}1max, \caps{t}2min, and \caps{t}2max: these
520+
four parameters give the ranges of demagnetization steps used to fit the
521+
circles. \caps{t}1 denotes the first (lowest) demagnetization step in a
522+
circle path for an individual sample, and \caps{t}2 the last (highest).
523+
\caps{t}1min is the minimum of the \caps{t}1 values across all the circles
524+
for the site, and \caps{t}1max the maximum. Similarly, \caps{t}2 denotes the
525+
last step used in a single circle, and \caps{t}2min--\caps{t}2max is the
526+
range of its values across all the samples at a site.
527+
520528
\end{table}
521529

522530
\item[File\submenu Export data\submenu Export suite calculations\ldots] saves

src/net/talvi/puffinplot/data/Suite.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ public void doSiteCalculations(Correction correction) {
314314
/**
315315
* <p>Creates a new suite from the specified files.
316316
* The is a convenience method for
317-
* {@link Suite(List<File>, SensorLengths, TwoGeeLoader.Protocol)}
317+
* {@link #Suite(List, SensorLengths, TwoGeeLoader.Protocol)}
318318
* using the default sensor lengths (1, 1, 1) and protocol
319319
* ({@code NORMAL}).
320320
* </p>

0 commit comments

Comments
 (0)