openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1736094 - /openjpa/trunk/openjpa-project/pom.xml
Date Mon, 21 Mar 2016 20:55:34 GMT
Author: struberg
Date: Mon Mar 21 20:55:34 2016
New Revision: 1736094

URL: http://svn.apache.org/viewvc?rev=1736094&view=rev
Log:
remove 'manual' intermediate directory

>From looking at old dist dirs it looks like this directory 
did not exist in the past. This will also solve our css issues.

Modified:
    openjpa/trunk/openjpa-project/pom.xml

Modified: openjpa/trunk/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/pom.xml?rev=1736094&r1=1736093&r2=1736094&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/pom.xml (original)
+++ openjpa/trunk/openjpa-project/pom.xml Mon Mar 21 20:55:34 2016
@@ -256,7 +256,7 @@
                                         ${docbook.source}
                                     </sourceDirectory>
                                     <targetDirectory>
-                                        ${docbook.target}/manual
+                                        ${docbook.target}
                                     </targetDirectory>
                                     <includes>manual.xml</includes>
                                     <chunkedOutput>true</chunkedOutput>
@@ -266,34 +266,20 @@
                                     </htmlCustomization>
                                     <postProcess>
                                         <!-- rename manual to index -->
-                                        <move file="${docbook.target}/manual/manual.html"
tofile="${docbook.target}/manual/index.html" />
+                                        <move file="${docbook.target}/manual.html" tofile="${docbook.target}/index.html"
/>
                                         <!-- Replace a 'base href' token to 'base target'
in the index.html -->
                                         <!-- This base href was inserted by manual-xhtml-chunk.xsl
parameter 'html.base' -->
-                                        <replace file="${docbook.target}/manual/index.html"
token="base href" value="base target" />
+                                        <replace file="${docbook.target}/index.html" token="base
href" value="base target" />
                                         <!-- Copy main.html from original location to
docbook target  -->
-                                        <copy file="${docbook.source}/main.html" tofile="${docbook.target}/manual/main.html"
/>
+                                        <copy file="${docbook.source}/main.html" tofile="${docbook.target}/main.html"
/>
                                         <!-- copy over images and styles -->
-                                        <mkdir dir="${docbook.target}/manual/img" />
-                                        <copy todir="${docbook.target}/manual/img">
-                                            <fileset dir="${docbook.source}/img">
-                                                <include name="*.*" />
-                                            </fileset>
-                                        </copy>
-
-                                        <mkdir dir="${docbook.target}/manual/css" />
-                                        <copy todir="${docbook.target}/manual/css">
-                                            <fileset dir="${docbook.source}/css">
-                                                <include name="*.*" />
-                                            </fileset>
-                                        </copy>
-
-                                        <!-- copy over separate files for single-page
document -->
                                         <mkdir dir="${docbook.target}/img" />
                                         <copy todir="${docbook.target}/img">
                                             <fileset dir="${docbook.source}/img">
-                                                <include name="*.png" />
+                                                <include name="*.*" />
                                             </fileset>
                                         </copy>
+
                                         <mkdir dir="${docbook.target}/css" />
                                         <copy todir="${docbook.target}/css">
                                             <fileset dir="${docbook.source}/css">
@@ -305,7 +291,7 @@
                                              expanded access in upload -->
                                         <mkdir dir="${parent.site.docs}" />
                                         <copy todir="${parent.site.docs}">
-                                            <fileset dir="${docbook.target}/manual">
+                                            <fileset dir="${docbook.target}">
                                                 <include name="*.*" />
                                             </fileset>
                                         </copy>



Mime
View raw message