Update of /cvsroot/archive-access/archive-access/projects/wera
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15837
Modified Files:
maven.xml project.properties
Log Message:
Fix for '[ 1322448 ] Automatic build - improvements needed'.
* maven.xml
Explicit copy of images. Copy docbook stuff under wera.
* project.properties
Don't automatically copy jpgs, pngs, etc. Do the images dir
copy expliclity in maven.xml.
* src/webapps/wera/index.php
Point at new subdirectory location for manual and release notes.
Index: maven.xml
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** maven.xml 6 Oct 2005 22:32:45 -0000 1.4
--- maven.xml 21 Oct 2005 07:02:54 -0000 1.5
***************
*** 39,42 ****
--- 39,43 ----
<!--Make up the arcretriever war file.-->
<attainGoal name="war" />
+ <attainGoal name="docbook" />
<!--Set filter token used in a few instances below.-->
***************
*** 66,69 ****
--- 67,71 ----
<fileset file="${maven.build.dir}/${maven.war.final.name}" />
</copy>
+ <attainGoal name="copy_docbook" />
</postGoal>
***************
*** 77,80 ****
--- 79,87 ----
<j:if test="${sDocbookSupportPresent == 'true'}">
<attainGoal name="sdocbook:generate-html"/>
+ <!--Copy over the images directory-->
+ <mkdir dir="${maven.build.dir}/docs/articles/images/" />
+ <copy todir="${maven.build.dir}/docs/articles/images/" verbose="true">
+ <fileset dir="${maven.src.dir}/articles/images/" />
+ </copy>
<!--<attainGoal name="sdocbook:generate-pdf"/>
-->
***************
*** 86,89 ****
--- 93,97 ----
</j:if>
</goal>
+
<goal name="copy_docbook">
<!--Copies docbooks under dist docs and under webapps. This goal runs
***************
*** 91,95 ****
-->
<property name="docbook.assembled"
! value="${maven.dist.bin.assembly.dir}/docs/articles/" />
<j:set var="docbookPresent" value="false" />
<util:available file="${docbook.assembled}" >
--- 99,103 ----
-->
<property name="docbook.assembled"
! value="${maven.build.dir}/docs/articles/" />
<j:set var="docbookPresent" value="false" />
<util:available file="${docbook.assembled}" >
***************
*** 97,116 ****
</util:available>
<j:if test="${docbookPresent == 'true'}">
! <!--Copy under docs in dist-->
! <mkdir dir="${docbook.assembled}" />
! <copy todir="${docbook.assembled}">
<fileset dir="${maven.build.dir}/docs/articles/" />
</copy>
! <!--Copy into webapps dir-->
! <mkdir dir="${maven.build.dir}/webapps/admin/docs/articles/" />
! <copy todir="${maven.build.dir}/webapps/admin/docs/articles/">
<fileset dir="${maven.build.dir}/docs/articles/" />
</copy>
</j:if>
- <!-- else -->
- <j:if test="${sDocbookSupportPresent != 'true'}">
- <echo
- message="Docbook copy skipped (Nothing to copy -- not built?)." />
- </j:if>
</goal>
--- 105,122 ----
</util:available>
<j:if test="${docbookPresent == 'true'}">
! <echo message="Copying over docbook" />
! <!--Copy under docs in binary build-->
! <mkdir dir="${maven.dist.bin.assembly.dir}/docs/articles/" />
! <copy todir="${maven.dist.bin.assembly.dir}/docs/articles/"
! verbose="true">
<fileset dir="${maven.build.dir}/docs/articles/" />
</copy>
! <!--Copy under wera webapp-->
! <mkdir dir="${maven.dist.bin.assembly.dir}/webapps/wera/articles/" />
! <copy todir="${maven.dist.bin.assembly.dir}/webapps/wera/articles/"
! verbose="true">
<fileset dir="${maven.build.dir}/docs/articles/" />
</copy>
</j:if>
</goal>
Index: project.properties
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/project.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** project.properties 6 Oct 2005 22:32:45 -0000 1.4
--- project.properties 21 Oct 2005 07:02:54 -0000 1.5
***************
*** 19,23 ****
maven.sdocbook.src.dir = ${basedir}/src/articles
maven.sdocbook.target.dir = ${maven.build.dir}/docs/articles
! maven.sdocbook.resources.include = **/*.gif,**/*.png
maven.sdocbook.html.params = -PARAM generate.id.attributes 1 -PARAM section.autolabel 1 -PARAM part.autolabel 1 -PARAM chapter.autolabel 1 -PARAM generate.meta.abstract 1
maven.sdocbook.fo.params = -PARAM generate.id.attributes 1 -PARAM section.autolabel 1 -PARAM part.autolabel 1 -PARAM chapter.autolabel 1 -PARAM generate.meta.abstract 1
--- 19,23 ----
maven.sdocbook.src.dir = ${basedir}/src/articles
maven.sdocbook.target.dir = ${maven.build.dir}/docs/articles
! maven.sdocbook.resources.include =
maven.sdocbook.html.params = -PARAM generate.id.attributes 1 -PARAM section.autolabel 1 -PARAM part.autolabel 1 -PARAM chapter.autolabel 1 -PARAM generate.meta.abstract 1
maven.sdocbook.fo.params = -PARAM generate.id.attributes 1 -PARAM section.autolabel 1 -PARAM part.autolabel 1 -PARAM chapter.autolabel 1 -PARAM generate.meta.abstract 1
|
