Author: niclas
Date: Sat May 29 12:35:01 2004
New Revision: 20607
Modified:
avalon/trunk/tools/magic/xdoc/src/dist/magic.bsh
avalon/trunk/tools/magic/xdoc/src/dist/magic.properties
Log:
fixes.
Modified: avalon/trunk/tools/magic/xdoc/src/dist/magic.bsh
==============================================================================
--- avalon/trunk/tools/magic/xdoc/src/dist/magic.bsh (original)
+++ avalon/trunk/tools/magic/xdoc/src/dist/magic.bsh Sat May 29 12:35:01 2004
@@ -88,6 +88,11 @@
copySources();
transformNavigation( themeDir );
transformXdocs( themeDir );
+
+ File dir = new File( themeDir, "resources" );
+ copyResources( dir );
+
+ dir = new File( m_Context.getProperty( "xdoc.resources.dir" ) );
copyResources( themeDir );
}
catch( RuntimeException e )
@@ -131,11 +136,10 @@
transformTrax( fromDir, toDir, xslFile, "^.*\\.xml$", "^.*" + sep +
"navigation.xml$", "." + output, "html" );
}
- private void copyResources( File themeDir )
+ private void copyResources( File fromDir )
{
File destDir = new File( m_Context.getProperty( "xdoc.dest.dir" ) );
File toDir = new File( destDir, "resources" );
- File fromDir = new File( themeDir, "resources" );
copy( fromDir, toDir, "**/*", "" );
}
Modified: avalon/trunk/tools/magic/xdoc/src/dist/magic.properties
==============================================================================
--- avalon/trunk/tools/magic/xdoc/src/dist/magic.properties (original)
+++ avalon/trunk/tools/magic/xdoc/src/dist/magic.properties Sat May 29
12:35:01 2004
@@ -5,7 +5,7 @@
xdoc.dest.dir = target/docs
-xdoc.resources.dir = resources/
+xdoc.resources.dir = src/resources/
xdoc.theme.name = avalon2
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
