Skip to content
Browse files

Reverted back to clojure 1.1

  • Loading branch information...
1 parent d52bd53 commit b2cff3d92fcdf59fc9aeec2f96389169b3d8bad7 @EricThorsen committed
View
7 netbeans/plugins/org-enclojure-plugin/scripts/zip_projects.clj
@@ -17,8 +17,10 @@
(logger/ensure-logger)
-(def *src-base-dir* (str (System/getProperty "user.dir") "/../../../templates/netbeans"))
-(def *dest-base-dir* (str (System/getProperty "user.dir") "/src/main/resources/org/enclojure/ide"))
+(def *src-base-dir* (str (System/getProperty "user.dir")
+ "/../../../templates/netbeans"))
+(def *dest-base-dir* (str (System/getProperty "user.dir")
+ "/src/main/resources/org/enclojure/ide"))
(def *src-project-templates-dir* (str *src-base-dir* "/ProjectTemplates"))
(def *src-project-samples-dir* (str *src-base-dir* "/SampleProjects"))
@@ -39,7 +41,6 @@
(if-let [c (.getCause ex)]
(.getMessage c)))))
-
(defn monitor [stream read-fn]
(repl.main/start-io-thread
#(binding [*out* stream]
View
2 ...lugins/org-enclojure-plugin/src/main/clojure/org/enclojure/ide/common/classpath_utils.clj
@@ -302,6 +302,7 @@ use on a jvm startup."
"For a given project we want a map of:
{:source-roots :execute-paths}"
([#^Project p]
+ (logger/info "might be a sub-project call for " p)
(when p
(loop [sources (get-source-roots p) ret {}]
(if-let [source (first sources)]
@@ -340,6 +341,7 @@ in order to promote clojure finding the source and loading that before anything
(loop [sub-projects
(when-let [subpp (-> p .getLookup
(.lookup org.netbeans.spi.project.SubprojectProvider))]
+ (logger/info "Found subproject..............")
(.getSubprojects subpp))
cps {}]
(if-let [subp (first sub-projects)]
View
1 templates/netbeans/ProjectTemplates/Clojure-1.2-SNAPSHOT/pom.xml
@@ -97,3 +97,4 @@
</dependency>
</dependencies>
</project>
+

0 comments on commit b2cff3d

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