Skip to content

Commit

Permalink
testdata changed
Browse files Browse the repository at this point in the history
  • Loading branch information
ilyasergey committed Dec 15, 2010
1 parent 40f36f1 commit d291fa9
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 12 deletions.
21 changes: 11 additions & 10 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<property name="project.lib" value="${project.dir}/lib"/>
<property name="project.dest" value="${project.dir}/out/production/clojure-plugin"/>
<property name="test.dest" value="${project.dir}/out/test/clojure-plugin"/>
<property name="output" value="${project.dir}/dist"/>
<property name="test.dist" value="${project.dir}/test_dist"/>
<property name="idea.pack" value="${project.dir}/idea_pack"/>
<property name="tools.jar.dir" value="${java.home}/lib"/>

Expand Down Expand Up @@ -169,13 +169,13 @@
</fileset>
</copy>

<mkdir dir="${output}"/>
<mkdir dir="${test.dist}"/>

<zip destfile="${output}/clojure-intellij-bin-${plugin.version}.zip" basedir="${project.dir}/tempjar"/>
<zip destfile="${test.dist}/clojure-intellij-bin-${plugin.version}.zip" basedir="${project.dir}/tempjar"/>
<delete dir="${project.dir}/tempjar"/>

<!-- Zip sources-->
<zip destfile="${output}/clojure-intellij-src-${plugin.version}.zip" basedir="${project.dir}"
<zip destfile="${test.dist}/clojure-intellij-src-${plugin.version}.zip" basedir="${project.dir}"
includes="src/**/*.java,
src/**/*.properties,
src/**/*.flex,
Expand Down Expand Up @@ -216,11 +216,12 @@
<target name="run.tests" depends="build.tests">

<mkdir dir="${project.dir}/logs"/>
<mkdir dir="${output}/config"/>
<mkdir dir="${output}/system"/>
<mkdir dir="${test.dist}/config"/>
<mkdir dir="${test.dist}/system"/>

<junit fork="yes"
dir="${project.dir}"
showoutput="yes"
printsummary="yes"
haltonfailure="no"
haltonerror="no">
Expand All @@ -236,12 +237,12 @@
<jvmarg value="-Djava.awt.headless=true"/>
<jvmarg value="-Xmx256M"/>
<jvmarg value="-ea"/>
<jvmarg value="-Xdebug"/>
<jvmarg value="-Djava.compiler=NONE"/>
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5549"/>

<jvmarg value="-Didea.config.path=${output}/config"/>
<jvmarg value="-Didea.system.path=${output}/system"/>
<jvmarg value="-Didea.config.path=${test.dist}/config"/>
<jvmarg value="-Didea.system.path=${test.dist}/system"/>
<jvmarg value="-Didea.plugins.path=${project.dest}/.."/>

<jvmarg value="-Didea.load.plugins.id=org.intellij.clojure"/>
Expand All @@ -256,7 +257,7 @@
</batchtest>
</junit>

<delete dir="${output}"/>
<delete dir="${test.dist}"/>
</target>

</project>
5 changes: 5 additions & 0 deletions src/org/jetbrains/plugins/clojure/config/ClojureVersion.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,13 @@ public enum ClojureVersion {

Clojure_1_1_0("1.1.0", new LibraryInfo[]{
createJarDownloadInfo("clojure.jar", "1.1.0", "clojure.main"),
}),

Clojure_1_2("1.2", new LibraryInfo[]{
createJarDownloadInfo("clojure.jar", "1.2", "clojure.main"),
});


private final String myName;
private final LibraryInfo[] myJars;

Expand Down
4 changes: 2 additions & 2 deletions src/org/jetbrains/plugins/clojure/lexer/_ClojureLexer.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d291fa9

Please sign in to comment.