Skip to content
Snippets Groups Projects
Commit 8b182b3f authored by gmantele's avatar gmantele
Browse files

[TAP] Upgrade STIL version + Specify charset encoding for Javadoc generation...

[TAP] Upgrade STIL version + Specify charset encoding for Javadoc generation in all Ant build scripts.
parent 5673597f
No related branches found
No related tags found
No related merge requests found
......@@ -124,7 +124,7 @@
</target>
<target name="compileJavadoc" depends="cleanJavadoc" description="After 'cleanJavadoc', compile the whole Javadoc.">
<javadoc access="protected" author="true" classpath="." destdir="${javadocDir}" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.7" splitindex="true" use="true" version="true">
<javadoc encoding="utf-8" charset="utf-8" docencoding="utf-8" access="protected" author="true" classpath="." destdir="${javadocDir}" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.7" splitindex="true" use="true" version="true">
<packageset dir="${srcDir}" includes="${includesList}" />
</javadoc>
</target>
......
......@@ -12,7 +12,7 @@
<property name="cosJarName" value="cos-1.5beta.jar" />
<property name="cosJar" value="${libDir}/${cosJarName}" />
<property name="stilJarName" value="stil3.0-5.jar" />
<property name="stilJarName" value="stil_3.0-11.jar" />
<property name="stilJar" value="${libDir}/${stilJarName}" />
<property name="tapPath" value="tap/**,adql/**,uws/**,cds/**" />
......@@ -122,6 +122,10 @@
<zipfileset src="${stilJar}" excludes="META-INF/*" />
<zipfileset dir="src" includes="${licensePath}" />
</jar>
<jar basedir="${classesDir}" destfile="${libJarFile}2" includes="${includesList}">
<zipfileset src="${cosJar}" excludes="META-INF/*" />
<zipfileset dir="src" includes="${licensePath}" />
</jar>
<delete dir="${compileDir}" failonerror="true" />
</target>
......@@ -131,6 +135,10 @@
<zipfileset dir="${libDir}" includes="${cosJarName}" fullPath="${cosJar}" />
<zipfileset dir="${libDir}" includes="${stilJarName}" fullPath="${stilJar}" />
</jar>
<jar compress="false" destfile="${srcJarFile}2">
<zipfileset dir="${srcDir}" includes="${includesList},${licensePath}" prefix="${srcDir}" />
<zipfileset dir="${libDir}" includes="${cosJarName}" fullPath="${cosJar}" />
</jar>
</target>
<!-- JAVADOC -->
......@@ -143,7 +151,7 @@
</target>
<target name="compileJavadoc" depends="cleanJavadoc" description="After 'cleanJavadoc', compile the whole Javadoc.">
<javadoc access="protected" author="true" destdir="${javadocDir}" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.7" splitindex="true" use="true" version="true">
<javadoc encoding="utf-8" charset="utf-8" docencoding="utf-8" access="protected" author="true" destdir="${javadocDir}" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.7" splitindex="true" use="true" version="true">
<packageset dir="${srcDir}" includes="${includesList}" />
<classpath refid="tap.classpath" />
</javadoc>
......
......@@ -110,7 +110,7 @@
</target>
<target name="compileJavadoc" depends="cleanJavadoc" description="After 'cleanJavadoc', compile the whole Javadoc.">
<javadoc access="protected" author="true" destdir="${javadocDir}" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.7" splitindex="true" use="true" version="true">
<javadoc encoding="utf-8" charset="utf-8" docencoding="utf-8" access="protected" author="true" destdir="${javadocDir}" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.7" splitindex="true" use="true" version="true">
<packageset dir="${srcDir}" includes="${includesList}" />
<classpath refid="uws.classpath" />
</javadoc>
......@@ -120,4 +120,4 @@
<jar destfile="${javadocJarFile}" basedir="${javadocDir}" />
</target>
</project>
\ No newline at end of file
</project>
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment