From f25ea587501d42d21fd2747bed08056e439a543b Mon Sep 17 00:00:00 2001 From: Hardy Ferentschik Date: Fri, 25 Oct 2013 21:53:32 +0200 Subject: [PATCH] HHH-8483 Moving metamodelgen documentation into documentation module --- documentation/documentation.gradle | 41 ++++++++++++------ .../eclipse-annotation-processor-config.png | Bin .../idea-annotation-processor-config.png | Bin .../docbook/metamodelgen}/en-US/master.xml | 0 .../metamodel-generator.gradle | 38 ---------------- 5 files changed, 27 insertions(+), 52 deletions(-) rename {tooling/metamodel-generator/src/main/docbook/manual => documentation/src/main/docbook/metamodelgen}/en-US/images/eclipse-annotation-processor-config.png (100%) rename {tooling/metamodel-generator/src/main/docbook/manual => documentation/src/main/docbook/metamodelgen}/en-US/images/idea-annotation-processor-config.png (100%) rename {tooling/metamodel-generator/src/main/docbook/manual => documentation/src/main/docbook/metamodelgen}/en-US/master.xml (100%) diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle index 21d2b21e4c..d44ced634e 100644 --- a/documentation/documentation.gradle +++ b/documentation/documentation.gradle @@ -29,31 +29,34 @@ dependencies { defaultTasks 'buildDocs' jdocbook { - // apply shared formatting config ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - format('html_single') { + // apply shared formatting config ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + format('html_single') { finalName = "index.html" stylesheet = "classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl" - } - format('html') { + } + + format('html') { finalName = "index.html" stylesheet = "classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl" - } + } + + // book-specific config ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + quickstart { + masterSourceDocumentName = 'Hibernate_Getting_Started_Guide.xml' + } - // book-specific config ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - quickstart { - masterSourceDocumentName = 'Hibernate_Getting_Started_Guide.xml' - // only html supported due to tutorials.zip -// formats.pdf.enable = false - } devguide { masterSourceDocumentName = 'Hibernate_Development_Guide.xml' useRelativeImageUris = false } -// todo : need to remove this once all content moved to devguide + manual { masterSourceDocumentName = 'HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.xml' -// translation = ['de-DE','es-ES','fr-FR','ja-JP','pt-BR','zh-CN'] } + + metamodelgen { + masterSourceDocumentName = 'master.xml' + } } // todo : make this part of gradle-jdocbook. @@ -69,7 +72,17 @@ stageStyles_devguide.doLast { } } -[ 'devguide', 'manual', 'quickstart' ].each { bookName -> +stageStyles_metamodelgen.doLast { + logger.lifecycle( "Staging metamodelgen-specific style resources") + copy { + from project.file( 'src/main/docbook/metamodelgen/en-US/images' ) + into project.file( "${buildDir}/docbook/stage/metamodelgen/images" ) + include '*.png' + includeEmptyDirs = false + } +} + +[ 'devguide', 'manual', 'quickstart', 'metamodelgen' ].each { bookName -> tasks[ "stageStyles_$bookName" ].doLast { logger.lifecycle( "Staging local style resources") copy { diff --git a/tooling/metamodel-generator/src/main/docbook/manual/en-US/images/eclipse-annotation-processor-config.png b/documentation/src/main/docbook/metamodelgen/en-US/images/eclipse-annotation-processor-config.png similarity index 100% rename from tooling/metamodel-generator/src/main/docbook/manual/en-US/images/eclipse-annotation-processor-config.png rename to documentation/src/main/docbook/metamodelgen/en-US/images/eclipse-annotation-processor-config.png diff --git a/tooling/metamodel-generator/src/main/docbook/manual/en-US/images/idea-annotation-processor-config.png b/documentation/src/main/docbook/metamodelgen/en-US/images/idea-annotation-processor-config.png similarity index 100% rename from tooling/metamodel-generator/src/main/docbook/manual/en-US/images/idea-annotation-processor-config.png rename to documentation/src/main/docbook/metamodelgen/en-US/images/idea-annotation-processor-config.png diff --git a/tooling/metamodel-generator/src/main/docbook/manual/en-US/master.xml b/documentation/src/main/docbook/metamodelgen/en-US/master.xml similarity index 100% rename from tooling/metamodel-generator/src/main/docbook/manual/en-US/master.xml rename to documentation/src/main/docbook/metamodelgen/en-US/master.xml diff --git a/tooling/metamodel-generator/metamodel-generator.gradle b/tooling/metamodel-generator/metamodel-generator.gradle index 798c56ef52..88b4e24e6b 100644 --- a/tooling/metamodel-generator/metamodel-generator.gradle +++ b/tooling/metamodel-generator/metamodel-generator.gradle @@ -102,44 +102,6 @@ task javadocs(type: Javadoc) { } } -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// Docbook -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -/*jdocbook { - useRelativeImageUris = false - - format('html_single') { - finalName = "index.html" - stylesheet = "classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl" - } - - format('html') { - finalName = "index.html" - stylesheet = "classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl" - } - - dependencies { - jdocbookXsl libraries.pressgang_xslt - jdocbookXsl libraries.pressgang_fonts - jdocbookStyles libraries.hibernate_docbook_style - jdocbookStyles libraries.jboss_docbook_style - } - - manual { - masterSourceDocumentName = 'master.xml' - } -} - -stageStyles_manual.doLast { - logger.lifecycle( "Staging images") - copy { - from project.file( 'src/main/docbook/manual/en-US/images' ) - into project.file( "${buildDir}/docbook/stage/manual/images" ) - include '*.png' - includeEmptyDirs = false - } -}*/ - //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Release //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~