Skip to content

Commit

Permalink
Version 4.0.1
Browse files Browse the repository at this point in the history
* Fix handling of comments in the ppx.
* Fix printing of utf8 in attributes.
* Properly flush ppx errors. This bug was causing some blank error messages.
* Fix handling of whitespaces in <select> in the ppx.
  • Loading branch information
Drup committed Oct 30, 2016
1 parent fe9e8fb commit dfb0a0d
Show file tree
Hide file tree
Showing 25 changed files with 11,171 additions and 95 deletions.
21 changes: 0 additions & 21 deletions .jenkins.sh

This file was deleted.

116 changes: 116 additions & 0 deletions _tags
Original file line number Diff line number Diff line change
@@ -1,4 +1,120 @@
# OASIS_START
# DO NOT EDIT (digest: d07a4f5df8ed9187d90150fece42e278)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
true: annot, bin_annot
<**/.svn>: -traverse
<**/.svn>: not_hygienic
".bzr": -traverse
".bzr": not_hygienic
".hg": -traverse
".hg": not_hygienic
".git": -traverse
".git": not_hygienic
"_darcs": -traverse
"_darcs": not_hygienic
# Library tyxml_f
"lib/tyxml_f.cmxs": use_tyxml_f
<lib/*.ml{,i,y}>: package(re)
<lib/*.ml{,i,y}>: package(uutf)
# Library tyxml
"implem/tyxml.cmxs": use_tyxml
<implem/*.ml{,i,y}>: package(re)
<implem/*.ml{,i,y}>: package(uutf)
<implem/*.ml{,i,y}>: use_tyxml_f
# Library tyxml_top
"implem/top/tyxml_top.cmxs": use_tyxml_top
<implem/top/*.ml{,i,y}>: package(compiler-libs.toplevel)
# Library tyxml_tools
"tools/tyxml_tools.cmxs": use_tyxml_tools
# Executable autoname
"tools/autoname.byte": package(bytes)
"tools/autoname.byte": use_tyxml_tools
<tools/*.ml{,i,y}>: package(bytes)
<tools/*.ml{,i,y}>: use_tyxml_tools
# Library pa_tyxml
"syntax/pa_tyxml.cmxs": use_pa_tyxml
<syntax/*.ml{,i,y}>: package(camlp4)
# Library tymlx_p
"syntax/tymlx_p.cmxs": use_tymlx_p
<syntax/*.ml{,i,y}>: package(bytes)
<syntax/*.ml{,i,y}>: package(camlp4.lib)
# Library ppx
"ppx/ppx.cmxs": use_ppx
# Library ppx_internal
"ppx/ppx_internal.cmxs": use_ppx_internal
# Executable ppx_tyxml
<ppx/ppx_tyxml_ex.{native,byte}>: package(bytes)
<ppx/ppx_tyxml_ex.{native,byte}>: package(markup)
<ppx/ppx_tyxml_ex.{native,byte}>: package(ppx_tools.metaquot)
<ppx/ppx_tyxml_ex.{native,byte}>: package(re.str)
<ppx/ppx_tyxml_ex.{native,byte}>: use_ppx_internal
<ppx/ppx_tyxml_ex.{native,byte}>: use_tyxml_tools
<ppx/*.ml{,i,y}>: package(markup)
<ppx/*.ml{,i,y}>: package(re.str)
<ppx/*.ml{,i,y}>: use_ppx_internal
# Executable ppx_reflect
<ppx/ppx_reflect.{native,byte}>: package(bytes)
<ppx/ppx_reflect.{native,byte}>: package(ppx_tools.metaquot)
<ppx/ppx_reflect.{native,byte}>: use_tyxml_tools
<ppx/*.ml{,i,y}>: package(bytes)
<ppx/*.ml{,i,y}>: package(ppx_tools.metaquot)
<ppx/*.ml{,i,y}>: use_tyxml_tools
# Executable emit_big
<test/emitbig.{native,byte}>: package(re)
<test/emitbig.{native,byte}>: package(unix)
<test/emitbig.{native,byte}>: package(uutf)
<test/emitbig.{native,byte}>: use_tyxml
<test/emitbig.{native,byte}>: use_tyxml_f
<test/*.ml{,i,y}>: package(unix)
# Executable main_test
"test/main_test.byte": package(alcotest)
"test/main_test.byte": package(re)
"test/main_test.byte": package(uutf)
"test/main_test.byte": use_tyxml
"test/main_test.byte": use_tyxml_f
<test/*.ml{,i,y}>: package(alcotest)
<test/*.ml{,i,y}>: package(re)
<test/*.ml{,i,y}>: package(uutf)
<test/*.ml{,i,y}>: use_tyxml
<test/*.ml{,i,y}>: use_tyxml_f
# Executable basic_website
<examples/basic_website/site_html.{native,byte}>: package(re)
<examples/basic_website/site_html.{native,byte}>: package(uutf)
<examples/basic_website/site_html.{native,byte}>: use_tyxml
<examples/basic_website/site_html.{native,byte}>: use_tyxml_f
<examples/basic_website/*.ml{,i,y}>: package(re)
<examples/basic_website/*.ml{,i,y}>: package(uutf)
<examples/basic_website/*.ml{,i,y}>: use_tyxml
<examples/basic_website/*.ml{,i,y}>: use_tyxml_f
# Executable basic_website_ppx
<examples/basic_website_ppx/site_html.{native,byte}>: package(re)
<examples/basic_website_ppx/site_html.{native,byte}>: package(uutf)
<examples/basic_website_ppx/site_html.{native,byte}>: use_tyxml
<examples/basic_website_ppx/site_html.{native,byte}>: use_tyxml_f
<examples/basic_website_ppx/*.ml{,i,y}>: package(re)
<examples/basic_website_ppx/*.ml{,i,y}>: package(uutf)
<examples/basic_website_ppx/*.ml{,i,y}>: use_tyxml
<examples/basic_website_ppx/*.ml{,i,y}>: use_tyxml_f
# Executable mini_website
<examples/mini_website/minihtml.{native,byte}>: package(re)
<examples/mini_website/minihtml.{native,byte}>: package(uutf)
<examples/mini_website/minihtml.{native,byte}>: use_tyxml
<examples/mini_website/minihtml.{native,byte}>: use_tyxml_f
<examples/mini_website/*.ml{,i,y}>: package(re)
<examples/mini_website/*.ml{,i,y}>: package(uutf)
<examples/mini_website/*.ml{,i,y}>: use_tyxml
<examples/mini_website/*.ml{,i,y}>: use_tyxml_f
# Executable mini_website_ppx
<examples/mini_website_ppx/minihtml.{native,byte}>: package(re)
<examples/mini_website_ppx/minihtml.{native,byte}>: package(uutf)
<examples/mini_website_ppx/minihtml.{native,byte}>: use_tyxml
<examples/mini_website_ppx/minihtml.{native,byte}>: use_tyxml_f
<examples/mini_website_ppx/*.ml{,i,y}>: package(re)
<examples/mini_website_ppx/*.ml{,i,y}>: package(uutf)
<examples/mini_website_ppx/*.ml{,i,y}>: use_tyxml
<examples/mini_website_ppx/*.ml{,i,y}>: use_tyxml_f
# OASIS_STOP
"syntax/basic_types.ml": camlp4rf
"syntax/xhtmlparser.ml": camlp4rf
Expand Down
41 changes: 0 additions & 41 deletions dist.sh

This file was deleted.

90 changes: 90 additions & 0 deletions implem/META
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
# OASIS_START
# DO NOT EDIT (digest: c6ec0eb7c6ec4d2ff7716e168d21e65a)
version = "4.0.1"
description = "Statically correct HTML and SVG documents"
requires = "tyxml.functor re uutf"
archive(byte) = "tyxml.cma"
archive(byte, plugin) = "tyxml.cma"
archive(native) = "tyxml.cmxa"
archive(native, plugin) = "tyxml.cmxs"
archive(byte,toploop) += "tyxml_top.cma"
exists_if = "tyxml.cma"
package "top" (
version = "4.0.1"
description = "Toplevel printers for HTML, SVG and XML"
requires = "tyxml"
archive(byte) = "tyxml_top.cma"
archive(byte, plugin) = "tyxml_top.cma"
archive(native) = "tyxml_top.cmxa"
archive(native, plugin) = "tyxml_top.cmxs"
exists_if = "tyxml_top.cma"
)

package "tools" (
version = "4.0.1"
description = "Statically correct HTML and SVG documents"
requires = "bytes"
archive(byte) = "tyxml_tools.cma"
archive(byte, plugin) = "tyxml_tools.cma"
archive(native) = "tyxml_tools.cmxa"
archive(native, plugin) = "tyxml_tools.cmxs"
exists_if = "tyxml_tools.cma"
)

package "syntax" (
version = "4.0.1"
description = "HTML and SVG syntax extension"
requires = "bytes camlp4"
archive(syntax, preprocessor) = "pa_tyxml.cma"
archive(syntax, toploop) = "pa_tyxml.cma"
archive(syntax, preprocessor, native) = "pa_tyxml.cmxa"
archive(syntax, preprocessor, native, plugin) = "pa_tyxml.cmxs"
requires(toploop) = "tyxml"
exists_if = "pa_tyxml.cma"
)

package "ppx" (
version = "4.0.1"
description = "HTML and SVG syntax extension (ppx)"
requires = "tyxml"
archive(byte) = "ppx.cma"
archive(byte, plugin) = "ppx.cma"
archive(native) = "ppx.cmxa"
archive(native, plugin) = "ppx.cmxs"
ppx = "ppx_tyxml"
exists_if = "ppx.cma"
package "internal" (
version = "4.0.1"
description = "HTML and SVG ppx library"
requires = "re.str ppx_tools.metaquot markup tyxml.tools"
archive(byte) = "ppx_internal.cma"
archive(byte, plugin) = "ppx_internal.cma"
archive(native) = "ppx_internal.cmxa"
archive(native, plugin) = "ppx_internal.cmxs"
exists_if = "ppx_internal.cma"
)
)

package "parser" (
version = "4.0.1"
description = "Simple XML parser"
requires = "bytes camlp4.lib"
archive(byte) = "tymlx_p.cma"
archive(byte, plugin) = "tymlx_p.cma"
archive(native) = "tymlx_p.cmxa"
archive(native, plugin) = "tymlx_p.cmxs"
exists_if = "tymlx_p.cma"
)

package "functor" (
version = "4.0.1"
description = "Statically correct HTML and SVG documents (Functor version)"
requires = "uutf re"
archive(byte) = "tyxml_f.cma"
archive(byte, plugin) = "tyxml_f.cma"
archive(native) = "tyxml_f.cmxa"
archive(native, plugin) = "tyxml_f.cmxs"
exists_if = "tyxml_f.cma"
)
# OASIS_STOP

4 changes: 4 additions & 0 deletions implem/top/tyxml_top.mldylib
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: 9985bb6292efdb2ccd3212f66f8621c5)
Tyxml_top
# OASIS_STOP
4 changes: 4 additions & 0 deletions implem/top/tyxml_top.mllib
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: 9985bb6292efdb2ccd3212f66f8621c5)
Tyxml_top
# OASIS_STOP
7 changes: 7 additions & 0 deletions implem/tyxml.mldylib
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# OASIS_START
# DO NOT EDIT (digest: 0ad0ea7a03e5bb86e515b481bcbc79ed)
Tyxml_xml
Tyxml_svg
Tyxml_html
Tyxml
# OASIS_STOP
7 changes: 7 additions & 0 deletions implem/tyxml.mllib
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# OASIS_START
# DO NOT EDIT (digest: 0ad0ea7a03e5bb86e515b481bcbc79ed)
Tyxml_xml
Tyxml_svg
Tyxml_html
Tyxml
# OASIS_STOP
8 changes: 8 additions & 0 deletions lib/tyxml_f.mldylib
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# OASIS_START
# DO NOT EDIT (digest: c50b31e7fcf48d4e470776748ce82005)
Xml_iter
Xml_wrap
Xml_print
Svg_f
Html_f
# OASIS_STOP
8 changes: 8 additions & 0 deletions lib/tyxml_f.mllib
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# OASIS_START
# DO NOT EDIT (digest: c50b31e7fcf48d4e470776748ce82005)
Xml_iter
Xml_wrap
Xml_print
Svg_f
Html_f
# OASIS_STOP
Loading

0 comments on commit dfb0a0d

Please sign in to comment.