Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric Thorsen authored and Eric Thorsen committed Jun 21, 2010
2 parents e960c43 + 852cd22 commit 797cc88
Show file tree
Hide file tree
Showing 33 changed files with 502 additions and 130 deletions.
236 changes: 147 additions & 89 deletions netbeans/plugins/org-enclojure-plugin/pom.xml

Large diffs are not rendered by default.

103 changes: 103 additions & 0 deletions netbeans/plugins/org-enclojure-plugin/scripts/zip_projects.clj
@@ -0,0 +1,103 @@
(ns build.zip-projects
(:require
[clojure.contrib.duck-streams :as duck-streams]
[clojure.contrib.java-utils :as java-utils]
[org.enclojure.commons.c-slf4j :as logger]
[org.enclojure.repl.main :as repl.main]
)
(:import [java.util.zip ZipOutputStream ZipEntry]
[java.io File FileOutputStream FileInputStream]
[java.util.logging Logger Level]
[java.io PipedOutputStream PipedInputStream LineNumberReader InputStreamReader File]
[org.apache.commons.exec CommandLine ExecuteResultHandler
PumpStreamHandler DefaultExecutor ExecuteException ExecuteWatchdog]
))

; setup logging
(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-project-templates-dir* (str *src-base-dir* "/ProjectTemplates"))
(def *src-project-samples-dir* (str *src-base-dir* "/SampleProjects"))
(def *filter-files* [".jar" "/private" ".class" "/classes"])

(def *dest-project-templates-dir* (str *dest-base-dir* "/templates/project"))
(def *dest-project-samples-dir* (str *dest-base-dir* "/project/samples"))

(defn get-directories [path]
(filter #(.isDirectory %)
(vec (.listFiles (java-utils/file path)))))

(defn process-completed [exit-value]
(println "Process terminated: {}" exit-value))

(defn process-failed3 [out-fn err-fn #^ExecuteException ex]
(println (format "Process failed: %s %s" (.getMessage ex)
(if-let [c (.getCause ex)]
(.getMessage c)))))

(defn monitor [stream read-fn]
(repl.main/start-io-thread
#(binding [*out* stream]
(let [msg (read-fn)]
(println "anything???")
(print msg)
(flush)))
(fn [cause]
(print "\nError in monitor\n"))))

(defn setup-monitors [out-fn err-fn]
(monitor *out* out-fn)
(monitor *out* err-fn))

(defn zip-dir [dest-zip-file src-dir]
(let [cmd-line (CommandLine. "zip")
#^DefaultExecutor executor (DefaultExecutor.)
[out-pipe err-pipe] [(PipedOutputStream.) (PipedOutputStream.)]
out-pipe-reader (LineNumberReader.
(InputStreamReader. (PipedInputStream. out-pipe)))
err-pipe-reader (LineNumberReader.
(InputStreamReader. (PipedInputStream. err-pipe)))
stream-handler (PumpStreamHandler. out-pipe err-pipe)]
(doall (map #(.addArgument cmd-line % true) ["-R" (str dest-zip-file) "*"]))
(.setWorkingDirectory executor (if (instance? java.io.File src-dir)
src-dir (java.io.File. src-dir)))
(.setWatchdog executor (ExecuteWatchdog. Integer/MAX_VALUE))
(.execute executor cmd-line (proxy [ExecuteResultHandler] []
(onProcessComplete [exit-value]
(process-completed exit-value))
(onProcessFailed [ex]
(println ex)
(println (.getCause ex))
(process-failed3
#(.readLine out-pipe-reader)
#(.readLine err-pipe-reader)
ex))))))

(defn zip-files [target-path
src-base-dir]
(let [name (.getName (java-utils/file src-base-dir))
full-target (File. (str target-path "/" name)
(str name ".zip"))]
(when (.exists full-target)
(.delete full-target))
(.mkdirs (java-utils/file (str target-path "/" name)))
(zip-dir full-target src-base-dir)))

(defn zip-it [target-path src-base-dir]
(zip-files target-path src-base-dir))

(defn zip-project-templates []
(doall (map #(zip-it *dest-project-templates-dir* %)
(get-directories *src-project-templates-dir*))))

(defn zip-project-samples []
(doall (map #(zip-it *dest-project-samples-dir* %)
(get-directories *src-project-samples-dir*))))

(zip-project-templates)
(zip-project-samples)
Expand Up @@ -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)]
Expand Down Expand Up @@ -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)]
Expand Down
Expand Up @@ -56,43 +56,43 @@

