WIP: Switch xqlint from eXist-db to eXistSolutions (atom) fork

.gitignore

@@ -4,7 +4,4 @@ expath-pkg.xml
 
 resources/scripts/xqlint.min.js
 
-tools/r.js
-
-tools/js.jar
 index.html

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "support/xqlint"]
-	path = support/xqlint
-url=https://github.com/wolfgangmm/xqlint.git
+    path = support/xqlint
+    url = https://github.com/eXistSolutions/xqlint.git
+    ignore = dirty

README.md

@@ -37,7 +37,7 @@ You can install a newer or second version of eXide by deploying it directly into
 also how development on eXide is done.
 
 To build eXide from scratch,
-you should first get eXist-db from SVN and build it (build.sh/build.bat). Next, clone eXide into a directory, e.g.:
+you should first get eXist-db from SVN and build it (build.sh/build.bat). Next, install Node.js (https://nodejs.org/). Next, clone eXide into a directory, e.g.:
 
      git clone git://github.com/wolfgangmm/eXide.git eXideDev
      cd eXideDev

build.properties

@@ -1 +1,7 @@
+# DO NOT MODIFY THIS FILE
+# Create a local.build.properties and overwrite the properties you would like to modify there
+
 project.version=2.3.2
+
+# path to node executables (node, npm, grunt)
+node.dir=/usr/local/bin

build.xml

@@ -9,14 +9,8 @@
     <property name="templates.dir" value="./templates"/>
     <property name="templates.default.dir" value="${templates.dir}/default"/>
     <property name="xqlint.dir" value="./support/xqlint"/>
-    <property name="closure.compiler.url" value="http://closure-compiler.googlecode.com/files/compiler-latest.zip"/>
-    <property name="rhino.url" value="https://raw.github.com/jrburke/r.js/master/lib/rhino/js.jar"/>
-    <property name="rhino.jar" value="tools/js.jar"/>
-    <property name="r.js.url" value="http://requirejs.org/docs/release/2.1.4/r.js"/>
+    <property name="closure.compiler.url" value="http://dl.google.com/closure-compiler/compiler-latest.zip"/>
     <property name="server.url" value="http://demo.exist-db.org/exist/apps/public-repo/public/"/>
-    <condition property="rhino.optimize.interpret" value="-opt -1" else="">
-        <isset property="32bit"/>
-    </condition>
     <condition property="git.commit" value="${git.commit}" else="">
         <isset property="git.commit"/>
     </condition>
@@ -32,18 +26,13 @@
                 <include name="*.zip"/>
             </fileset>
         </unzip>
+        <move todir="${tools}">
+            <fileset dir="${tools}" includes="*.jar"/>
+            <mapper type="glob" from="*.jar" to="compiler.jar"/>
+        </move>
         <delete file="${tools}/compiler-latest.zip"/>
     </target>
-    <target name="check-rhino-available">
-        <available property="rhino.available" file="${tools}/js.jar"/>
-    </target>
-    <target name="get-rhino" depends="check-rhino-available" unless="${rhino.available}">
-        <echo message="Downloading rhino..."/>
-        <mkdir dir="${tools}"/>
-        <get src="${rhino.url}" dest="${tools}"/>
-        <get src="${r.js.url}" dest="${tools}"/>
-    </target>
-    <target name="prepare" depends="get-closure,get-rhino">
+    <target name="prepare" depends="get-closure">
         <taskdef name="jscomp" classname="com.google.javascript.jscomp.ant.CompileTask" classpath="${tools}/compiler.jar"/>
     </target>
     <target name="all" depends="xqlint,compress,xar"/>
@@ -102,29 +91,31 @@
                 <file name="slick.cellrangeselector.js"/>
             </sources>
         </jscomp>
+        <jscomp compilationLevel="simple" debug="false" output="${scripts}/xqlint.min.js" languageIn="ECMASCRIPT5">
+            <sources dir="${xqlint.dir}/build">
+                <file name="xqlint.js"/>
+                <file name="jsoniq_lexer.js"/>
+                <file name="xquery_lexer.js"/>
+            </sources>
+        </jscomp>
     </target>
-    <target name="xqlint" depends="get-rhino">
+    <target name="xqlint">
         <echo message="Optimizing xqlint ..."/>
-        <copy file="tools/build.js" tofile="${xqlint.dir}/build.js"/>
-        <copy file="tools/main/main.js" tofile="${xqlint.dir}/main.js"/>
-        <java classpath="${rhino.jar}:${tools}/compiler.jar" classname="org.mozilla.javascript.tools.shell.Main" fork="true" failonerror="true">
-            <arg line="${rhino.optimize.interpret}"/>
-            <arg line="${xqlint.dir}/r.js"/>
-            <arg line="-o ${xqlint.dir}/build.js"/>
-        </java>
+        <exec executable="${node.dir}/npm" dir="${xqlint.dir}">
+            <env key="PATH" value="${env.PATH}:${node.dir}/" />
+            <arg line="install"/>
+        </exec>
+        <exec executable="${node.dir}/grunt" dir="${xqlint.dir}">
+            <env key="PATH" value="${env.PATH}:${node.dir}/" />
+            <arg line="browser_build"/>
+        </exec>
     </target>
     <target name="clean">
         <delete>
             <fileset dir="${scripts}">
                 <include name="eXide-*.min.js"/>
             </fileset>
         </delete>
-        <delete>
-            <fileset dir="${tools}">
-                <include name="js.jar"/>
-                <include name="r.js"/>
-            </fileset>
-        </delete>
         <delete failonerror="false">
             <fileset dir="${build}">
                 <include name="*.xar"/>