Permalink
Browse files

[feature] iconv: binded iconv in Opa

Binding made possible with the inclusion of iconv-ocaml.
Added iconv-ocaml copyright.
Added iconv and iconv.h existence check in configure only on Mac because Linux already has an implementation with glibc.
Plugins now produce .cmxa instead of .cmx in order to handle the linking at compile time.
  • Loading branch information...
1 parent 1097df3 commit 5f95972b64c424633c69c6a9c468671da702f827 @Aqua-Ye Aqua-Ye committed Apr 26, 2012
View
2 _tags
@@ -21,7 +21,7 @@
<{pplib,libbase,compilerlib,passlib,libtrx,jslang,ocamllang,libqmlcompil,libruntime,oparuntime,database,teerex,libbsl,qmlslicer,ulex,qmlpasses,libsession}>: traverse
<{libbase.{cma,cmxa},ocamlbase.top}>: use_stubs
-<ocamlbase.top>: thread, use_unix, use_str, use_zip, use_ulex
+<ocamlbase.top>: thread, use_unix, use_str, use_zip, use_ulex, iconv
# -- from qml2llvm --
View
7 build/myocamlbuild_prefix.ml
@@ -1,5 +1,5 @@
(*
- Copyright © 2011 MLstate
+ Copyright © 2011, 2012 MLstate
This file is part of OPA.
@@ -518,6 +518,11 @@ let _ = dispatch begin function
let flags = S[A"-ccopt";A"DnsAPI.Lib"] in
flag ["use_io";"link"] flags
);
+
+ if is_mac then (
+ flag ["ocaml"; "link"; "iconv"] (S[A"-cclib";A"-liconv"]);
+ );
+
(* for C #includes *)
flag ["extension:c"] (S[A"-I";P (Pathname.pwd / !Options.build_dir)]);
View
19 build_rules.ml
@@ -355,12 +355,15 @@ let jschecker_file s =
let prefix = "jschecker_" in
try String.sub (Pathname.basename s) 0 (String.length prefix) = prefix with _ -> false
in
-let use_tag s =
- let lenp = String.length "use_" in
- let t = try String.sub s 0 lenp = "use_" with _ -> false in
+let gen_tag prefix s =
+ let pfx = prefix ^ "_" in
+ let lenp = String.length pfx in
+ let t = try String.sub s 0 lenp = pfx with _ -> false in
if t then Some(String.sub s lenp ((String.length s) -lenp))
else None
in
+let use_tag s = gen_tag "use" s in
+let clib_tag s = gen_tag "clib" s in
let opa_plugin_builder_name = "opa-plugin-builder-bin" in
let opa_plugin_builder = get_tool opa_plugin_builder_name in
let opp_build opa_plugin opp oppf env build =
@@ -373,8 +376,16 @@ let opp_build opa_plugin opp oppf env build =
| Some dep -> dep::list
) (tags_of_pathname (env "%.opa_plugin")) []
in
+ let c_libs = Tags.fold (fun tag list ->
+ match clib_tag tag with
+ | None -> list
+ | Some dep -> dep::list
+ ) (tags_of_pathname (env "%.opa_plugin")) []
+ in
let lib_dir s = [A"--ml";A"-I";A"--ml";P (if Pathname.exists s then ".." / s else ("+"^s))] in
let include_dirs = List.flatten (List.map lib_dir caml_use_lib) in
+ let clib s = [A"--ml";A"-cclib";A"--ml";A("-l"^s)] in
+ let include_libs = List.flatten (List.map clib c_libs) in
let files = List.map ((^) path) files in
build_list build files;
let files_validation, files_lib = List.partition jschecker_file files in
@@ -390,7 +401,7 @@ let opp_build opa_plugin opp oppf env build =
unsafe_js @ [A"--js-validator"] @ js_checker @ files_validation
)
in
- let options = [A"--static" ; A"-o" ; P((Pathname.basename (env opp)))] @ include_dirs @ js_validation @ files_lib in
+ let options = [A"--static" ; A"-o" ; P((Pathname.basename (env opp)))] @ include_dirs @ include_libs @js_validation @ files_lib in
Seq[Cmd(S(opa_plugin_builder::options));
Cmd(S[A"touch"; P(env oppf) ] )]
in
View
19 configure
@@ -346,7 +346,7 @@ check-c-lib () (
local LIBDIR=$(dirname "$LIB")
local INCLUDE_DIR
for d in {"$OCAMLLIB/..","$OCAMLLIB",/usr/lib,/usr/local/lib}{/$LIBDIR,}; do
- if [ -e $d/lib$LIBNAME.a ]; then
+ if [ -e $d/lib$LIBNAME.a ] || [ -e $d/lib$LIBNAME.dylib ] ; then
LD_DIR=$(readlink -f $d)
INCLUDE_DIR=$LD_DIR/
INCLUDE_DIR=${INCLUDE_DIR%/lib/*}/include
@@ -361,7 +361,7 @@ check-c-lib () (
return 1
fi >&2
- echo-ok -n "$LD_DIR/lib$LIBNAME.a, "
+ echo-ok -n "$LD_DIR/lib$LIBNAME..., "
# Now checking compile, link & run
local DIR=$(mktemp -d /tmp/opa-configure.XXXXX)
@@ -416,6 +416,16 @@ if [ -n "$HAS_CAMLIDL" ]; then
fi
fi
+HAS_LIBICONV=
+LIBICONV=("")
+if [ -n "${IS_MAC:-}" ] &&
+ echo-check libiconv &&
+ LIBICONV=($(check-c-lib iconv iconv.h)); then
+ HAS_LIBICONV=1
+else
+ LIBICONV=("")
+fi
+
# check ocaml libs:
# probably, first try with ocamlfind then fallback to
# custom check ; ensure consistency with function
@@ -645,7 +655,7 @@ camlopt() {
fi
}
-ALL_TAGS_LIST="camlidl libnatpmp miniupnpc dbm"
+ALL_TAGS_LIST="camlidl libnatpmp miniupnpc dbm libiconv"
TAGS_LIST=""
for tag in $ALL_TAGS_LIST; do
hasvar=HAS_$(tr '[:lower:]' '[:upper:]' <<<"$tag")
@@ -666,6 +676,7 @@ let camlidl = $(camlopt "$HAS_CAMLIDL" '"'"$CAMLIDL"'"')
let libnatpmp = $(camlopt "$HAS_LIBNATPMP" "$(camlstrtuple "${LIBNATPMP[@]}")")
let miniupnpc = $(camlopt "$HAS_MINIUPNPC" "$(camlstrtuple "${MINIUPNPC[@]}")")
let has_dbm = $(camlbool "$HAS_DBM")
+let libiconv = $(camlopt "$HAS_LIBICONV" "$(camlstrtuple "${LIBICONV[@]}")")
let available = [ $TAGS_LIST]
let all_tags = [ $(for t in $ALL_TAGS_LIST; do echo -n "\"$t\"; "; done)]
@@ -717,6 +728,8 @@ LIBNATPMP=(${LIBNATPMP[@]})
HAS_MINIUPNPC="$HAS_MINIUPNPC"
MINIUPNPC=(${MINIUPNPC[@]})
HAS_DBM="$HAS_DBM"
+HAS_LIBICONV="$HAS_LIBICONV"
+LIBICONV=(${LIBICONV[@]})
IS_RELEASE="$IS_RELEASE"
IS_LINUX="${IS_LINUX:-}"
IS_WINDOWS="${IS_WINDOWS:-}"
View
515 copyright/10_iconv-ocaml
@@ -0,0 +1,515 @@
+iconv-ocaml interface by YT
+
+* 再配布について
+
+New BSD Licenseか、またはLGPLの好きな方を使ってください。
+(GNU版のlibiconv.aをスタティックリンクする場合はLGPLが便利と思います)
+
+----------
+
+Copyright 2010 YT. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+----------
+
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL. It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it. You can use it for
+your libraries, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library. If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software. To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+ Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs. This
+license, the GNU Library General Public License, applies to certain
+designated libraries. This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+ The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it. Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program. However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+ Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries. We
+concluded that weaker conditions might promote sharing better.
+
+ However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves. This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them. (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.) The hope is that this
+will lead to faster development of free libraries.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+ Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License"). Each licensee is
+addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ c) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ d) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ Appendix: How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
View
6 copyright/copyright
@@ -1,5 +1,5 @@
Unless something else is mentioned, Opa is
-Copyright © 2011 MLstate. All Rights Reserved.
+Copyright © 2011, 2012 MLstate. All Rights Reserved.
This package was put together by MLstate <packaging@opalang.org> from
the sources available at <http://opalang.org>.
@@ -71,5 +71,9 @@ This package also includes pieces of the following software:
Q Public license v1.0 (compiler)
LGPL v2 with static linking exception (library)
+- iconv-ocaml, http://panathenaia.halfmoon.jp/alang/ocaml/
+ © 2010 YT
+ New BSD License
+
Detailed copyright information of all these included packages lie in
file <other_licenses>.
View
4 libbase/_tags
@@ -1,6 +1,8 @@
# -*- conf -*- (for emacs)
-<journal.{byte,native}>: thread
+<mliconv.c> : c_wall, iconv
+
+<journal.{byte,native}>: thread, iconv
<io.{ml,mli,byte,native}>: use_zip
<indexer.{ml,byte,native}>: use_ulex, use_ulex_pp
<jsonLex.ml> : use_ulex, use_ulex_pp
View
1 libbase/libstubs.clib
@@ -1,2 +1,3 @@
cmap.o
memory.o
+mliconv.o
View
181 libbase/mliconv.c
@@ -0,0 +1,181 @@
+#include <caml/misc.h>
+#include <caml/mlvalues.h>
+#include <caml/callback.h>
+#include <caml/memory.h>
+#include <caml/alloc.h>
+#include <caml/fail.h>
+#include <caml/custom.h>
+#include <caml/intext.h>
+
+#include <iconv.h>
+#include <string.h>
+#include <errno.h>
+
+struct mliconv_t {
+ iconv_t handle;
+ char *tocode;
+ char *fromcode;
+};
+
+static inline struct mliconv_t *mliconv_val(value data)
+{
+ return (struct mliconv_t *)(Data_custom_val(data));
+}
+
+static void mliconv_finalize(value r);
+static int mliconv_compare(value left, value right);
+static long mliconv_hash(value data);
+static void mliconv_serialize(value v, unsigned long * wsize_32, unsigned long * wsize_64);
+static unsigned long mliconv_deserialize(void * dst);
+
+static struct custom_operations iconv_ops = {
+ "jp.halfmoon.panathenaia.iconv",
+ mliconv_finalize,
+ mliconv_compare,
+ mliconv_hash,
+ mliconv_serialize,
+ mliconv_deserialize};
+
+static void mliconv_finalize(value data)
+{
+ CAMLparam1(data);
+ struct mliconv_t *internal = mliconv_val(data);
+ iconv_close(internal->handle);
+ free(internal->tocode);
+ free(internal->fromcode);
+ CAMLreturn0;
+}
+
+static int mliconv_compare(value left, value right)
+{
+ CAMLparam2(left, right);
+ struct mliconv_t *left_internal = mliconv_val(left);
+ struct mliconv_t *right_internal = mliconv_val(right);
+ int result = strcmp(left_internal->tocode, right_internal->tocode);
+ if(result == 0){
+ result = strcmp(left_internal->fromcode, right_internal->fromcode);
+ }
+ CAMLreturn(result);
+}
+
+static long mliconv_hash(value data)
+{
+ CAMLparam1(data);
+ struct mliconv_t *internal = mliconv_val(data);
+ long result = (strlen(internal->tocode) << 4) + strlen(internal->fromcode);
+ CAMLreturn(result);
+}
+
+static void mliconv_serialize(value v, unsigned long * wsize_32, unsigned long * wsize_64)
+{
+ CAMLparam1(v);
+ *wsize_32 = 4 * 3;
+ *wsize_64 = 8 * 3;
+ struct mliconv_t *internal = mliconv_val(v);
+ size_t to_len = strlen(internal->tocode);
+ serialize_int_4(to_len);
+ serialize_block_1(internal->tocode, to_len);
+ size_t from_len = strlen(internal->fromcode);
+ serialize_int_4(from_len);
+ serialize_block_1(internal->fromcode, from_len);
+ CAMLreturn0;
+}
+
+static unsigned long mliconv_deserialize(void * dst)
+{
+ CAMLparam0();
+ size_t to_len = deserialize_uint_4();
+ char *tocode = malloc(to_len + 1);
+ deserialize_block_1(tocode, to_len);
+ size_t from_len = deserialize_uint_4();
+ char *fromcode = malloc(from_len + 1);
+ deserialize_block_1(fromcode, from_len);
+ iconv_t handle = iconv_open(tocode, fromcode);
+ if(handle == (iconv_t)-1){
+ char message[to_len + from_len + 128];
+ strcat(strcat(strcat(strcpy(message, "failed iconv_open to "), tocode), " from "), fromcode);;
+ free(tocode);
+ free(fromcode);
+ caml_failwith(message);
+ }
+ struct mliconv_t *internal = (struct mliconv_t *)dst;
+ internal->handle = handle;
+ internal->tocode = tocode;
+ internal->fromcode = fromcode;
+ CAMLreturn(sizeof(struct mliconv_t));
+}
+
+CAMLprim value mliconv_open(value tocodev, value fromcodev)
+{
+ CAMLparam2(tocodev, fromcodev);
+ CAMLlocal1(result);
+ const char* tocode = String_val(tocodev);
+ size_t to_len = caml_string_length(tocodev);
+ const char* fromcode = String_val(fromcodev);
+ size_t from_len = caml_string_length(fromcodev);
+ iconv_t handle = iconv_open(tocode, fromcode);
+ if(handle == (iconv_t)-1){
+ char message[to_len + from_len + 128];
+ strcat(strcat(strcat(strcpy(message, "failed iconv_open to "), tocode), " from "), fromcode);;
+ caml_failwith(message);
+ }
+ result = alloc_custom(&iconv_ops, sizeof(struct mliconv_t), 0, 1);
+ struct mliconv_t *internal = mliconv_val(result);
+ internal->handle = handle;
+ internal->tocode = strdup(iconv_canonicalize(tocode));
+ internal->fromcode = strdup(iconv_canonicalize(fromcode));
+ CAMLreturn(result);
+}
+
+CAMLprim value mliconv_convert(value conv, value source)
+{
+ CAMLparam2(conv, source);
+ CAMLlocal1(result);
+ struct mliconv_t *internal = mliconv_val(conv);
+#if !defined(__APPLE__)
+ const
+#endif
+ char *s = String_val(source);
+ size_t s_len = caml_string_length(source);
+ size_t d_len = s_len * 6;
+ char *d = malloc(d_len);
+ char *d_current = d;
+ while(s_len > 0){
+ if(iconv(internal->handle, &s, &s_len, &d_current, &d_len) == (size_t)-1){
+ int e = errno;
+ if(e == EILSEQ || e == EINVAL){
+ *d_current = '?';
+ ++ d_current;
+ -- d_len;
+ ++ s;
+ -- s_len;
+ }else{
+ free(d);
+ caml_failwith("failed iconv");
+ }
+ }
+ }
+ size_t result_len = d_current - d;
+ result = caml_alloc_string(result_len);
+ memcpy(String_val(result), d, result_len);
+ free(d);
+ CAMLreturn(result);
+}
+
+CAMLprim value mliconv_tocode(value conv)
+{
+ CAMLparam1(conv);
+ CAMLlocal1(result);
+ struct mliconv_t *internal = mliconv_val(conv);
+ result = caml_copy_string(internal->tocode);
+ CAMLreturn(result);
+}
+
+CAMLprim value mliconv_fromcode(value conv)
+{
+ CAMLparam1(conv);
+ CAMLlocal1(result);
+ struct mliconv_t *internal = mliconv_val(conv);
+ result = caml_copy_string(internal->fromcode);
+ CAMLreturn(result);
+}
View
2 libbsl/bslConvention.ml
@@ -54,7 +54,7 @@ let inclusion ~cwd opp =
in
let (/) = Filename.concat in
let extrapath = prefix/opp in
- let extralib = plugin_name^Suffix.mlruntime^".cmx" in
+ let extralib = plugin_name^Suffix.mlruntime^".cmxa" in
let plugin = prefix/opp/(plugin_name^"."^Extension.bypass) in
{
extrapath ;
View
8 libbsl/bslregister.ml
@@ -1,5 +1,5 @@
(*
- Copyright © 2011 MLstate
+ Copyright © 2011, 2012 MLstate
This file is part of OPA.
@@ -627,8 +627,9 @@ OCAMLOPT_FLAGS=$(mlopt_flags)
let static_part = "
TARGETS_CMI=$(patsubst %, $(OPP)%.cmi, $(SUFFIX))
TARGETS_CMX=$(patsubst %, $(OPP)%.cmx, $(SUFFIX))
+TARGETS_CMXA=$(patsubst %, $(OPP)%.cmxa, $(SUFFIX))
-all: $(TARGETS_CMI) $(TARGETS_CMX)
+all: $(TARGETS_CMI) $(TARGETS_CMX) $(TARGETS_CMXA)
OCAMLOPT ?= ocamlopt.opt
TRX ?= $(MLSTATELIBS)/bin/trx
@@ -639,6 +640,9 @@ TRX ?= $(MLSTATELIBS)/bin/trx
%.cmx : %.ml %.cmi
\t$(OCAMLOPT) $(OCAML_FLAGS) $(OCAMLOPT_FLAGS) $(INCLUDE) -c $<
+%.cmxa : %.cmx
+\t$(OCAMLOPT) $(OCAML_FLAGS) $(OCAMLOPT_FLAGS) $(INCLUDE) -a $< -o $@
+
%.cmi : %.mli
\t$(OCAMLOPT) $(OCAML_FLAGS) $(OCAMLOPT_FLAGS) $(INCLUDE) -c $<
View
2 opatop/_tags
@@ -1,6 +1,6 @@
# -*- conf -*- (for emacs)
# AIE AIE AIE : qmltop is so greedy in libs than we are lazy to clean this up
-<**/*.{ml,mli,byte,native}>: thread, use_ssl, use_graph, use_zip, use_str, use_unix, use_bigarray, use_buildinfos, use_libbase, use_libqmlcompil, use_libbsl, use_qmlslicer, use_libruntime, use_appruntime, use_oparuntime, use_libnet, use_libsecurity, use_libtools, use_database, use_ulex, use_libtrx, use_qmlcpsserver, use_cryptokit, use_nums, use_passlib, use_dynlink, use_opalang, use_compilerlib, use_ocamllang, use_jslang, use_opacapi, use_qmlpasses, use_libsession
+<**/*.{ml,mli,byte,native}>: thread, use_ssl, use_graph, use_zip, use_str, use_unix, use_bigarray, use_buildinfos, use_libbase, use_libqmlcompil, use_libbsl, use_qmlslicer, use_libruntime, use_appruntime, use_oparuntime, use_libnet, use_libsecurity, use_libtools, use_database, use_ulex, use_libtrx, use_qmlcpsserver, use_cryptokit, use_nums, use_passlib, use_dynlink, use_opalang, use_compilerlib, use_ocamllang, use_jslang, use_opacapi, use_qmlpasses, use_libsession, iconv
<opabslgenMLRuntime.ml>: warn_e, warn_z
<opabslgenMLRuntime.ml>: with_mlstate_debug
View
1 plugins/_tags
@@ -6,3 +6,4 @@
<unix>:traverse
<socket>: traverse
<gcharts>: traverse
+<iconv>: traverse
View
1 plugins/iconv/_tags
@@ -0,0 +1 @@
+<iconv.opa_plugin> : clib_iconv
View
8 plugins/iconv/bslIconv.ml
@@ -0,0 +1,8 @@
+##extern-type Iconv.t = Iconv.iconv_t
+##extern-type binary = string
+
+##register iconv_open : binary, binary -> Iconv.t
+let iconv_open tocode fromcode = Iconv.iconv_open ~tocode ~fromcode
+
+##register iconv : Iconv.t, binary -> binary
+let iconv t s = Iconv.iconv t s
View
5 plugins/iconv/iconv.ml
@@ -0,0 +1,5 @@
+type iconv_t
+
+external iconv_open: tocode:string -> fromcode:string -> iconv_t = "mliconv_open";;
+external iconv: iconv_t -> string -> string = "mliconv_convert";;
+
View
2 plugins/iconv/iconv.opa_plugin
@@ -0,0 +1,2 @@
+iconv.ml
+bslIconv.ml
View
53 stdlib/tools/iconv/iconv.opa
@@ -0,0 +1,53 @@
+/*
+ Copyright © 2011, 2012 MLstate
+
+ This file is part of OPA.
+
+ OPA is free software: you can redistribute it and/or modify it under the
+ terms of the GNU Affero General Public License, version 3, as published by
+ the Free Software Foundation.
+
+ OPA is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
+ more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with OPA. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * Opa interface for iconv
+ *
+ * @author Frederic Ye, 2012
+ * @category TOOL
+ * @destination PUBLIC
+ * @stability EXPERIMENTAL
+ * @version 0.1
+ */
+
+import-plugin iconv
+package stdlib.tools.iconv
+
+type Iconv.t = external
+
+Iconv = {{
+
+ /**
+ *
+ */
+ open(~{from to}) = %%bslIconv.iconv_open%%(to, from)
+
+ /**
+ * Convert a binary encoded data into another encoded binary data
+ */
+ convert = %%bslIconv.iconv%%
+
+ /**
+ * Convert a binary binary data into an utf-8 compatible string
+ */
+ convert_to_utf8(from:string, s:binary) : string =
+ iconv = open({~from to="utf-8"})
+ convert(iconv, s)
+
+}}

0 comments on commit 5f95972

Please sign in to comment.