cleanup

cprice404 · Oct 16, 2011 · 1b946e0 · 1b946e0
1 parent 09df48d
commit 1b946e0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -17,7 +17,7 @@
     Inc.
   </vendor>
   <!--<idea-version since-build="SINCE_IDEA" until-build="UNTIL_IDEA"/>-->
-  <idea-version since-build="IU-110.124" until-build="IU-110.9999"/>
+  <idea-version since-build="IC-110.124" until-build="IC-110.9999"/>
 
   <extensions defaultExtensionNs="com.intellij">
     <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>

diff --git a/build.xml b/build.xml
@@ -36,9 +36,7 @@
       <include name="**/*.jar"/>
     </fileset>
     <fileset dir="${idea.home}/plugins">
-      <include name="CSS/lib/*.jar"/>
-      <include name="**/JavascriptLanguage.jar"/>
-      <include name="**/JavaScriptLanguage/lib/resurces_en.jar"/>
+      <include name="**/*.jar"/>
     </fileset>
   </path>
 
@@ -245,7 +243,7 @@
 
   </target>
 
-  <target name="run.tests" depends="build.tests">
+  <target name="run.tests">
 
     <mkdir dir="${test.dist}"/>
     <mkdir dir="${project.dir}/logs"/>
@@ -271,15 +269,14 @@
       <jvmarg value="-Xmx256M"/>
       <jvmarg value="-ea"/>
       <jvmarg value="-Djava.compiler=NONE"/>
-      <jvmarg value="-Xdebug"/>
-      <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5549"/>
+      <!--<jvmarg value="-Xdebug"/>-->
+      <!--<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5549"/>-->
 
+      <!-- Useful for internal tests -->
+      <jvmarg value="-Didea.platform.prefix=Idea"/>
       <jvmarg value="-Didea.config.path=${test.dist}/config"/>
       <jvmarg value="-Didea.system.path=${test.dist}/system"/>
       <jvmarg value="-Didea.plugins.path=${project.dest}/.."/>
-      <!-- Useful for internal tests -->
-      <!--<jvmarg value="-Didea.platform.prefix=Idea"/>-->
-
       <jvmarg value="-Didea.load.plugins.id=org.intellij.clojure"/>
 
       <formatter type="plain"/>

diff --git a/clojure.properties b/clojure.properties
@@ -1,3 +1,3 @@
-idea.home=/Users/ilya/work/idea-11-work/
+idea.home=/Applications/Nika-IC-110.124.app/
 clojure.lib=/Users/ilya/work/git/clojure
 clojure.contrib=/Users/ilya/work/git/clojure-contrib
diff --git a/lib/boot/boot.jar b/lib/boot/boot.jar
diff --git a/src/org/jetbrains/plugins/clojure/lexer/_ClojureLexer.java b/src/org/jetbrains/plugins/clojure/lexer/_ClojureLexer.java