freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [05/35] incubator-freemarker git commit: Made place for the Chinese manual.
Date Wed, 30 Dec 2015 18:11:25 GMT
Made place for the Chinese manual.


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/731be2c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/731be2c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/731be2c2

Branch: refs/heads/2.3
Commit: 731be2c28e51d71e5027c6fd4ddda68c3af81b05
Parents: 41b6f83
Author: ddekany <ddekany@apache.org>
Authored: Sun Dec 20 14:05:48 2015 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Sun Dec 20 14:05:48 2015 +0100

----------------------------------------------------------------------
 build.xml                                       |    22 +-
 src/manual/book.xml                             | 37479 -----------------
 src/manual/docgen-help/editors-readme.txt       |   105 -
 src/manual/docgen-misc/googleAnalytics.html     |     9 -
 .../figures/model2sketch_with_alpha.png         |   Bin 61463 -> 0 bytes
 .../figures/odg-convert-howto.txt               |    24 -
 .../docgen-originals/figures/overview.odg       |   Bin 11939 -> 0 bytes
 .../figures/tree_with_alpha.png                 |   Bin 10304 -> 0 bytes
 src/manual/docgen.cjson                         |   112 -
 src/manual/en_US/book.xml                       | 37479 +++++++++++++++++
 src/manual/en_US/docgen-help/editors-readme.txt |   105 +
 .../en_US/docgen-misc/googleAnalytics.html      |     9 +
 .../figures/model2sketch_with_alpha.png         |   Bin 0 -> 61463 bytes
 .../figures/odg-convert-howto.txt               |    24 +
 .../en_US/docgen-originals/figures/overview.odg |   Bin 0 -> 11939 bytes
 .../figures/tree_with_alpha.png                 |   Bin 0 -> 10304 bytes
 src/manual/en_US/docgen.cjson                   |   112 +
 src/manual/en_US/favicon.png                    |   Bin 0 -> 1291 bytes
 src/manual/en_US/figures/model2sketch.png       |   Bin 0 -> 21425 bytes
 src/manual/en_US/figures/overview.png           |   Bin 0 -> 11837 bytes
 src/manual/en_US/figures/tree.png               |   Bin 0 -> 4699 bytes
 src/manual/en_US/logo.png                       |   Bin 0 -> 10134 bytes
 src/manual/favicon.png                          |   Bin 1291 -> 0 bytes
 src/manual/figures/model2sketch.png             |   Bin 21425 -> 0 bytes
 src/manual/figures/overview.png                 |   Bin 11837 -> 0 bytes
 src/manual/figures/tree.png                     |   Bin 4699 -> 0 bytes
 src/manual/logo.png                             |   Bin 10134 -> 0 bytes
 src/manual/zh_CN/placeholder.txt                |     5 +
 28 files changed, 37752 insertions(+), 37733 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/731be2c2/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 999c88b..aa42db9 100644
--- a/build.xml
+++ b/build.xml
@@ -548,6 +548,7 @@
   
   <macrodef name="manual" uri="http://freemarker.org/util">
     <attribute name="offline" />
+    <attribute name="locale" />
     <sequential>
       <ivy:cachepath conf="manual" pathid="ivy.dep" />
       <taskdef resource="org/freemarker/docgen/antlib.properties"
@@ -556,20 +557,28 @@
       />
       
       <docgen:transform
-        srcdir="src/manual" destdir="build/manual"
+        srcdir="src/manual/@{locale}" destdir="build/manual/@{locale}"
         offline="@{offline}"
       />
     </sequential>
   </macrodef>
   
   <target name="manualOffline" depends="init" description="Build the Manual for offline
use" >
-    <u:manual offline="true" />
+    <u:manual offline="true" locale="en_US" />
   </target>
 
   <target name="manualFreemarkerOrg" depends="init" description="Build the Manual to be
upload to freemarker.org" >
-    <u:manual offline="false" />
+    <u:manual offline="false" locale="en_US" />
+  </target>
+  
+  <target name="manualOffline_zh_CN" depends="init" description="Build the Manual for
offline use" >
+    <u:manual offline="true" locale="zh_CN" />
   </target>
 
+  <target name="manualFreemarkerOrg_zh_CN" depends="init" description="Build the Manual
to be upload to freemarker.org" >
+    <u:manual offline="false" locale="zh_CN" />
+  </target>
+  
   <!-- ====================== -->
   <!-- Examples               -->
   <!-- ====================== -->
@@ -680,8 +689,13 @@
     <copy todir="${dist.dir}/">
       <fileset dir="src/dist/" />
     </copy>
+    <!--
+      The US English Manual is the source of any translations and this it's the
+      only one that is guaranteed to be up to date when doing the release, so we only pack
+      that into it.
+    -->
     <copy todir="${dist.dir}/documentation/_html" includeEmptyDirs="no">
-      <fileset dir="build/manual" />
+      <fileset dir="build/manual/en-US" />
     </copy>
     <copy todir="${dist.dir}/documentation/_html/api" includeEmptyDirs="no">
       <fileset dir="build/api" />


Mime
View raw message