Browse Source

Setup development branch.

Dependencies are not pinned down, but follow their
respective development branches.

Our version is generated on build time using git
(e.g. it requires a git cloned repository to build).

The NEWS files is flushed, so it only contains the
bullets of news since the last release merge.
Andreas Stenius 11 years ago
parent
commit
cdf7a5f167
4 changed files with 5 additions and 158 deletions
  1. 0 152
      NEWS.md
  2. 2 2
      rebar-slex.config
  3. 1 1
      rebar.config
  4. 2 3
      src/erlydtl.app.src

+ 0 - 152
NEWS.md

@@ -6,155 +6,3 @@ Standards](http://www.gnu.org/prep/standards/html_node/NEWS-File.html#NEWS-File)
 
 ## master (upcoming release)
 
-* Fixed list indexing (#155).
-
-
-## 0.9.2 (2014-03-22)
-
-* Added NEWS file.
-* Fixed broken `compile_dir` (#146).
-* The backwards incompatible change in 0.9.1 for directory-compiled
-  templates has been reverted. A new `render` function has been added
-  instead (#148).
-* Fixed broken escape feature (#150).
-* Added translator comments (#152, #127) (@seriyps).
-
-
-## 0.9.1 (2014-03-02)
-
-This release brings a row of major internal improvements and also a
-few new and improved features.
-
-* Replaced most of `erl_syntax` use for merl (#123).
-* Refactored compiler and test suite (#134, #136).
-* Updated result value for directory-compiled (`compile_dir`)
-  templates to return `{ok, Rendered} | {error, Reason}` just as for
-  normally compiled templates. Please note that this is a **backwards
-  incompatible change**.
-* Regroup tag is now Django compatible! (the formerly required
-  `endregroup` tag has been made optional) (#101).
-* The `trans` tag now supports the `{% trans "text string" as Varname
-  %}` construct to catch the translated text rather than output it in
-  place.
-* `{{ block.super }}` is now supported in child blocks (#18).
-* `Template:variables()` now only lists referenced render variables
-  (#118).
-* New `erlydtl_library` behaviour for adding custom filters and tags
-  (#137).
-* New `load` tag added. Only difference to that of django is that we
-  don't support loading a library from a package, as there are no
-  notion of packages in Erlang (#100).
-* New compile options supporting the load tag: `libraries` and
-  `default_libraries`. See the readme. (the previous
-  `custom_tags_modules` and `custom_filters_modules` are still
-  supported, although being marked deprecated in favour of the new
-  options).
-* New compile options for aid in debugging erlydtl itself:
-  `debug_compiler` and `debug_root` as described in the readme (#139).
-
-See milestone 0.9.1 for a complete list of closed issues in this release.
-
-Happy templating!
-
-
-## 0.9.0 (2014-02-17)
-
-After some fluctuating stability around *0.8.1*, this release brings a
-set of improvements that has been tested not only by the test suite,
-but also in a couple of projects.
-
-* API changes. Added `_file` and `_template` suffixes to the compile
-  functions to explicitly convey what is to be compiled.
-* Autoescape is now enabled by default. Use the relatively new
-  `auto_escape` option if you want this disabled by default.
-* `blocktrans` blocks can now be translated to multiple locales in
-  runtime. (thanks to @seriyps).
-* `trans` and `_(...)` tags can now be translated to multiple locales
-  at compile time. (thanks to @seriyps).
-* Don't want to save the compiled .beam file? Use `{out_dir, false}`
-  compile time option (this was possible before as well, when no
-  out_dir was specified, but that results in a warning).
-* The error reporting has been fixed for certain cases.
-
-
-## 0.8.2 (2014-01-29)
-
-My sincere apologies, this really should have been in the *0.8.1*
-release.
-
-This release brings the new error/warning options and return values
-also to the `compile_dir` api function.
-
-**Backwards incompatible notes:**
-
-Please notice that the new error reporting options also introduces
-subtle incompatible changes in the API (see #126).
-
-It's not hard to adapt, but I want you all to be aware of this when
-upgrading.
-
-These changes were made already in *0.8.1*, but the specs were not, so
-dialyzer did not pick up on them.
-
-
-## 0.8.1 (2014-01-19)
-
-This release is a clean-up release with a bunch of minor issues squeezed out.
-
-* Improved options for error reporting.
-* new auto_escape compile option for django purists.
-* Cleaned out some warnings given by Dialyzer.
-* Major improvements to the generated code for `for`-loops.
-
-**Warning**
-
-The `compile_dir` function is not updated to the new way of reporting
-errors and warnings, and is in a semi-workable state. A fix is
-committed to *master*, and will be included in the next release.
-
-
-## 0.8.0 (2014-01-10)
-
-This is a release to bring in all the changes together since *0.7.0*,
-and will be the starting point for a lot of future improvements.
-
-
-## 0.7.0 (2011-03-21
-
-* Support no-argument version of `date` filter.
-
-
-## 0.6.0 (2010-04-28)
-
-* Implement `trans` tag with support for .po files Includes a .po
-  parser and generator, docs, and tests. See README_I18N.
-
-  Many thanks to David Garcia.
-
-
-## 0.5.3 (2009-08-13)
-
-* Create "ebin" directory if it does not exist.  Thanks to uri.sharf
-  for the bug report, ja...@nialscorva.net for the patch.
-
-
-## 0.5.2 (2009-02-13)
-
-* Do not require a space between a variable name and closing bracket,
-  e.g. allow `{{var1}}`.
-
-
-## 0.5.1 (2008-10-23)
-
-* Applied patch from Dan Milstein to fix a crash when rendering floats.
-* Added a baseline failing test case for the problem.
-
-
-## 0.5.0 (2008-08-07)
-
-* Run functional tests from "make test".
-* Clean up the output from all test suites.
-* New README file.
-* Remove create_parser stuff because "make" handles this.
-* Make `erlydtl:compile/2,3` a wrapper for `erlydtl_compiler:compile/2,3`.
-

+ 2 - 2
rebar-slex.config

@@ -1,8 +1,8 @@
 %% -*- mode: erlang -*-
 
 {deps,
- [{slex, ".*", {git, "git://github.com/erlydtl/slex.git", {tag, "0.2.1"}}},
-  {merl, ".*", {git, "git://github.com/erlydtl/merl.git", "28e5b3829168199e8475fa91b997e0c03b90d280"}, [raw]}
+ [{slex, ".*", {git, "git://github.com/erlydtl/slex.git", {branch, "master"}}},
+  {merl, ".*", {git, "git://github.com/erlydtl/merl.git", {branch, "erlydtl"}}, [raw]}
  ]
 }.
 

+ 1 - 1
rebar.config

@@ -5,7 +5,7 @@
 
 {deps,
  [{merl, ".*",
-   {git, "git://github.com/erlydtl/merl.git", "28e5b3829168199e8475fa91b997e0c03b90d280"}, % {branch, "erlydtl"}},
+   {git, "git://github.com/erlydtl/merl.git", {branch, "erlydtl"}},
    [raw]}
  ]}.
 

+ 2 - 3
src/erlydtl.app.src

@@ -1,9 +1,8 @@
 %% -*- mode: erlang -*-
 {application, erlydtl,
- [{description, "ErlyDTL compiles the Django Template Language to Erlang bytecode"},
+ [{description, "Django Template Language for Erlang"},
   {vsn, git},
-  {modules, [
-            ]},
+  {modules, []},
   {applications, [kernel, stdlib, compiler, syntax_tools]},
   {registered, []}
  ]}.