diff options
| -rw-r--r-- | README.txt | 28 | ||||
| -rw-r--r-- | modules/combinatorics/src/main/clojure/clojure/contrib/combinatorics.clj | 2 | ||||
| -rw-r--r-- | modules/parent/pom.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 10 | ||||
| -rw-r--r-- | src/main/assembly/dist.xml | 29 |
5 files changed, 68 insertions, 5 deletions
@@ -48,7 +48,7 @@ This will compile and test all modules and store them in your local Maven repository cache (usually $HOME/.m2/repository). There is also an "uberjar" containing all compiled modules at -./modules/complete/target/complete-$VERSION-jar-with-dependencies.jar +./modules/complete/target/complete-$VERSION-bin.jar Additional build commands are available: @@ -69,6 +69,30 @@ to the mvn command line. += Building Against Specific Released Clojure Versions = + +You can specify -Dclojure.version=VERSION on the command line to select a different Clojure version. + + + += Building Against a Custom Clojure JAR = + +To build against a customized Clojure JAR, build *Clojure* like this: + +1. Modify the Clojure sources with your custom changes + +2. Set a custom version number in src/clj/clojure/version.properties + +3. Download maven-ant-tasks.jar from http://maven.apache.org/ant-tasks/download.html + +4. In the Clojure source directory, run: + + ant -lib /path/to/maven-ant-tasks.jar ci-build + +THEN, build clojure-contrib with -Dclojure.version=YOUR_CUSTOM_VERSION + + + = Clojure-contrib Versions = Versions of clojure-contrib are matched to versions of Clojure. @@ -79,6 +103,8 @@ If you are using Clojure 1.1, use clojure-contrib 1.1.* If you are using Clojure 1.2, use clojure-contrib 1.2.* +If you are using Clojure 1.3, use clojure-contrib 1.3.* + If you are using Clojure from the "master" branch on Github, use clojure-contrib from the "master" branch on Github. diff --git a/modules/combinatorics/src/main/clojure/clojure/contrib/combinatorics.clj b/modules/combinatorics/src/main/clojure/clojure/contrib/combinatorics.clj index 1be12aa4..5ca2b581 100644 --- a/modules/combinatorics/src/main/clojure/clojure/contrib/combinatorics.clj +++ b/modules/combinatorics/src/main/clojure/clojure/contrib/combinatorics.clj @@ -120,7 +120,7 @@ for a longer description.)"} (when v-seqs
(cons (map first v-seqs)
(lazy-seq (step (increment v-seqs)))))))]
- (when (every? first seqs)
+ (when (every? seq seqs)
(lazy-seq (step v-original-seqs)))))
diff --git a/modules/parent/pom.xml b/modules/parent/pom.xml index 37afa6f3..6c9c6f66 100644 --- a/modules/parent/pom.xml +++ b/modules/parent/pom.xml @@ -3,12 +3,12 @@ <project> <modelVersion>4.0.0</modelVersion> <properties> - <clojure.version>1.3.0-alpha1</clojure.version> + <clojure.version>1.3.0-master-SNAPSHOT</clojure.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <groupId>org.clojure.contrib</groupId> <artifactId>parent</artifactId> - <version>1.3.0-alpha1</version> + <version>1.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Clojure Contrib parent module</name> <dependencies> @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.clojure.contrib</groupId> <artifactId>clojure-contrib</artifactId> - <version>1.3.0-alpha1</version> + <version>1.3.0-SNAPSHOT</version> <url>http://clojure.org/</url> <description>Clojure user contributions library.</description> <name>Clojure Contrib</name> @@ -88,6 +88,14 @@ <autoVersionSubmodules>true</autoVersionSubmodules> </configuration> </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/dist.xml</descriptor> + </descriptors> + </configuration> + </plugin> </plugins> </build> <distributionManagement> diff --git a/src/main/assembly/dist.xml b/src/main/assembly/dist.xml new file mode 100644 index 00000000..738c54fb --- /dev/null +++ b/src/main/assembly/dist.xml @@ -0,0 +1,29 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + <id>dist</id> + <formats> + <format>zip</format> + <format>tar.gz</format> + <format>tar.bz2</format> + </formats> + <fileSets> + <fileSet> + <directory>${project.basedir}</directory> + <outputDirectory>/</outputDirectory> + <useDefaultExcludes>true</useDefaultExcludes> + <includes> + <include>README.txt</include> + <include>Revisions</include> + <include>clojurescript/**</include> + <include>config/**</include> + <include>doc/**</include> + <include>epl-v10.html</include> + <include>launchers/**</include> + <include>modules/**</include> + <include>pom.xml</include> + <include>src/**</include> + </includes> + </fileSet> + </fileSets> +</assembly>
\ No newline at end of file |