Skip to content

Commit

Permalink
Changed the names of the dita val files to be consistent with the
Browse files Browse the repository at this point in the history 
product names we use in other parts of the build.xml file.
Tested the publishing for pdf, webhelp, javahelp, eclipse help.
  • Loading branch information
@dan-caprioara
dan-caprioara committed Mar 19, 2018
1 parent d074f3c commit a1a7034
Show file tree
Hide file tree
Showing 16 changed files with 193 additions and 54 deletions.
0 DITA/ditaval/authorEclipse.ditaval → DITA/ditaval/author-eclipse.ditaval
View file
File renamed without changes.
0 DITA/ditaval/author.ditaval → DITA/ditaval/author-sa.ditaval
View file
File renamed without changes.
0 DITA/ditaval/fusion.ditaval → DITA/ditaval/content-fusion.ditaval
View file
File renamed without changes.
0 DITA/ditaval/pdf-css.ditaval → DITA/ditaval/dcpp.ditaval
View file
File renamed without changes.
0 DITA/ditaval/developerEclipse.ditaval → DITA/ditaval/developer-eclipse.ditaval
View file
File renamed without changes.
0 DITA/ditaval/developer.ditaval → DITA/ditaval/developer-sa.ditaval
View file
File renamed without changes.
0 DITA/ditaval/editorEclipse.ditaval → DITA/ditaval/editor-eclipse.ditaval
View file
File renamed without changes.
0 DITA/ditaval/editor.ditaval → DITA/ditaval/editor-sa.ditaval
View file
File renamed without changes.
0 DITA/ditaval/svnClient.ditaval → DITA/ditaval/svn-client.ditaval
View file
File renamed without changes.
0 DITA/ditaval/waCustom.ditaval → DITA/ditaval/webauthor-customization.ditaval
View file
File renamed without changes.
0 DITA/ditaval/webhelp.ditaval → DITA/ditaval/webhelp-classic.ditaval
View file
File renamed without changes.
22 changes: 11 additions & 11 deletions DITA/userguide.xpr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8467,7 +8467,7 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima
<String>author</String>
</field>
<field name="ditavalFile">
<String>${pd}/ditaval/author.ditaval</String>
<String>${pd}/ditaval/author-sa.ditaval</String>
</field>
<field name="useDITAVAL">
<Boolean>true</Boolean>
Expand All @@ -8487,7 +8487,7 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima
<String>authorEclipse</String>
</field>
<field name="ditavalFile">
<String>${pd}/ditaval/authorEclipse.ditaval</String>
<String>${pd}/ditaval/author-eclipse.ditaval</String>
</field>
<field name="useDITAVAL">
<Boolean>true</Boolean>
Expand All @@ -8507,7 +8507,7 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima
<String>developer</String>
</field>
<field name="ditavalFile">
<String>${pd}/ditaval/developer.ditaval</String>
<String>${pd}/ditaval/developer-sa.ditaval</String>
</field>
<field name="useDITAVAL">
<Boolean>true</Boolean>
Expand All @@ -8527,7 +8527,7 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima
<String>developerEclipse</String>
</field>
<field name="ditavalFile">
<String>${pd}/ditaval/developerEclipse.ditaval</String>
<String>${pd}/ditaval/developer-eclipse.ditaval</String>
</field>
<field name="useDITAVAL">
<Boolean>true</Boolean>
Expand All @@ -8547,7 +8547,7 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima
<String>editor</String>
</field>
<field name="ditavalFile">
<String>${pd}/ditaval/editor.ditaval</String>
<String>${pd}/ditaval/editor-sa.ditaval</String>
</field>
<field name="useDITAVAL">
<Boolean>true</Boolean>
Expand All @@ -8567,7 +8567,7 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima
<String>editorEclipse</String>
</field>
<field name="ditavalFile">
<String>${pd}/ditaval/editorEclipse.ditaval</String>
<String>${pd}/ditaval/editor-eclipse.ditaval</String>
</field>
<field name="useDITAVAL">
<Boolean>true</Boolean>
Expand All @@ -8587,7 +8587,7 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima
<String>svnClient</String>
</field>
<field name="ditavalFile">
<String>${pd}/ditaval/svnClient.ditaval</String>
<String>${pd}/ditaval/svn-client.ditaval</String>
</field>
<field name="useDITAVAL">
<Boolean>true</Boolean>
Expand Down Expand Up @@ -8627,7 +8627,7 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima
<String>fusion</String>
</field>
<field name="ditavalFile">
<String>${pd}/ditaval/fusion.ditaval</String>
<String>${pd}/ditaval/content-fusion.ditaval</String>
</field>
<field name="useDITAVAL">
<Boolean>true</Boolean>
Expand All @@ -8647,7 +8647,7 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima
<String>waCustom</String>
</field>
<field name="ditavalFile">
<String>${pd}/ditaval/waCustom.ditaval</String>
<String>${pd}/ditaval/webauthor-customization.ditaval</String>
</field>
<field name="useDITAVAL">
<Boolean>true</Boolean>
Expand Down Expand Up @@ -8687,7 +8687,7 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima
<String>webhelp</String>
</field>
<field name="ditavalFile">
<String>${pd}/ditaval/webhelp.ditaval</String>
<String>${pd}/ditaval/webhelp-classic.ditaval</String>
</field>
<field name="useDITAVAL">
<Boolean>true</Boolean>
Expand Down Expand Up @@ -8727,7 +8727,7 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima
<String>pdf-css</String>
</field>
<field name="ditavalFile">
<String>${pd}/ditaval/pdf-css.ditaval</String>
<String>${pd}/ditaval/dcpp.ditaval</String>
</field>
<field name="useDITAVAL">
<Boolean>true</Boolean>
Expand Down
200 changes: 169 additions & 31 deletions build.xml
View file
Original file line number Diff line number Diff line change
@@ -1,93 +1,225 @@
<project name="userguide" default="build-all">

<!-- Constants -->
<property name="c-xmx">-Xmx1384m</property>
<property name="c-xmx">-Xmx2384m</property>

<condition property="dita.executable" value="dita.bat">
<os family="windows" />
</condition>
<property name="dita.executable" value="dita" />


<!--
==================================
Webhelp
==================================
-->
<target name="build-webhelp-public">
<antcall target="build-webhelp-common">
<param name="p-type">-public</param>
</antcall>
</target>

<target name="build-webhelp-private">
<antcall target="build-webhelp-common">
<param name="p-type">-private</param>
</antcall>
</target>

<target name="build-webhelp-common">
<antcall target="build-single">
<param name="p-product" value="chemistry" />
<param name="p-product" value="author-sa" />
<param name="p-format" value="webhelp-responsive" />
<param name="p-internal" value="" />
<param name="p-type" value="-public" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="pdf-css" />
<param name="p-product" value="author-eclipse" />
<param name="p-format" value="webhelp-responsive" />
<param name="p-internal" value="" />
<param name="p-type" value="-public" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="developer-sa" />
<param name="p-format" value="webhelp-responsive" />
<param name="p-type" value="-public" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="developer-eclipse" />
<param name="p-format" value="webhelp-responsive" />
<param name="p-type" value="-public" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="editor-sa" />
<param name="p-format" value="webhelp-responsive" />
<param name="p-type" value="-public" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="editor-eclipse" />
<param name="p-format" value="webhelp-responsive" />
<param name="p-type" value="-public" />
</antcall>
</target>

<target name="build-webhelp-private">

<antcall target="build-single">
<param name="p-product" value="content-fusion" />
<param name="p-format" value="webhelp-responsive" />
<param name="p-type" value="-public" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="webauthor" />
<param name="p-format" value="webhelp-responsive" />
<param name="p-type" value="-public" />
</antcall>
<!-- TODO - Uncomment after we commit the opt.
<antcall target="build-single">
<param name="p-product" value="webauthor-customization" />
<param name="p-format" value="webhelp-responsive" />
<param name="p-type" value="-public" />
</antcall>
-->

<antcall target="build-single">
<param name="p-product" value="chemistry" />
<param name="p-format" value="webhelp-responsive" />
<param name="p-internal" value="-private" />
<param name="p-type" value="-public" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="dcpp" />
<param name="p-format" value="webhelp-responsive" />
<param name="p-type" value="-public" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="webhelp-classic" />
<param name="p-format" value="webhelp-responsive" />
<param name="p-type" value="-public" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="pdf-css" />
<param name="p-product" value="webhelp-responsive" />
<param name="p-format" value="webhelp-responsive" />
<param name="p-internal" value="-private" />
<param name="p-type" value="-public" />
</antcall>
</target>

<!--
==================================
PDF
==================================
-->
<target name="build-pdf">

