Use bundled ace version

eXist-db · Jun 4, 2021 · c158704 · c158704
1 parent a29f91c
commit c158704
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 14 deletions.
diff --git a/.existdb.json b/.existdb.json
@@ -0,0 +1,20 @@
+{
+    "servers": {
+        "localhost": {
+            "server": "http://localhost:8080/exist",
+            "user": "admin",
+            "password": ""
+        }
+    },
+    "sync": {
+        "server": "localhost",
+        "root": "/db/apps/eXide",
+        "active": true,
+        "ignore": [
+            ".existdb.json",
+            ".git/**",
+            "node_modules/**",
+            "bower_components/**"
+        ]
+    }
+}
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ build/*
 expath-pkg.xml
 
 resources/scripts/xqlint.min.js
+resources/scripts/ace
 
 tools/r.js
 

diff --git a/build.xml b/build.xml
@@ -14,6 +14,8 @@
     <property name="rhino.jar" value="tools/js.jar"/>
     <property name="r.js.url" value="https://requirejs.org/docs/release/2.1.4/r.js"/>
     <property name="server.url" value="http://demo.exist-db.org/exist/apps/public-repo/public/"/>
+    <property name="ace" value="${scripts}/ace"/>
+    <property name="ace.src" value="./support/ace"/>
     <condition property="rhino.optimize.interpret" value="-opt -1" else="">
         <isset property="32bit"/>
     </condition>
@@ -46,7 +48,7 @@
     <target name="prepare" depends="get-closure,get-rhino">
         <taskdef name="jscomp" classname="com.google.javascript.jscomp.ant.CompileTask" classpath="${tools}/compiler.jar"/>
     </target>
-    <target name="all" depends="xqlint,compress,xar"/>
+    <target name="all" depends="ace,xqlint,compress,xar"/>
     <target name="rebuild" depends="clean,all"/>
     <target name="compress" depends="prepare">
         <echo message="Optimizing eXide sources"/>
@@ -113,6 +115,18 @@
             <arg line="-o ${xqlint.dir}/build.js"/>
         </java>
     </target>
+    <target name="ace">
+        <mkdir dir="${ace}"/>
+        <mkdir dir="${ace.src}/build/src-min"/>
+        <mkdir dir="${ace.src}/build/kitchen-sink"/>
+        <copy todir="${ace}">
+            <fileset dir="${ace.src}/build/src-min"/>
+            <fileset dir="${ace.src}/build/kitchen-sink">
+                <!-- Required for snippet manager -->
+                <include name="demo.js"/>
+            </fileset>
+        </copy>
+    </target>
     <target name="clean">
         <delete>
             <fileset dir="${scripts}">
@@ -132,6 +146,7 @@
         </delete>
         <delete file="${scripts}/jquery/jquery.plugins.min.js"/>
         <delete file="${scripts}/xqlint.min.js"/>
+        <delete dir="${ace}"/>
         <delete file="index.html"/>
         <delete file="expath-pkg.xml"/>
     </target>

diff --git a/index.html.tmpl b/index.html.tmpl
@@ -16,19 +16,19 @@
         <script type="text/javascript" src="resources/scripts/jquery/jquery.plugins.min.js"/>
         <script type="text/javascript" src="resources/scripts/d3.v3.min.js"/>
         <script type="text/javascript" src="resources/scripts/less.min.js"/>
-        <script src="$shared/resources/scripts/ace/ace.js" type="text/javascript" charset="utf-8"/>
-        <script src="$shared/resources/scripts/ace/theme-eclipse.js" type="text/javascript" charset="utf-8"/>
-        <script src="$shared/resources/scripts/ace/mode-javascript.js" type="text/javascript" charset="utf-8"/>
-        <script src="$shared/resources/scripts/ace/mode-xml.js" type="text/javascript" charset="utf-8"/>
-        <script src="$shared/resources/scripts/ace/mode-c_cpp.js" type="text/javascript" charset="utf-8"/>
-        <script src="$shared/resources/scripts/ace/mode-html.js" type="text/javascript" charset="utf-8"/>
-        <script src="$shared/resources/scripts/ace/mode-css.js" type="text/javascript" charset="utf-8"/>
-        <script src="$shared/resources/scripts/ace/mode-less.js" type="text/javascript" charset="utf-8"/>
-        <script src="$shared/resources/scripts/ace/mode-snippets.js" type="text/javascript"/>
-        <script src="$shared/resources/scripts/ace/mode-json.js" type="text/javascript" charset="utf-8"/>
-        <script src="$shared/resources/scripts/ace/mode-markdown.js" type="text/javascript" charset="utf-8"/>
-        <script src="$shared/resources/scripts/ace/ext-language_tools.js" type="text/javascript" charset="utf-8"/>
-        <script src="$shared/resources/scripts/ace/demo.js" type="text/javascript"/>
+        <script src="resources/scripts/ace/ace.js" type="text/javascript" charset="utf-8"/>
+        <script src="resources/scripts/ace/theme-eclipse.js" type="text/javascript" charset="utf-8"/>
+        <script src="resources/scripts/ace/mode-javascript.js" type="text/javascript" charset="utf-8"/>
+        <script src="resources/scripts/ace/mode-xml.js" type="text/javascript" charset="utf-8"/>
+        <script src="resources/scripts/ace/mode-c_cpp.js" type="text/javascript" charset="utf-8"/>
+        <script src="resources/scripts/ace/mode-html.js" type="text/javascript" charset="utf-8"/>
+        <script src="resources/scripts/ace/mode-css.js" type="text/javascript" charset="utf-8"/>
+        <script src="resources/scripts/ace/mode-less.js" type="text/javascript" charset="utf-8"/>
+        <script src="resources/scripts/ace/mode-snippets.js" type="text/javascript"/>
+        <script src="resources/scripts/ace/mode-json.js" type="text/javascript" charset="utf-8"/>
+        <script src="resources/scripts/ace/mode-markdown.js" type="text/javascript" charset="utf-8"/>
+        <script src="resources/scripts/ace/ext-language_tools.js" type="text/javascript" charset="utf-8"/>
+        <script src="resources/scripts/ace/demo.js" type="text/javascript"/>
         <script type="text/javascript" src="resources/scripts/xqlint.min.js"/>
         <script type="text/javascript" src="resources/scripts/eXide.min.js"/>
         <!--script type="text/javascript" src="src/ace-modes.js"/>