Skip to content

Commit ae6b900

Browse files
jonathan-gibbonsjonathan-gibbons
committed
Convert tag-spec.txt to tag-spec.html
1 parent 78c2d0c commit ae6b900

File tree

5 files changed

+699
-572
lines changed

5 files changed

+699
-572
lines changed

‎make/build.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
<mkdir dir="${dist.jtreg.dir}/doc/jtreg"/>
132132
<copy todir="${dist.jtreg.dir}" file="${src.doc.dir}/javatest/regtest/README"/>
133133
<copy todir="${dist.jtreg.dir}/doc/jtreg">
134-
<fileset file="${src.doc.dir}/javatest/regtest/tag-spec.txt"/>
134+
<fileset file="${src.doc.dir}/javatest/regtest/tag-spec.html"/>
135135
<fileset file="${build.dir}/jtreg/usage.txt"/>
136136
</copy>
137137
<xslt
@@ -212,13 +212,9 @@
212212
<exclude name="images/topic.gif"/>
213213
</fileset>
214214
</copy>
215-
<!-- generate the spec page from the master spec file -->
216-
<texttohtml
217-
textfile="${src.doc.dir}/javatest/regtest/tag-spec.txt"
218-
htmlfile="${build.classes.dir}/com/sun/javatest/regtest/help/default/tag-spec.html"
219-
title="The JDK Test Framework: Tag Language Specification"
220-
style="body: { background-color: white; font-size: 12pt; font-family: SansSerif; margin-left: 3px }">
221-
</texttohtml>
215+
<!-- copy the main tag spec -->
216+
<copy file="${src.doc.dir}/javatest/regtest/tag-spec.html"
217+
tofile="${build.classes.dir}/com/sun/javatest/regtest/help/default/tag-spec.html"/>
222218
<!-- generate the usage page from the command line help -->
223219
<texttohtml
224220
textfile="${build.dir}/jtreg/usage.txt"

‎make/jtreg.gmk

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ JTREG_COPYRIGHT = $(JTREG_IMAGEDIR)/COPYRIGHT
7272
JTREG_LICENSE = $(JTREG_IMAGEDIR)/LICENSE
7373
JTREG_README = $(JTREG_IMAGEDIR)/README
7474
JTREG_FAQ = $(JTREG_IMAGEDIR)/doc/jtreg/faq.html
75-
JTREG_TAGSPEC = $(JTREG_IMAGEDIR)/doc/jtreg/tag-spec.txt
75+
JTREG_TAGSPEC = $(JTREG_IMAGEDIR)/doc/jtreg/tag-spec.html
7676
JTREG_USAGE = $(JTREG_IMAGEDIR)/doc/jtreg/usage.txt
7777
#JTREG_DOCUMENT_CSS = $(JTREG_IMAGEDIR)/doc/document.css
7878

@@ -135,19 +135,9 @@ TARGETS.JAR.jtreg += \
135135
REGTEST_CLASSDIR = $(CLASSDIR)/com/sun/javatest/regtest
136136
REGTEST_SRCDIR = $(SRCJTDOCDIR)/regtest
137137

138-
$(REGTEST_CLASSDIR)/help/default/tag-spec.html: $(REGTEST_SRCDIR)/tag-spec.txt
138+
$(REGTEST_CLASSDIR)/help/default/tag-spec.html: $(REGTEST_SRCDIR)/tag-spec.html
139139
$(MKDIR) -p $(@D)
140-
$(RM) $@
141-
( echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">' ; \
142-
echo '<html><head>'; \
143-
echo '<title>The JDK Test Framework: Tag Language Specification</title>'; \
144-
echo '<style type="text/css">body: { background-color: white; font-size: 12pt; font-family: SansSerif; margin-left: 3px }</style>'; \
145-
echo '</head><body>'; \
146-
echo '<pre>'; \
147-
sed -e 's/&/\&amp;/g' -e 's/</\&lt;/g' -e 's/>/\&gt;/g' $(REGTEST_SRCDIR)/tag-spec.txt; \
148-
echo '</pre>';\
149-
echo '</body></html>'; \
150-
) >$@
140+
$(SED) -e 's/font-size:smaller//' $^ > $@
151141

152142
$(REGTEST_CLASSDIR)/help/default/usage.html: $(BUILDDIR)/jtreg-usage.txt
153143
$(MKDIR) -p $(@D)

‎make/netbeans/jtreg/nbproject/project.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,5 +117,24 @@
117117
<source-level>1.5</source-level>
118118
</compilation-unit>
119119
</java-data>
120+
<spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
121+
<word>applet</word>
122+
<word>appletviewer</word>
123+
<word>arg</word>
124+
<word>checkBugId</word>
125+
<word>classname</word>
126+
<word>classpath</word>
127+
<word>defaultExecMode</word>
128+
<word>HTML</word>
129+
<word>javac</word>
130+
<word>javatest</word>
131+
<word>jtreg</word>
132+
<word>junit</word>
133+
<word>JUnitCore</word>
134+
<word>org</word>
135+
<word>othervm</word>
136+
<word>sourcepath</word>
137+
<word>yesno</word>
138+
</spellchecker-wordlist>
120139
</configuration>
121140
</project>

0 commit comments

Comments
 (0)