<file name="org-enclojure-ide-nb-actions-ChangeReplNamespaceAction.shadow">
<attr name="originalFile" stringvalue="Actions/Clojure/org-enclojure-ide-nb-actions-ChangeReplNamespaceAction.instance"/>
<attr name="position" intvalue="1805"/>
<attr name="position" intvalue="1804"/>
</file>
<file name="org-enclojure-ide-nb-actions-UseFileNSInReplAction.shadow">
<attr name="originalFile" stringvalue="Actions/Clojure/org-enclojure-ide-nb-actions-UseFileNSInReplAction.instance"/>
<attr name="position" intvalue="1806"/>
<attr name="position" intvalue="1805"/>
</file>
<file name="org-enclojure-nbmodule-separatorBefore.instance">
<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
<attr name="position" intvalue="1810"/>
<attr name="position" intvalue="1806"/>
</file>
<file name="org-enclojure-ide-nb-actions-GotoDeclaration.shadow">
<attr name="originalFile" stringvalue="Actions/Clojure/org-enclojure-ide-nb-actions-GotoDeclaration.instance"/>
<attr name="position" intvalue="1811"/>
<attr name="position" intvalue="1807"/>
</file>
<file name="org-enclojure-ide-nb-editor-ClojureReindentAction.shadow">
<attr name="originalFile" stringvalue="Actions/Clojure/org-enclojure-ide-nb-editor-ClojureReindentAction.instance"/>
<attr name="position" intvalue="1812"/>
<attr name="position" intvalue="1808"/>
</file>
<file name="org-enclojure-ide-nb-actions-ToggleComment.shadow">
<attr name="originalFile" stringvalue="Actions/Clojure/org-enclojure-ide-nb-actions-ToggleComment.instance"/>
<attr name="position" intvalue="1813"/>
<attr name="position" intvalue="1809"/>
</file>
<file name="org-enclojure-ide-nb-actions-SelectTopExpr.shadow">
<attr name="originalFile" stringvalue="Actions/Clojure/org-enclojure-ide-nb-actions-SelectTopExpr.instance"/>
<attr name="position" intvalue="1814"/>
<attr name="position" intvalue="1810"/>
</file>
<file name="org-enclojure-ide-nb-actions-SelectOuterExpr.shadow">
<attr name="originalFile" stringvalue="Actions/Clojure/org-enclojure-ide-nb-actions-SelectOuterExpr.instance"/>
<attr name="position" intvalue="1815"/>
<attr name="position" intvalue="1811"/>
</file>
<file name="org-enclojure-ide-nb-actions-NavByExprOut.shadow">
<attr name="originalFile" stringvalue="Actions/Clojure/org-enclojure-ide-nb-actions-NavByExprOut.instance"/>
<attr name="position" intvalue="1816"/>
<attr name="position" intvalue="1812"/>
</file>
<file name="org-enclojure-ide-nb-actions-NavByExprIn.shadow">
<attr name="originalFile" stringvalue="Actions/Clojure/org-enclojure-ide-nb-actions-NavByExprIn.instance"/>
<attr name="position" intvalue="1817"/>
<attr name="position" intvalue="1813"/>
</file>

