Moved x3d directory to below examples/. May now create more examples without...

Moved x3d directory to below examples/. May now create more examples without cluttering the project root.

.bzrignore

 AST
 *.class
 semantic.cache
-x3d/GeneratedAspects.jrag
-x3d/Parser.java
-x3d/x3d.ast
-x3d/x3d.jjt
+examples/x3d/GeneratedAspects.jrag
+examples/x3d/Parser.java
+examples/x3d/x3d.ast
+examples/x3d/x3d.jjt
 javadoc
-x3d/PrettyPrint.java
+examples/x3d/PrettyPrint.java
 SchemaCompile.jar

GenCompiler.java

@@ -13,7 +13,7 @@ import java.io.PrintStream;
 public class GenCompiler extends Parser {
 	public static void main(String args[]) {
 
-        String dir = "x3d";
+        String dir = "examples/x3d";
         String outName = "x3d";
         String[] schema = new String[1];
         boolean first = true;

build.xml

@@ -27,7 +27,7 @@
 
   <!-- compile sources -->
   <target name="build" depends="gen">
-    <javac compiler="jikes" debug="true" nowarn="true" srcdir="." includes="**/*.java" excludes="tools/** x3d/**" classpath=".:${tools}/beaver-rt.jar:${tools}/junit.jar"/>
+    <javac compiler="jikes" debug="true" nowarn="true" srcdir="." includes="**/*.java" excludes="tools/** examples/**" classpath=".:${tools}/beaver-rt.jar:${tools}/junit.jar"/>
   </target>
   
   <!-- generate compiler source files -->

x3d/build.xml → examples/x3d/build.xml

@@ -12,9 +12,9 @@
   <property name="package" value="AST"/>
 
   <!-- "tools" is the directory where generators and libraries are located. -->
-  <property name="tools" value="../tools"/>
+  <property name="tools" value="../../tools"/>
 
-  <property name="javacc.home" value="../tools/javacc-4.0"/>
+  <property name="javacc.home" value="../../tools/javacc-4.0"/>
   
   <property name="parser.name" value="XmlParser"/>
   
@@ -23,7 +23,7 @@
   <!-- "beaver" is an ant task class for the parser generator in beaver.jar -->
 <!--   <taskdef name="beaver" classname="beaver.comp.run.AntTask" classpath="tools/beaver.jar"/> -->
   <!-- "jastadd" is an ant task class in jastadd2.jar -->
-  <taskdef name="jastadd" classname="jastadd.JastAddTask" classpath="../tools/jastadd2.jar"/>
+  <taskdef name="jastadd" classname="jastadd.JastAddTask" classpath="../../tools/jastadd2.jar"/>
 
   <!-- compile sources -->
   <target name="build" depends="gen">