Skip to content
Browse files

removed AOT compilation

  • Loading branch information...
1 parent fbcc9f7 commit db0db9c74c2706dedaa1d965d1ec31ae5ad527fa @slagyr committed Jan 5, 2011
Showing with 187 additions and 120 deletions.
  1. +3 −0 .idea/misc.xml
  2. +167 −117 .idea/workspace.xml
  3. +1 −0 CHANGES.md
  4. +0 −2 project.clj
  5. +15 −0 src/speclj/main.java
  6. +1 −1 src/speclj/version.clj
View
3 .idea/misc.xml
@@ -6,6 +6,9 @@
<component name="DependencyValidationManager">
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
</component>
+ <component name="EntryPointsManager">
+ <entry_points version="2.0" />
+ </component>
<component name="IdProvider" IDEtalkID="2DA5EF36C41BA68D425CC913E46BC55F" />
<component name="JavadocGenerationManager">
<option name="OUTPUT_DIRECTORY" />
View
284 .idea/workspace.xml
@@ -2,12 +2,12 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="92049f6f-a13c-41db-a1c6-8945dfe47517" name="Default" comment="">
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/speclj/main.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGES.md" afterPath="$PROJECT_DIR$/CHANGES.md" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TODO.md" afterPath="$PROJECT_DIR$/TODO.md" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/spec/speclj/core_spec.clj" afterPath="$PROJECT_DIR$/spec/speclj/core_spec.clj" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/speclj/running.clj" afterPath="$PROJECT_DIR$/src/speclj/running.clj" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/project.clj" afterPath="$PROJECT_DIR$/project.clj" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/speclj/version.clj" afterPath="$PROJECT_DIR$/src/speclj/version.clj" />
</list>
<ignored path="$USER_HOME_GRAILS$/" />
<ignored path="$USER_HOME_GRIFFON$/" />
@@ -66,91 +66,19 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="README.md" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/README.md">
- <provider selected="true" editor-type-id="text-editor">
- <state line="7" column="79" selection-start="266" selection-end="266" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="TODO.md" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/TODO.md">
+ <file leaf-file-name="vigilant_spec.clj" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/spec/speclj/run/vigilant_spec.clj">
<provider selected="true" editor-type-id="text-editor">
- <state line="4" column="18" selection-start="89" selection-end="89" vertical-scroll-proportion="0.0">
+ <state line="161" column="19" selection-start="8164" selection-end="8164" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="vigilant.clj" pinned="false" current="false" current-in-tab="false">
+ <file leaf-file-name="vigilant.clj" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/speclj/run/vigilant.clj">
<provider selected="true" editor-type-id="text-editor">
- <state line="51" column="37" selection-start="1801" selection-end="1801" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="core.clj" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/speclj/core.clj">
- <provider selected="true" editor-type-id="text-editor">
- <state line="163" column="56" selection-start="6898" selection-end="6898" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="running.clj" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/speclj/running.clj">
- <provider selected="true" editor-type-id="text-editor">
- <state line="45" column="16" selection-start="1601" selection-end="1601" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="CHANGES.md" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/CHANGES.md">
- <provider selected="true" editor-type-id="text-editor">
- <state line="2" column="57" selection-start="66" selection-end="66" vertical-scroll-proportion="0.03448276">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="running_spec.clj" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/spec/speclj/running_spec.clj">
- <provider selected="true" editor-type-id="text-editor">
- <state line="75" column="42" selection-start="2343" selection-end="2343" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="core_spec.clj" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/spec/speclj/core_spec.clj">
- <provider selected="true" editor-type-id="text-editor">
- <state line="79" column="0" selection-start="2378" selection-end="2378" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="main.clj" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/speclj/main.clj">
- <provider selected="true" editor-type-id="text-editor">
- <state line="76" column="24" selection-start="2576" selection-end="2576" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="vigilant_spec.clj" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/spec/speclj/run/vigilant_spec.clj">
- <provider selected="true" editor-type-id="text-editor">
- <state line="161" column="19" selection-start="8164" selection-end="8164" vertical-scroll-proportion="0.0">
+ <state line="51" column="37" selection-start="1801" selection-end="1801" vertical-scroll-proportion="-1.862069">
<folding />
</state>
</provider>
@@ -170,22 +98,22 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/src/speclj/report/progress.clj" />
- <option value="$PROJECT_DIR$/src/speclj/components.clj" />
- <option value="$PROJECT_DIR$/src/speclj/report/specdoc.clj" />
<option value="$PROJECT_DIR$/spec/speclj/report/specdoc_spec.clj" />
<option value="$PROJECT_DIR$/src/speclj/config.clj" />
<option value="$PROJECT_DIR$/spec/speclj/reporting_spec.clj" />
<option value="$PROJECT_DIR$/src/leiningen/spec.clj" />
<option value="$PROJECT_DIR$/TODO.md" />
<option value="$PROJECT_DIR$/spec/speclj/run/vigilant_spec.clj" />
<option value="$PROJECT_DIR$/src/speclj/run/vigilant.clj" />
- <option value="$PROJECT_DIR$/src/speclj/version.clj" />
<option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/spec/speclj/running_spec.clj" />
<option value="$PROJECT_DIR$/spec/speclj/core_spec.clj" />
<option value="$PROJECT_DIR$/src/speclj/running.clj" />
+ <option value="$PROJECT_DIR$/project.clj" />
+ <option value="$PROJECT_DIR$/src/speclj/main.java" />
+ <option value="$PROJECT_DIR$/src/speclj/main.clj" />
<option value="$PROJECT_DIR$/CHANGES.md" />
+ <option value="$PROJECT_DIR$/src/speclj/version.clj" />
</list>
</option>
</component>
@@ -278,6 +206,46 @@
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="speclj" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="run" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="speclj" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="speclj" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="speclj" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="speclj" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="spec" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="speclj" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -296,6 +264,10 @@
<option name="myItemId" value="speclj" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="run" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
</subPane>
</pane>
@@ -659,16 +631,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/spec/speclj/report/specdoc_spec.clj">
- <provider selected="true" editor-type-id="text-editor">
- <state line="53" column="200" selection-start="2085" selection-end="2085" vertical-scroll-proportion="1.316294" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/speclj/report/specdoc.clj">
- <provider selected="true" editor-type-id="text-editor">
- <state line="40" column="195" selection-start="1415" selection-end="1415" vertical-scroll-proportion="1.5335463" />
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/speclj/config.clj">
<provider selected="true" editor-type-id="text-editor">
<state line="26" column="72" selection-start="776" selection-end="776" vertical-scroll-proportion="0.0" />
@@ -684,79 +646,167 @@
<state line="8" column="0" selection-start="281" selection-end="281" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/speclj/version.clj">
+ <entry file="file://$PROJECT_DIR$/TODO.md">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="19" selection-start="123" selection-end="123" vertical-scroll-proportion="0.0" />
+ <state line="4" column="18" selection-start="89" selection-end="89" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/README.md">
+ <entry file="file://$PROJECT_DIR$/src/speclj/core.clj">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="79" selection-start="266" selection-end="266" vertical-scroll-proportion="0.0" />
+ <state line="163" column="56" selection-start="6898" selection-end="6898" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/TODO.md">
+ <entry file="file://$PROJECT_DIR$/spec/speclj/running_spec.clj">
<provider selected="true" editor-type-id="text-editor">
- <state line="4" column="18" selection-start="89" selection-end="89" vertical-scroll-proportion="0.0" />
+ <state line="75" column="42" selection-start="2343" selection-end="2343" vertical-scroll-proportion="1.2931035">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/speclj/run/vigilant.clj">
+ <entry file="file://$PROJECT_DIR$/spec/speclj/core_spec.clj">
<provider selected="true" editor-type-id="text-editor">
- <state line="51" column="37" selection-start="1801" selection-end="1801" vertical-scroll-proportion="0.0">
+ <state line="79" column="0" selection-start="2378" selection-end="2378" vertical-scroll-proportion="0.6954023">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/spec/speclj/run/vigilant_spec.clj">
+ <entry file="file://$PROJECT_DIR$/src/speclj/running.clj">
<provider selected="true" editor-type-id="text-editor">
- <state line="161" column="19" selection-start="8164" selection-end="8164" vertical-scroll-proportion="0.0" />
+ <state line="45" column="16" selection-start="1601" selection-end="1601" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/speclj/core.clj">
+ <entry file="file://$PROJECT_DIR$/project.clj">
<provider selected="true" editor-type-id="text-editor">
- <state line="163" column="56" selection-start="6898" selection-end="6898" vertical-scroll-proportion="0.0">
+ <state line="13" column="0" selection-start="494" selection-end="494" vertical-scroll-proportion="0.22413793">
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/speclj/main.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="15" column="0" selection-start="327" selection-end="327" vertical-scroll-proportion="0.25862068">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/src/speclj/main.clj">
<provider selected="true" editor-type-id="text-editor">
- <state line="76" column="24" selection-start="2576" selection-end="2576" vertical-scroll-proportion="0.0" />
+ <state line="109" column="20" selection-start="3690" selection-end="3690" vertical-scroll-proportion="1.8793104">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/spec/speclj/running_spec.clj">
+ <entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor">
- <state line="75" column="42" selection-start="2343" selection-end="2343" vertical-scroll-proportion="0.0">
+ <state line="7" column="79" selection-start="266" selection-end="266" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/spec/speclj/core_spec.clj">
+ <entry file="file://$PROJECT_DIR$/CHANGES.md">
<provider selected="true" editor-type-id="text-editor">
- <state line="79" column="0" selection-start="2378" selection-end="2378" vertical-scroll-proportion="0.0">
+ <state line="3" column="92" selection-start="159" selection-end="159" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/speclj/running.clj">
+ <entry file="file://$PROJECT_DIR$/src/speclj/version.clj">
<provider selected="true" editor-type-id="text-editor">
- <state line="45" column="16" selection-start="1601" selection-end="1601" vertical-scroll-proportion="0.0">
+ <state line="12" column="79" selection-start="271" selection-end="271" vertical-scroll-proportion="0.20689656">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/CHANGES.md">
+ <entry file="file://$PROJECT_DIR$/spec/speclj/run/vigilant_spec.clj">
<provider selected="true" editor-type-id="text-editor">
- <state line="2" column="57" selection-start="66" selection-end="66" vertical-scroll-proportion="0.03448276">
+ <state line="161" column="19" selection-start="8164" selection-end="8164" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/speclj/run/vigilant.clj">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="51" column="37" selection-start="1801" selection-end="1801" vertical-scroll-proportion="-1.862069">
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
+ <state key="ArtifactsStructureConfigurable.UI">
+ <settings>
+ <artifact-editor />
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="FacetStructureConfigurable.UI">
+ <settings>
+ <last-edited>Android</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="GlobalLibrariesConfigurable.UI">
+ <settings>
+ <last-edited>[gem] actionmailer (v1.3.6, /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/gems/1.8/gems/actionmailer-1.3.6)</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="JdkListConfigurable.UI">
+ <settings>
+ <last-edited>1.5</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
<state key="ModuleStructureConfigurable.UI">
<settings>
- <splitter-proportions />
+ <last-edited>speclj</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="ProjectLibrariesConfigurable.UI">
+ <settings>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
</settings>
</state>
</states>
View
1 CHANGES.md
@@ -1,6 +1,7 @@
# 1.2.0
* around components now execute around befores and afters
+* removed AOT compilation of clojure src which caused problems on other versions of clojure.
# 1.1.0
View
2 project.clj
@@ -9,7 +9,5 @@
:dependencies [[org.clojure/clojure "1.2.0"]]
:dev-dependencies [[lein-clojars "0.6.0"]]
:test-path "spec/"
- :main speclj.main
- :aot [speclj.running speclj.reporting]
:java-source-path "src/"
)
View
15 src/speclj/main.java
@@ -0,0 +1,15 @@
+package speclj;
+
+import clojure.lang.RT;
+import clojure.lang.Var;
+
+public class main
+{
+ public static void main(String[] args) throws Exception
+ {
+ RT.loadResourceScript("speclj/main.clj");
+ Var main = RT.var("speclj.main", "-main");
+ Var apply = RT.var("clojure.core", "apply");
+ apply.invoke(main, args);
+ }
+}
View
2 src/speclj/version.clj
@@ -3,7 +3,7 @@
[clojure.string :as str]))
(def major 1)
-(def minor 1)
+(def minor 2)
(def tiny 0)
(def snapshot false)
(def string

0 comments on commit db0db9c

Please sign in to comment.
Something went wrong with that request. Please try again.