Skip to content
This repository has been archived by the owner on Jan 28, 2019. It is now read-only.

Commit

Permalink
Merge pull request #84 from jaunt-lang/change-base-version
Browse files Browse the repository at this point in the history
Set base version to 1.9.0
  • Loading branch information
arrdem committed Mar 6, 2016
2 parents 088077a + 79d3f2d commit 480d851
Show file tree
Hide file tree
Showing 18 changed files with 161 additions and 2,303 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ maven-classpath
maven-classpath.properties
.idea/
src/resources/clojure
user.clj
*.html
.lein-env
*.iml
53 changes: 53 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
## Change Log

### upcoming
- [#78](https://github.com/jaunt-lang/jaunt/pull/78) Clean up warnings from #62 (@arrdem).
- Fix warning that `clojure.core/global-higherarchy` looses `^:private` during reloading due to a
forward declaration lacking the appropriate tag.
- Fix warning that `clojure.core/process-annotation` looses `^:private` during reloading due to a
forward declaration lacking the appropriate tag.
- [#76](https://github.com/jaunt-lang/jaunt/pull/76) Rename project to Jaunt (@arrdem).
- Renames the project from `me.arrdem/clojarr` to `org.jaunt-lang/jaunt`.
- [#71](https://github.com/jaunt-lang/jaunt/pull/71) Bugfix: [CLJ-1579](http://dev.clojure.org/jira/browse/CLJ-1579) (@arrdem).
- Fixes a bug where `clojure.repl/source-fn` could fail to read the source for a symbol if the
symbol makes textual use of reader namespaced keywords.
- [#62](https://github.com/jaunt-lang/jaunt/pull/62) Var metadata contracts (@arrdem).
- Enforce a strict contract between `^:private`, `^:dynamic`, `^:once` as metadata on a `Var` and
the `isDynamic`/`setDynamic`,`isOnce`/`setOnce`, `isPublic`/`setPublic` methods on the
`Var`. Ensures that for instance a `Var` can never have `isDynamic → true` without having the
`^:dynamic` metadata, and that if the `^:dynamic` flag is lost, the `Var` will correctly state
`isDynamic → false`.
- Adds a warning when `^:private` is discarded.
- Adds a warning when `^:dynamic` is discarded.
- Adds a warning when `^:once` is discarded.
- [#52](https://github.com/jaunt-lang/jaunt/pull/52) Add `clojure.core/*line*` and `clojure.core/*column*` (@arrdem).
- Exposes the line and column positions (as integers) of the top level form being compiled/evaluated.
- [#50](https://github.com/jaunt-lang/jaunt/pull/50) Add `clojure.core/ns?` (@arrdem).
- Adds a `ns?` type predicate.
- [#48](https://github.com/jaunt-lang/jaunt/pull/48) Promote `clojure.core/ns-name` from ^:deprecated (@arrdem).
- Removes the `^:deprecated` flag from `ns-name`
- Use `clojure.lang.Namespace.name:Symbol` rather than making a new `Symbol` from the ns's name `String`.
- [#44](https://github.com/jaunt-lang/jaunt/pull/44) Bugfix: correct `clojure.core/ns-name` return type (@arrdem).
- Corrects `ns-name` to return a `Symbol` as before.
- Broken by #38
- [#38](https://github.com/jaunt-lang/jaunt/pull/38) Named on Namespaces (@arrdem).
- Implements the `clojure.lang.Named` interface over `clojure.lang.Namespace`.
- **Breaks** `clojure.lang.Namespace.getName()`. Previously returned `Symbol`, now returns `String`.
- [#37](https://github.com/jaunt-lang/jaunt/pull/37) Named on Vars (@arrdem).
- Implements the `clojure.lang.Named` interface over `clojure.lang.Var`.
- [#2](https://github.com/jaunt-lang/jaunt/pull/2) Pedantic compiler options (@arrdem).
- Added `:warn-on-deprecated` (true by default) as a compiler option. When true, the compiler will
emit warnings when `^:deprecated` Vars or Namespaces are used from outside of a `^:deprecated`
context (deprecated ns or def).
- Added `:warn-on-access-violation` (true by defautl) as a compiler option. When true, the
compiler will emit warnings if `^:private` Vars are accessed from outside the namespace in which
they are defined.
- Added `:warn-on-earmuffs` (true by default) as a compiler option. When true, the compiler will
emit warnings if a Var is named with "earmuffs" (matches `#"^\*.+\*$"`) and is not
`^:dynamic`. This warning was already present in Clojure, but there was no way to turn it off.
- Added `:pedantic` (false by default) as a compiler option. When true, all compiler warnings are
enabled. False by default so that users may more easily selectively mask warnings.

### Clojure 1.8
- Jaunt was forked from Clojure just after the 1.8 release, see Clojure's changelog for project
history.
55 changes: 54 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Contributing to Jaunt
# Contributing to Jaunt

:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:

Expand All @@ -14,10 +14,63 @@ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDU
participating, you are expected to uphold this code. Please report unacceptable behavior to
[[email protected]](mailto:[email protected]).

### Development workflow & tools

This project follows the [git-flow](http://nvie.com/posts/a-successful-git-branching-model/)
branching model, making use of the
[git-flow (AVH Edition)](https://github.com/petervanderdoes/gitflow-avh) tooling for extended git
hooks among other things.

Jaunt is structured as a [Maven](https://maven.apache.org/) project, which makes use of
[Ant](https://ant.apache.org) for various build and testing tasks. Ant may be used without Maven by
running the `etc/bin/antsetup.sh` script.

Jaunt makes use of [Leiningen](https://github.com/technomancy/leiningen) for
[cljfmt](https://github.com/weavejester/cljfmt), and also uses
[astyle](http://astyle.sourceforge.net) for Java formatting. As Jaunt is rigorous about formatting
and linting, these are tools you'll need eventually.

## Issues

GitHub issues welcome!

## Pull requests

Pull requests welcome!

We do ask that before submitting a pull request you open an issue tracking the bug of enhancement
you'd like to fix or submit. This makes it easier to discuss changes in the abstract, before
focusing on a particular solution.

Furthermore, please be diligent about submitting pull requests which only make one essential change
at a time. While formatting changes and code cleanups are welcome, they should be separate from
features and a pull request should only introduce one logical feature at a time.

### Change Log

Pull requests are required to update the [changelog](CHANGELOG.md). Changelog entries should mention
and link to any issues or tickets involved in the change, and should provide a moderately technical
description of the particular changes of the patch.

An example of a changelog entry would be:

```
- [#76](https://github.com/jaunt-lang/jaunt/pull/76) Rename project to Jaunt (@arrdem).
- Renames the project from `me.arrdem/clojarr` to `org.jaunt-lang/jaunt`.
```

Note the leading link to the pull request tracking that particular patch, and the username of the
person who submitted the change. Commentary on the change should appear as a nested, unordered list.

### Whitespace & Linting

Jaunt is maintained with fairly strict whitespace and style standards.

The script `etc/bin/whitespace.sh` serves to format all project sources.
- Java code is formatted using [astyle](astyle.sourceforge.net) and the `astylerc` style
configurations.

The script `etc/bin/check-whitespace.sh` serves to check for whitespace style problems, running the
formatter(s) mentioned above in their linting modes.

Patches must whitespace lint cleanly before they will be accepted.
39 changes: 28 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
# Jaunt

[![License EPL 1.0](https://img.shields.io/badge/license-EPL_1-green.svg)](https://www.eclipse.org/legal/epl-v10.html)
[![Patreon Donate](https://img.shields.io/badge/patreon-donate-yellow.svg)](https://patreon.com/arrdem)
[![Join the chat at https://gitter.im/jaunt-lang/jaunt](https://badges.gitter.im/jaunt-lang/jaunt.svg)](https://gitter.im/jaunt-lang/jaunt?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

[![Twitter Follow](https://img.shields.io/twitter/follow/jauntlang.svg?style=social)](https://twitter.com/jaunt-lang)
### Build Status

Branch | Status
----------|--------
`master` | [![Circle CI](https://circleci.com/gh/jaunt-lang/jaunt/tree/master.svg?style=svg)](https://circleci.com/gh/jaunt-lang/jaunt/tree/master) |
`develop` | [![Circle CI](https://circleci.com/gh/jaunt-lang/jaunt/tree/develop.svg?style=svg)](https://circleci.com/gh/jaunt-lang/jaunt/tree/develop)
Branch | Status | Version
----------|--------|--------
`master` | [![Circle CI](https://circleci.com/gh/jaunt-lang/jaunt/tree/master.svg?style=svg)](https://circleci.com/gh/jaunt-lang/jaunt/tree/master) | ![Release Version](https://img.shields.io/github/release/jaunt-lang/jaunt.svg)
`develop` | [![Circle CI](https://circleci.com/gh/jaunt-lang/jaunt/tree/develop.svg?style=svg)](https://circleci.com/gh/jaunt-lang/jaunt/tree/develop) | [![Snapshot Version](https://img.shields.io/clojars/v/org.jaunt-lang/jaunt.svg)](https://clojars.org/org.jaunt-lang/jaunt)

## What

> The reasonable man adapts himself to the world: the unreasonable one
> persists in trying to adapt the world to himself. Therefore all
> progress depends on the unreasonable man.
>
> ~ George Bernard Shaw, _Maxims for Revolutionists_ 1903
## What

Jaunt is a hard fork of Clojure. Rich Hickey wrote Clojure to be the language he wanted, and
administers it in the way that he wants. This is awesome, but I (Reid McKenzie) disagree with enough
of the choices made in the language and its administration that I've forked to go my own way.

See [the thesis blog post](https://www.arrdem.com/2016/02/22/clojarr_-_a_friendly_clojure_fork/) for
more on this.

## Goals

Jaunt is in no small part an experiment in what Clojure would look like if it had a different
Expand Down Expand Up @@ -58,24 +63,36 @@ merge changes without my involvement.

This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By
participating, you are expected to uphold this code. Please report unacceptable behavior to
[[email protected]](mailto:[email protected]).
[[email protected]](mailto:[email protected]). See [CONTRIBUTING.md](CONTRIBUTING.md)
for more information about this project's development process.

### Donations

You can support the development of Jaunt and related tooling via
[Patreon](https://www.patreon.com/arrdem). Note that choosing to contribute represents blanket
support for this and other projects, and does not constitute a contract for support or
[for a tee shirt](https://groups.google.com/forum/#!msg/seajure/GLqhj_2915A/E0crn6zHLi0J).

## Legal

Jaunt is (c) Reid McKenzie. All rights reserved. The use and distribution terms for this software
are covered by the Eclipse Public License 1.0 (EPL)
([/licenses/epl-v10.txt](licenses/epl-v10.txt)). By using this software in any fashion, you are
([/etc/licenses/epl-v10.txt](etc/licenses/epl-v10.txt)). By using this software in any fashion, you are
agreeing to be bound by the terms of this license.

You must not remove this notice, or any other, from this software.

Jaunt is derived directly from Clojure, (c) Rich Hickey, also distributed under the EPL.

This program uses the Guava Murmur3 hash implementation which is distributed under the Apache
License, in [/licenses/apache.txt](licenses/apache.txt)
License, in [/etc/licenses/apache.txt](etc/licenses/apache.txt)

This program uses the ASM bytecode engineering library which is distributed under the license in
[/licenses/inria.txt](licenses/inria.txt)
[/etc/licenses/inria.txt](etc/licenses/inria.txt)

## Change Log

An extensive changelog is available [here](CHANGELOG.md).

## FAQ

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.0
1.9.0
10 changes: 7 additions & 3 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
Note: You may need to run the antsetup.sh script included.
</description>

<property environment="env"/>

<property name="src" location="src"/>
<property name="test" location="test"/>
<property name="jsrc" location="${src}/jvm"/>
Expand All @@ -19,16 +21,18 @@
<property name="target" location="target"/>
<property name="build" location="${target}/classes"/>
<property name="test-classes" location="${target}/test-classes"/>
<property name="dist" location="dist"/>
<property file="maven-classpath.properties"/>
<condition property="dist" value="${env.CIRCLE_ARTIFACTS}" else="dist">
<isset property="env.CIRCLE_ARTIFACTS"/>
</condition>

<!-- Get the version string out of the POM -->
<xmlproperty file="pom.xml" prefix="pom"/>
<property name="clojure.version.label" value="${pom.project.version}"/>
<property name="version.properties" value="${build}/clojure/version.properties"/>

<property name="clojure_jar" location="jaunt-${clojure.version.label}.jar"/>
<property name="clojure_noversion_jar" location="jaunt.jar"/>
<property name="clojure_jar" location="${dist}/jaunt-${clojure.version.label}.jar"/>
<property name="clojure_noversion_jar" location="${dist}/jaunt.jar"/>

<property name="directlinking" value="true"/>

Expand Down
Loading

0 comments on commit 480d851

Please sign in to comment.