Continuing to work on added the embedded platform to automatically sh…

…ow up in the platform definitions.
ericthorsen · Sep 11, 2009 · 5be0f7b · 5be0f7b
1 parent 31c18ef
commit 5be0f7b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 26 deletions.
diff --git a/src/commons/src/org/enclojure/commons/c_slf4j.clj b/src/commons/src/org/enclojure/commons/c_slf4j.clj
@@ -31,18 +31,18 @@ NOTE: the def-logging-fn must be called in your file in order to use these macro
 It creates a logger using the namespace bound to *ns* at compile time."
   ([level msg]
     `(let [msg# ~msg]
-       (~@(list '. '--logger--) (~level msg#))))
+       (~@(list '. '--logger--) (~level #^String msg#))))
   ([level fmt obj]    
     `(let [fmt# ~fmt obj# ~obj]
-        (~@(list '. '--logger--) (~level fmt# obj#))))
+        (~@(list '. '--logger--) (~level #^String fmt# obj#))))
   ([level fmt obj1 obj2]
     `(let [fmt# ~fmt obj1# ~obj1 obj2# ~obj2]
-        (~@(list '. '--logger--) (~level fmt# obj1# obj2#))))
+        (~@(list '. '--logger--) (~level #^String fmt# obj1# obj2#))))
   ([level fmt obj1 obj2 objs]
     `(let [fmt# ~fmt 
            objs# (into-array java.lang.Object  [~obj1 ~obj2 ~@objs])]
         (~@(list '. '--logger--)
-            (~level  ~fmt  objs#)))))
+            (~level  #^String ~fmt #^"[Ljava.lang.Object;" objs#)))))
 
 (defmacro log-throwable
   ([level msg throwable]

diff --git a/src/enclojure.plugin.netbeans/build.xml b/src/enclojure.plugin.netbeans/build.xml
@@ -17,17 +17,17 @@
 <!--	<import file="${workdir}build${file.separator}common.xml"/> -->
 
  	<target name="copylibs" >
-		<copy  file="${java.home}${file.separator}..${file.separator}lib${file.separator}tools.jar" tofile="release/modules/ext/tools.jar" failonerror="false" /> 
- 		<copy file="${shared.libs}Clojure${file.separator}clojure${clojure-version}.jar" tofile="release/modules/ext/clojure${clojure-version}.jar" />
- 		<copy file="${shared.libs}Clojure-contrib${file.separator}clojure-contrib${clojure-version}.jar" tofile="release/modules/ext/clojure-contrib${clojure-version}.jar" />
- 		<copy file="${shared.libs}/Apache/commons-exec-1.0.0.jar" tofile="release/modules/ext/commons-exec-1.0.0.jar" />
- 		<copy file="${shared.libs}/slf4j/slf4j-api-1.5.8.jar" tofile="release/modules/ext/slf4j-api-1.5.8.jar" />
- 		<copy file="${shared.libs}/slf4j/slf4j-jdk14-1.5.8.jar" tofile="release/modules/ext/slf4j-jdk14-1.5.8.jar" />
+            <copy  file="${java.home}${file.separator}..${file.separator}lib${file.separator}tools.jar" tofile="release/modules/ext/tools.jar" failonerror="false" />
+            <copy file="${shared.libs}Clojure${file.separator}clojure${clojure-version}.jar" tofile="release/modules/ext/clojure${clojure-version}.jar" />
+            <copy file="${shared.libs}Clojure-contrib${file.separator}clojure-contrib${clojure-version}.jar" tofile="release/modules/ext/clojure-contrib${clojure-version}.jar" />
+            <copy file="${shared.libs}/Apache/commons-exec-1.0.0.jar" tofile="release/modules/ext/commons-exec-1.0.0.jar" />
+            <copy file="${shared.libs}/slf4j/slf4j-api-1.5.8.jar" tofile="release/modules/ext/slf4j-api-1.5.8.jar" />
+            <copy file="${shared.libs}/slf4j/slf4j-jdk14-1.5.8.jar" tofile="release/modules/ext/slf4j-jdk14-1.5.8.jar" />
 
-                <copy file="${projects.root}commons${file.separator}${dist.path}${file.separator}org.enclojure.commons.jar" tofile="release/modules/ext/org.enclojure.commons.jar" />
- 		<copy file="${projects.root}ide${file.separator}${dist.path}${file.separator}org.enclojure.ide.jar" tofile="release/modules/ext/org.enclojure.ide.jar" />
- 		<copy file="${projects.root}repl-server${file.separator}${dist.path}${file.separator}org.enclojure.repl-server.jar" tofile="release/modules/ext/org.enclojure.repl-server.jar" />
-		<copy file="${projects.root}repl-client${file.separator}${dist.path}${file.separator}org.enclojure.repl-client.jar" tofile="release/modules/ext/org.enclojure.repl-client.jar" /> 
+            <copy file="${projects.root}commons${file.separator}${dist.path}${file.separator}org.enclojure.commons.jar" tofile="release/modules/ext/org.enclojure.commons.jar" />
+            <copy file="${projects.root}ide${file.separator}${dist.path}${file.separator}org.enclojure.ide.jar" tofile="release/modules/ext/org.enclojure.ide.jar" />
+            <copy file="${projects.root}repl-server${file.separator}${dist.path}${file.separator}org.enclojure.repl-server.jar" tofile="release/modules/ext/org.enclojure.repl-server.jar" />
+            <copy file="${projects.root}repl-client${file.separator}${dist.path}${file.separator}org.enclojure.repl-client.jar" tofile="release/modules/ext/org.enclojure.repl-client.jar" />
 	</target>
 
     <target name="zip.project.template">

diff --git a/src/enclojure.plugin.netbeans/nbproject/project.xml b/src/enclojure.plugin.netbeans/nbproject/project.xml
@@ -473,11 +473,11 @@
             </public-packages>
             <class-path-extension>
                 <runtime-relative-path>ext/clojure-1.09.11.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/clojure-1.0.0.jar</binary-origin>
+                <binary-origin>release/modules/ext/clojure-1.09.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/clojure-contrib-1.09.11.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/clojure-contrib-1.0.0.jar</binary-origin>
+                <binary-origin>release/modules/ext/clojure-contrib-1.09.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-exec-1.0.0.jar</runtime-relative-path>

diff --git a/src/enclojure.plugin.netbeans/src/org/enclojure/ide/preferences/platform_options.clj b/src/enclojure.plugin.netbeans/src/org/enclojure/ide/preferences/platform_options.clj
@@ -55,16 +55,20 @@
 (def -clojure-default-platform-name- -default-platform-)
 (def #^{:private true} -prefs-category- "platforms")
 
-(defn create-library [name classpaths]
+(defn create-library 
+  "Create a library in the netbeans library manager."
+  [name classpaths]
   (.createLibrary (LibraryManager/getDefault)
-                  "j2se"
-                  name
-                  {"classpath"
-                   (reduce #(conj %1
-                              (URL. (str "jar:file:"
-                                      (.replace
-                                        (.getFile (.toURL (java.io.File. %2))) " " "%20") "!/")))
-                     [] classpaths)}))
+    "j2se"
+    name
+    {"classpath"
+     (reduce
+       #(conj %1
+          (URL. (str "jar:file:"
+                  (.replace
+                    (.getFile
+                      (.toURL (java.io.File. %2))) " " "%20") "!/")))
+       [] classpaths)}))
 
 (defn proper-libname
   [name]
@@ -103,7 +107,7 @@
             (recur (.getNextEntry istream) (conj lib-names full-name))))
         lib-names))))
 
-(defn get-defined-platforms
+(defn get-defined-platforms  
   []
   (let [platforms (FileUtil/getConfigFile -system-folder-for-platforms-)
         base-path (str (pref-utils/get-pref-file-base)