Merge pull request #457 from tenzap/regenerate2

Generate html files at build time (keeps HTML)

Author: ylafon

build.xml

@@ -149,7 +149,7 @@
     </jar>
   </target>
 
-  <target name="war" depends="build" description="Creates the webapp module">
+  <target name="war" depends="build, buildhtml" description="Creates the webapp module">
     <delete file="${war.file}"/>
     <war warfile="${war.file}" webxml="web.xml" basedir="." includes="*html*,favicon.ico,images/**,style/**,scripts/**.js" excludes="html,css-validator.*">
       <classes dir="build"/>
@@ -175,6 +175,20 @@
     </java>
   </target>
 
+  <path id="generate.class.path">
+    <path refid="build.class.path"/>
+    <pathelement location="build"/>
+  </path>
+
+  <target name="buildhtml" depends="build">
+    <java classpathref="generate.class.path" classname="org.w3c.css.index.IndexGenerator">
+      <arg value="."/>
+    </java>
+    <java classpathref="generate.class.path" classname="org.w3c.css.index.TranslationTableGenerator">
+      <arg value="."/>
+    </java>
+  </target>
+
   <target name="javacc">
     <ant antfile="build.xml" dir="javacc"/>
   </target>

org/w3c/css/index/IndexGenerator.java

@@ -22,6 +22,9 @@
 import java.io.OutputStreamWriter;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Iterator;
 
@@ -42,6 +45,31 @@ public class IndexGenerator {
      * @param args
      */
     public static void main(String[] args) {
+        // 1st argument: output path of the html files
+        if (args.length != 0 && !args[0].isEmpty())
+        {
+            String currentPathToClass = IndexGenerator.class.getResource("").getPath();
+            try {
+                Path path = Paths.get(currentPathToClass);
+                Path outputPath = Paths.get(new File(args[0]).getAbsolutePath().toString());
+                Path relativeOutputPath = path.relativize(outputPath);
+                // Overwrite html_files_path so that it is relative to the path (ie. currentPathToClass)
+                html_files_path = relativeOutputPath.toString() + "/";
+                if (!outputPath.toFile().exists()) {
+                    System.err.println("Directory doesn't exist:" + outputPath);
+                    System.exit(1);
+                }
+                if (!Files.isWritable(outputPath)) {
+                    System.err.println("Directory is not writable: " + outputPath);
+                    System.exit(1);
+                }
+                System.out.println("Writing files to " + path.toString() + "/" + html_files_path);
+            } catch (Exception e)
+            {
+                e.printStackTrace();
+                System.exit(1);
+            }
+        }
         IndexGenerator.generatesIndex(false);
     }
 

org/w3c/css/index/TranslationTableGenerator.java

@@ -22,6 +22,9 @@
 import java.io.OutputStreamWriter;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -56,6 +59,31 @@ public class TranslationTableGenerator {
      * @param args
      */
     public static void main(String[] args) {
+        // 1st argument: output path of the html files
+        if (args.length > 0 && !args[0].isEmpty())
+        {
+            String currentPathToClass = IndexGenerator.class.getResource("").getPath();
+            try {
+                Path path = Paths.get(currentPathToClass);
+                Path outputPath = Paths.get(new File(args[0]).getAbsolutePath().toString());
+                Path relativeOutputPath = path.relativize(outputPath);
+                // Overwrite html_files_path so that it is relative to the path (ie. currentPathToClass)
+                html_files_path = relativeOutputPath.toString() + "/";
+                if (!outputPath.toFile().exists()) {
+                    System.err.println("Directory doesn't exist:" + outputPath);
+                    System.exit(1);
+                }
+                if (!Files.isWritable(outputPath)) {
+                    System.err.println("Directory is not writable: " + outputPath);
+                    System.exit(1);
+                }
+                System.out.println("Writing files to " + path.toString() + "/" + html_files_path);
+            } catch (Exception e)
+            {
+                e.printStackTrace();
+                System.exit(1);
+            }
+        }
         TranslationTableGenerator.generateTable();
     }