</folder>
Expand Down Expand Up @@ -411,7 +411,7 @@
</file>
<file name="org-enclojure-ide-nb-actions-EvalExpressionInReplAction.shadow">
<attr name="originalFile" stringvalue="Actions/Edit/org-enclojure-ide-nb-actions-EvalExpressionInReplAction.instance"/>
<attr name="position" intvalue="9030"/>
<attr name="position" intvalue="9035"/>
</file>
<file name="org-enclojure-ide-nb-actions-NavByExprIn.shadow">
<attr name="originalFile" stringvalue="Actions/Edit/org-enclojure-ide-nb-actions-NavByExprIn.instance"/>
Expand Down Expand Up @@ -451,10 +451,11 @@
</file>
<file name="org-enclojure-ide-nb-actions-CreateStandaloneReplAction.shadow">
<attr name="originalFile" stringvalue="Actions/Clojure/org-enclojure-ide-nb-actions-CreateStandaloneReplAction.instance"/>
<attr name="position" intvalue="-100"/>
<attr name="position" intvalue="100"/>
</file>
<file name="ReplAction.shadow">
<attr name="originalFile" stringvalue="Actions/Window/org-enclojure-ide-nb-editor-ReplAction.instance"/>
<attr name="position" intvalue="101"/>
</file>
</folder>
<folder name="Edit">
Expand Down Expand Up @@ -634,18 +635,38 @@
<attr name="SystemFileSystem.icon"
urlvalue="nbresloc:/org/enclojure/ide/nb/clojure/project/enclojure 16x16.png"/>
</file>
<file name="Clojure 1.1 Maven Project" url="nbresloc:/org/enclojure/ide/templates/project/Clojure-1.1/Clojure-1.1.zip">
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.enclojure.ide.nb.editor.Bundle"/>
<attr name="instantiatingWizardURL"
urlvalue="nbresloc:/org/enclojure/ide/nb/clojure/project/ClojureTemplateDescription.html"/>
<attr name="instantiatingIterator"
methodvalue="org.enclojure.ide.nb.clojure.project.ClojureTemplateWizardIterator.createIterator"/>
<attr name="template" boolvalue="true"/>
<attr name="SystemFileSystem.icon"
urlvalue="nbresloc:/org/enclojure/ide/nb/clojure/project/enclojure 16x16.png"/>
</file>
<file name="Clojure 1.2-SNAPSHOT Maven Project" url="nbresloc:/org/enclojure/ide/templates/project/Clojure-1.2-SNAPSHOT/Clojure-1.2-SNAPSHOT.zip">
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.enclojure.ide.nb.editor.Bundle"/>
<attr name="instantiatingWizardURL"
urlvalue="nbresloc:/org/enclojure/ide/nb/clojure/project/ClojureTemplateDescription.html"/>
<attr name="instantiatingIterator"
methodvalue="org.enclojure.ide.nb.clojure.project.ClojureTemplateWizardIterator.createIterator"/>
<attr name="template" boolvalue="true"/>
<attr name="SystemFileSystem.icon"
urlvalue="nbresloc:/org/enclojure/ide/nb/clojure/project/enclojure 16x16.png"/>
</file>
</folder>
<folder name="Samples">
<folder name="Clojure">
<file name="Relevance LabRepl Project" url="nbresloc:/org/enclojure/ide/templates/project/RelevanceLabReplProject.zip">
<!-- <file name="Relevance LabRepl Project" url="nbresloc:/org/enclojure/ide/templates/project/RelevanceLabReplProject.zip">
<attr name="displayName"
bundlevalue="org.enclojure.ide.project.samples.Bundle#Relevance.LabRepl.name"/>
<attr name="instantiatingIterator"
methodvalue="org.enclojure.ide.project.samples.RelevanceLabReplWizardIterator.createIterator"/>
<attr name="instantiatingWizardURL"
urlvalue="nbresloc:/org/enclojure/ide/project/samples/RelevanceLabReplDescription.html"/>
<attr name="template" boolvalue="true"/>
</file>
</file>-->
</folder>
</folder>
</folder>
Expand Down
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 2 additions & 1 deletion org-enclojure-commons/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.enclojure</groupId>
<artifactId>nb-enclojure-app</artifactId>
<version>1.1</version>
<version>${enclojure.version.release}</version>
</parent>
<artifactId>org-enclojure-commons</artifactId>
<version>1.0-SNAPSHOT</version>
Expand Down
2 changes: 1 addition & 1 deletion org-enclojure-ide/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>nb-enclojure-app</artifactId>
<groupId>org.enclojure</groupId>
<version>1.1</version>
<version>${enclojure.version.release}</version>
</parent>
<groupId>org.enclojure</groupId>
<artifactId>org-enclojure-ide</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion org-enclojure-repl-client/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>nb-enclojure-app</artifactId>
<groupId>org.enclojure</groupId>
<version>1.1</version>
<version>${enclojure.version.release}</version>
</parent>
<groupId>org.enclojure</groupId>
<artifactId>org-enclojure-repl-client</artifactId>
Expand Down
Expand Up @@ -182,10 +182,12 @@ For seeing the command line use:"
out-pipe-reader (LineNumberReader.
(InputStreamReader. (PipedInputStream. out-pipe)))
err-pipe-reader (LineNumberReader.
(InputStreamReader. (PipedInputStream. err-pipe)))]
(InputStreamReader. (PipedInputStream. err-pipe)))
stream-handler (PumpStreamHandler. out-pipe err-pipe)]
(.setWorkingDirectory executor (if (instance? java.io.File working-dir)
working-dir (java.io.File. working-dir)))
(.setStreamHandler executor (PumpStreamHandler. out-pipe err-pipe))
(.setStreamHandler executor stream-handler)
(.start stream-handler)
(process-monitor-fn
#(.readLine out-pipe-reader)
#(.readLine err-pipe-reader))
Expand Down
2 changes: 1 addition & 1 deletion org-enclojure-repl-server/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>nb-enclojure-app</artifactId>
<groupId>org.enclojure</groupId>
<version>1.1</version>
<version>${enclojure.version.release}</version>
</parent>
<groupId>org.enclojure</groupId>
<artifactId>org-enclojure-repl-server</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Expand Up @@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http//www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<properties>
<clojure.version>1.1.0</clojure.version>
<clojure.snaphot-name></clojure.snaphot-name>
<clojure-contrib.snaphot-name></clojure-contrib.snaphot-name>
<clojure.snapshot.tag></clojure.snapshot.tag>
<clojure.contrib.snapshot.tag></clojure.contrib.snapshot.tag>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netbeans.version>RELEASE68</netbeans.version>
<brandingToken>enclojure</brandingToken>
Expand All @@ -28,12 +28,12 @@
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
<version>${clojure.version}${clojure.snaphot-name}</version>
<version>${clojure.version}${clojure.snapshot.tag}</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure-contrib</artifactId>
<version>${clojure.version}${clojure-contrib.snaphot-name}</version>
<version>${clojure.version}${clojure.contrib.snapshot.tag}</version>
</dependency>
</dependencies>
<repositories>
Expand Down
2 changes: 1 addition & 1 deletion project.properties
@@ -1 +1 @@
enclojure.version.release=1.4
enclojure.version.release=1.4
Binary file added templates/Clojure.1-1.zip
Binary file not shown.

0 comments on commit 797cc88

Please sign in to comment.