<antcall target="build-single">
<param name="p-product" value="author-sa" />
<param name="p-format" value="pdf-css" />
<param name="p-type" value="" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="author-eclipse" />
<param name="p-format" value="pdf-css" />
<param name="p-type" value="" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="developer-sa" />
<param name="p-format" value="pdf-css" />
<param name="p-type" value="" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="developer-eclipse" />
<param name="p-format" value="pdf-css" />
<param name="p-type" value="" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="editor-sa" />
<param name="p-format" value="pdf-css" />
<param name="p-type" value="" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="editor-eclipse" />
<param name="p-format" value="pdf-css" />
<param name="p-type" value="" />
</antcall>

<antcall target="build-single">
<param name="p-product" value="chemistry" />
<param name="p-format" value="pdf-css" />
<param name="p-internal" value="" />
<param name="p-type" value="" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="pdf-css" />
<param name="p-product" value="dcpp" />
<param name="p-format" value="pdf-css" />
<param name="p-internal" value="" />
<param name="p-type" value="" />
</antcall>

</target>

<!--
==================================
Eclipse Help
==================================
-->
<target name="build-eclipsehelp">
<antcall target="build-single">
<param name="p-product" value="chemistry" />
<param name="p-product" value="author-eclipse" />
<param name="p-format" value="eclipsehelp" />
<param name="p-type" value="" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="developer-eclipse" />
<param name="p-format" value="eclipsehelp" />
<param name="p-internal" value="" />
<param name="p-type" value="" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="pdf-css" />
<param name="p-product" value="editor-eclipse" />
<param name="p-format" value="eclipsehelp" />
<param name="p-internal" value="" />
<param name="p-type" value="" />
</antcall>
</target>

<!--
==================================
Java Help
==================================
-->
<target name="build-javahelp">
<antcall target="build-single">
<param name="p-product" value="chemistry" />
<param name="p-product" value="author-sa" />
<param name="p-format" value="javahelp" />
<param name="p-internal" value="" />
<param name="p-type" value="" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="pdf-css" />
<param name="p-product" value="developer-sa" />
<param name="p-format" value="javahelp" />
<param name="p-internal" value="" />
<param name="p-type" value="" />
</antcall>
<antcall target="build-single">
<param name="p-product" value="editor-sa" />
<param name="p-format" value="javahelp" />
<param name="p-type" value="" />
</antcall>
</target>


<target name="build-all" depends="build-webhelp-public, build-pdf, build-eclipsehelp, build-javahelp"/>



<!--
==================================
All deliverables.
build-webhelp-public,
==================================
-->
<target name="build-all" depends="build-pdf, build-eclipsehelp, build-eclipsehelp, build-javahelp">
<echo>Build All</echo>
</target>

<!--
==================================
A single deliverable for a single product.
==================================
-->
<target name="build-single">

<echo>--------------------------------</echo>
<echo>Build single target: ${p-product} / ${p-format} ${p-internal}</echo>
<echo>Build single target: ${p-product} / ${p-format} ${p-type}</echo>

<property name="p-output">${project.build.directory}/output/${p-format}${p-type}/${p-product}</property>
<property name="p-temp">${project.build.directory}/temp/${p-format}${p-type}/${p-product}</property>

<property name="p-output">${project.build.directory}/output/ug-${p-product}-${p-format}${p-internal}</property>
<property name="p-temp">${project.build.directory}/temp/ug-${p-product}-${p-format}${p-internal}</property>
<property name="p-ditaval">${basedir}/DITA/ditaval/${p-product}.ditaval</property>
<property name="p-template">${basedir}/publishing/publishing-template/${p-product}${p-internal}.opt</property>
<property name="p-template">${basedir}/publishing/publishing-template/${p-product}${p-type}.opt</property>

<delete dir="${p-output}" />
<mkdir dir="${p-output}" />
Expand Down Expand Up @@ -127,8 +259,14 @@
<arg value="-Deditlink.remote.ditamap.url=github://getFileContent/oxygenxml/userguide-private/dev/DITA/UserManual.ditamap" />
<arg value="-Deditlink.web.author.url=https://www.oxygenxml.com/webapp-demo-aws/" />

<!-- Relevant only for eclipsehelp -->
<arg value="-Dargs.eclipsehelp.jar.name=${p-product}-help.jar" />

</exec>

<!-- Relevant for the javahelp -->
<move file="${p-output}/UserManual.jar" tofile="${p-output}/${p-product}-help.jar" failonerror="false" />

</target>


Expand Down
Loading

0 comments on commit a1a7034

Please sign in to comment.