Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[fix] compilation: wip compilation fix

  • Loading branch information...
commit 8d13b875fed9c0fec7d7715559ea85ef8a4da926 1 parent 4307455
@Aqua-Ye Aqua-Ye authored
View
33 _tags
@@ -9,39 +9,8 @@
# Default : do not include or traverse anything
# <**/*>: -include, -traverse
-<tools/dependencies>: -include, -traverse
-
# Subdirectories to include
-<{ocamllib,compiler,lib,tools}>: include, traverse
+<{ocamllib,compiler,lib,tools}>: include
# Warnings
<**/*.ml>: warn_L, warn_Z, warn_error_A
-
-# # -- from opageneral --
-
-# <{utils,buildinfos}>: traverse
-
-# # -- from libqml --
-
-# <{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, iconv
-
-# # -- from qml2llvm --
-
-# <{opatop,qmlflat,qmlcps,qml2ocaml,qml2js,qmljsimp,qmlcompilers,tools}>: traverse
-
-# # -- from opa --
-
-# <{opacapi,opalib,shared,opa,plugins,opabsl,test,opalang,passes,stdlib,ml2opa}>: traverse
-
-# # -- from appserver --
-# <{appruntime,libnet,libsecurity,libtools,protocols,opasmanagers}>: traverse
-# <libsecurity.*a>: use_ssl_ext
-# <appruntime.*a>: use_io
-# <libnattraversal.*a>: use_miniupnpc_idl, use_natpmp_idl
-
-# # --
-# <{dissemination}>: traverse
-# <{libirc}>: traverse
View
34 build_rules.ml
@@ -106,7 +106,7 @@ let magic_import_from_opabsl dest f =
])
in
List.iter
- (fun m -> magic_import_from_opabsl "opatop" (m ^ ".ml"))
+ (fun m -> magic_import_from_opabsl "compiler/opatop" (m ^ ".ml"))
[ "opabslgenMLRuntime"; "opabslgenLoader" ];
@@ -161,14 +161,14 @@ generate_ocamldep_rule "mli";
(* -- Macro-rules generating mlstate_platform.h files -- *)
(* TODO BUG 2 : droits du script invalides *)
(* TODO BUG 3 : path du fichier généré foireux *)
-rule "mlstate_platform: () -> libbase/mlstate_platform.h"
+rule "mlstate_platform: () -> ocamllib/libbase/mlstate_platform.h"
~deps:(tool_deps "mlstate_platform")
- ~prods:["libbase/mlstate_platform.h"]
+ ~prods:["ocamllib/libbase/mlstate_platform.h"]
(fun env build ->
Seq[
- Cmd(S[Sh"chmod +x"; P "libbase/gen_platform"]);
+ Cmd(S[Sh"chmod +x"; P "ocamllib/libbase/gen_platform"]);
Cmd(S[get_tool "mlstate_platform"; A (if windows_mode then "WIN" else "")]);
- Cmd(S[Sh"mv mlstate_platform.h libbase/mlstate_platform.h"])
+ Cmd(S[Sh"mv mlstate_platform.h ocamllib/libbase/mlstate_platform.h"])
]
);
@@ -189,8 +189,8 @@ let stdlib_files =
in
rule "stdlib embedded: stdlib_files -> opalib/staticsInclude.of"
~deps:stdlib_files
- ~prod:"opalib/staticsInclude.of"
- (fun env build -> Echo (List.map (fun f -> f^"\n") stdlib_files, "opalib/staticsInclude.of"));
+ ~prod:"compiler/opalib/staticsInclude.of"
+ (fun env build -> Echo (List.map (fun f -> f^"\n") stdlib_files, "compiler/opalib/staticsInclude.of"));
let opa_opacapi_files =
let dirs = rec_subdirs ["lib/stdlib"] in
@@ -204,12 +204,12 @@ let opa_opacapi_plugins = ["badop"] in
let opacapi_validation = "opacapi.validation" in
rule "Opa Compiler Interface Validation (opacapi)"
~deps:("compiler/opa/checkopacapi.native" :: opa_opacapi_files
- @ List.map (fun x -> Printf.sprintf "plugins/%s/%s.oppf" x x)
+ @ List.map (fun x -> Printf.sprintf "lib/plugins/%s/%s.oppf" x x)
opa_opacapi_plugins)
~prod:opacapi_validation
(fun env build ->
Cmd(S ([
- P "./opa/checkopacapi.native" ;
+ P "./compiler/opa/checkopacapi.native" ;
A "-o" ;
P opacapi_validation ;
] @ (List.rev_map (fun file -> P file) opa_opacapi_files)
@@ -248,7 +248,7 @@ let parser_files =
let files = List.fold_right (fun dir acc -> dir_ext_files "trx" dir @ dir_ext_files "ml" dir) dir ["general/surfaceAst.ml"] in
files
in
-let opaParserVersion = "opalang"/"classic_syntax"/"opaParserVersion.ml"
+let opaParserVersion = "compiler"/"opalang"/"classic_syntax"/"opaParserVersion.ml"
in
rule "opa parser version: opalang/*_syntax/* stdlib -> opalang/classic_syntax/opaParserVersion.ml"
~deps:parser_files
@@ -494,7 +494,7 @@ rule "opabsl_sources"
A"--verbose";
]
@special_bsl_options@
- List.map (fun s -> P (".."/s)) (
+ List.map (fun s -> P (".."/".."/s)) (
js_conf :: all_sources_bsl
)));
mv "lib/opabsl/opabslgenMLRuntime.ml" "lib/opabsl/opabslgenMLRuntime_x.ml";
@@ -510,9 +510,9 @@ rule "opa-bslgenMLRuntime interface validation"
]
~prod: "lib/opabsl/opabslgenMLRuntime.ml"
(fun env build ->
- Seq[
- cp "lib/opabsl/opabslgenMLRuntime_x.ml" "lib/opabsl/opabslgenMLRuntime.ml";
- ]
+ Seq[
+ cp "lib/opabsl/opabslgenMLRuntime_x.ml" "lib/opabsl/opabslgenMLRuntime.ml";
+ ]
);
let js_pp_bsl = dir_sources_bsl ~prefix:"opabslgen_" ~suffix:".pp" "lib/opabsl/jsbsl" in
@@ -556,13 +556,13 @@ rule "Client lib JS validation"
A"--js" :: A "lib/opabsl/jsbsl/jquery_ext_jQueryExtends.extern.js" ::
A"--js" :: A "lib/opabsl/jsbsl/selection_ext_bsldom.extern.js" ::
A"--js" :: A "lib/opabsl/jsbsl/jquery_extra.externs.js" ::
- A"--js" :: A"qmlcps/qmlCpsClientLib.js" ::
+ A"--js" :: A "compiler/qmlcps/qmlCpsClientLib.js" ::
[]
))
]
in
Seq (
- run_check "qmljsimp/qmlJsImpClientLib.js" "lib/opabsl/js_validation/imp_client_lib.js"
+ run_check "compiler/qmljsimp/qmlJsImpClientLib.js" "lib/opabsl/js_validation/imp_client_lib.js"
)
);
@@ -913,7 +913,7 @@ let package_building ?(nodebackend=false) ~name ~stamp ~stdlib_only ~rebuild ()
(fun env build ->
try
let plugins = string_list_of_file all_plugins_file in
- let plugins = List.map (fun f -> "plugins" / f / f -.- "oppf") plugins in
+ let plugins = List.map (fun f -> "lib/plugins" / f / f -.- "oppf") plugins in
build_list build plugins;
let packages = string_list_of_file (all_packages_file nodebackend) in
let packages =
View
110 build_tools
@@ -10,86 +10,86 @@
# the build_target is the name of the exe as understood by ocamlbuild.
# install dir is relative to the installation prefix, default is "bin/"
-# # from opageneral itself
+# from opageneral itself
internal ppdebug compiler/pplib/ppml.native
-# internal ppdebug-opa compiler/pplib/ppopa.native
+internal ppdebug-opa compiler/pplib/ppopa.native
internal ppjs compiler/pplib/ppjs.native
-# # from libqml
+# from libqml
internal mlstate_platform ocamllib/libbase/gen_platform
internal trx tools/teerex/trx_ocaml.native
-# internal trx_interpreter compiler/teerex/trx_interpreter.native
+internal trx_interpreter tools/teerex/trx_interpreter.native
internal opa-plugin-builder-bin compiler/libbsl/bslregister.native lib/opa/bin
-# internal opa-plugin-browser-bin compiler/libbsl/bslbrowser.native lib/opa/bin
-# internal bslbrowser compiler/libbsl/bslbrowser
-# internal passdesign compiler/passlib/passdesign.native
-# internal ocamlbase.top ocamllib/ocamlbase.top
-# internal ocamlbase ocamllib/libbase/ocamlbase
-# internal opa-db-server ocamllib/database/database_server.native
-# internal opa-db-tool ocamllib/database/database_tool.native
-# internal opatrack compiler/passlib/opatrack.sh
-# internal opadep compiler/compilerlib/opadep.sh
-# internal filepos ocamllib/libbase/testfilepos.native
+internal opa-plugin-browser-bin compiler/libbsl/bslbrowser.native lib/opa/bin
+internal bslbrowser compiler/libbsl/bslbrowser
+internal passdesign compiler/passlib/passdesign.native
+internal ocamlbase.top ocamllib/ocamlbase.top
+internal ocamlbase ocamllib/libbase/ocamlbase
+internal opa-db-server ocamllib/database/database_server.native
+internal opa-db-tool ocamllib/database/database_tool.native
+internal opatrack compiler/passlib/opatrack.sh
+internal opadep compiler/compilerlib/opadep.sh
+internal filepos ocamllib/libbase/testfilepos.native
internal genproto compiler/protocols/genproto.native
internal mlidl compiler/protocols/mlidl.native
internal wsdl2ml compiler/protocols/wsdl2ml.native
-# internal jsstat compiler/jslang/jsstat.native
+internal jsstat compiler/jslang/jsstat.native
-# # from qml2llvm
-# internal opatop compiler/opatop/opatop.native
-# internal qmljs compiler/qmlcompilers/qmljs_exe.native
-# internal qmlJsImpClientLib.js compiler/qmljsimp/qmlJsImpClientLib.js lib/opa/static
-# internal clientLibLib.js compiler/qml2js/clientLibLib.js lib/opa/static
-# internal qmlCpsClientLib.js compiler/qmlcps/qmlCpsClientLib.js lib/opa/static
-# internal qmlNoCpsClientLib.js compiler/qmlcps/qmlNoCpsClientLib.js lib/opa/static
-# internal odep tools/odep.native
-# internal odeplink tools/odeplink.native
+# from qml2llvm
+internal opatop compiler/opatop/opatop.native
+internal qmljs compiler/qmlcompilers/qmljs_exe.native
+internal qmlJsImpClientLib.js compiler/qmljsimp/qmlJsImpClientLib.js lib/opa/static
+internal clientLibLib.js compiler/qml2js/clientLibLib.js lib/opa/static
+internal qmlCpsClientLib.js compiler/qmlcps/qmlCpsClientLib.js lib/opa/static
+internal qmlNoCpsClientLib.js compiler/qmlcps/qmlNoCpsClientLib.js lib/opa/static
+internal odep tools/odep.native
+internal odeplink tools/odeplink.native
-# # from opa
-# internal opa2opa compiler/opalang/opa2opa.native
+# from opa
+internal opa2opa compiler/opalang/opa2opa.native
internal ofile tools/ofile.native
-# internal opa-translate compiler/opa/syntaxHelper.native
+internal opa-translate compiler/opa/syntaxHelper.native
-# # The name of opa raw executable, following unix guidelines (e.g. firefox distrib)
-# # when there is a wraper used to call a raw exe
+# The name of opa raw executable, following unix guidelines (e.g. firefox distrib)
+# when there is a wraper used to call a raw exe
internal opa-bin compiler/opa/main.native lib/opa/bin
-# internal opa_bash_completion tools/bash/bash_completion share/opa
+internal opa_bash_completion tools/bash/bash_completion share/opa
-# # for now, these can't be built cleanly from opageneral
-# internal opabslgen.bypass lib/opabsl/opabslgen.bypass lib/opa/static
-# internal serverLib.cmi lib/opabsl/serverLib.cmi lib/opa/static
+# for now, these can't be built cleanly from opageneral
+internal opabslgen.bypass lib/opabsl/opabslgen.bypass lib/opa/static
+internal serverLib.cmi lib/opabsl/serverLib.cmi lib/opa/static
-# # for helping developpers of plugins we can distribute the source of the interface
-# internal bslServerLib.ml ocamllib/libbase/bslServerLib.ml lib/opa/static
+# for helping developpers of plugins we can distribute the source of the interface
+internal bslServerLib.ml ocamllib/libbase/bslServerLib.ml lib/opa/static
-# # slicer plugin
-# # internal testSlicerPlugin.cmxs plugins/testSlicerPlugin.cmxs plugins
-# # internal testSlicerMLRuntime.cmx plugins/testSlicerMLRuntime.cmx plugins
-# # internal testSlicerMLRuntime.cmi plugins/testSlicerMLRuntime.cmi plugins
-# # internal testSlicerMLRuntime.o plugins/testSlicerMLRuntime.o plugins
-# # internal testSlicerJSPlugin.js plugins/testSlicerJSRuntime.js plugins
+# slicer plugin
+# internal testSlicerPlugin.cmxs plugins/testSlicerPlugin.cmxs plugins
+# internal testSlicerMLRuntime.cmx plugins/testSlicerMLRuntime.cmx plugins
+# internal testSlicerMLRuntime.cmi plugins/testSlicerMLRuntime.cmi plugins
+# internal testSlicerMLRuntime.o plugins/testSlicerMLRuntime.o plugins
+# internal testSlicerJSPlugin.js plugins/testSlicerJSRuntime.js plugins
-# # javascript checker
+# javascript checker
internal jschecker.jar tools/jschecker/compiler.jar share/opa/jschecker
internal jschecker_cpsclientlib.js compiler/qmlcps/qmlCpsClientLib-external.js share/opa/jschecker
internal jschecker_clientlib.js compiler/qml2js/clientLib-external.js share/opa/jschecker
internal jschecker_clientliblib.js compiler/qml2js/clientLibLib-external.js share/opa/jschecker
internal jschecker_externals.js tools/jschecker/externals.js share/opa/jschecker
-internal jschecker_jquery.js compiler/opabsl/jsbsl/jquery-1.6.externs.js share/opa/jschecker
+internal jschecker_jquery.js lib/opabsl/jsbsl/jquery-1.6.externs.js share/opa/jschecker
-# # for the linking of servers
-# internal runtimeMain.cmx ocamllib/libnet/runtimeMain.cmx lib/opa/static
-# internal runtimeMain.cmo ocamllib/libnet/runtimeMain.cmo lib/opa/static
-# internal runtimeMain.o ocamllib/libnet/runtimeMain.o lib/opa/static
+# for the linking of servers
+internal runtimeMain.cmx ocamllib/libnet/runtimeMain.cmx lib/opa/static
+internal runtimeMain.cmo ocamllib/libnet/runtimeMain.cmo lib/opa/static
+internal runtimeMain.o ocamllib/libnet/runtimeMain.o lib/opa/static
-# # mimetype database
-# internal mimetype_database.xml ocamllib/libbase/mimetype_database.xml share/opa
+# mimetype database
+internal mimetype_database.xml ocamllib/libbase/mimetype_database.xml share/opa
-# # dissemination
-# internal opa-cloud tools/dissemination/spawn.sh
+# dissemination
+internal opa-cloud tools/dissemination/spawn.sh
-# # manpages
-# internal gen_opa_manpage compiler/opa/gen_opa_manpage.native
-# internal gen_opatop_manpage compiler/opatop/gen_opatop_manpage.native
-# internal genman tools/manpages/genman.native
+# manpages
+internal gen_opa_manpage compiler/opa/gen_opa_manpage.native
+internal gen_opatop_manpage compiler/opatop/gen_opatop_manpage.native
+internal genman tools/manpages/genman.native
View
1  compiler/_tags
@@ -3,3 +3,4 @@
# COMPILER TAGS
#
+<{buildinfos,compilerlib,jslang,libbsl,libqmlcompil,libtrx,ocamllang,opa,opacapi,opalang,opalib,opatop,passes,passlib,pplib,protocols,qml2js,qml2ocaml,qmlcompilers,qmlcps,qmlflat,qmljsimp,qmlpasses,qmlslicer/}>: traverse
View
2  compiler/opatop/_tags
@@ -2,6 +2,8 @@
# 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, iconv
+<lib/opabsl>: traverse
+
<gen_opatop_manpage.*>: use_pplib
<opatop.*>: use_pplib
View
2  lib/_tags
@@ -1,6 +1,6 @@
# -*- conf -*- (for emacs)
#
-# GLOBAL TAGS
+# LIB TAGS
#
<{experimental,opabsl,plugins,stdlib}>: traverse
View
0  opabsl/nodejsbsl/bslI18n.nodejs → lib/opabsl/nodejsbsl/bslI18n.nodejs
File renamed without changes
View
0  opabsl/nodejsbsl/bslSession.nodejs → lib/opabsl/nodejsbsl/bslSession.nodejs
File renamed without changes
View
0  stdlib/tools/gpx/gpx.opa → lib/stdlib/tools/gpx/gpx.opa
File renamed without changes
View
10 ocamllib/_tags
@@ -3,4 +3,12 @@
# OCAMLLIB TAGS
#
-<{appruntime,database,libbase,libirc,libnet,libruntime,libsecurity,libsession,libtools,oparuntime}>: traverse
+<{appruntime,database,libbase,libirc,libnet,libruntime,libsecurity,libsession,libtools,oparuntime}>: traverse
+
+<{libbase.{cma,cmxa},ocamlbase.top}>: use_stubs
+<ocamlbase.top>: thread, use_unix, use_str, use_zip, use_ulex, iconv
+
+<libsecurity.*a>: use_ssl_ext
+<appruntime.*a>: use_io
+
+<libnattraversal.*a>: use_miniupnpc_idl, use_natpmp_idl
View
4 ocamllib/appruntime/io/binding_epoll.c
@@ -1,5 +1,5 @@
/*
- Copyright © 2011 MLstate
+ Copyright © 2011, 2012 MLstate
This file is part of OPA.
@@ -31,7 +31,7 @@
#include <caml/fail.h>
#include <caml/threads.h>
-#include "libbase/mlstate_platform.h"
+#include "ocamllib/libbase/mlstate_platform.h"
#define EXPORT(name,v) \
CAMLprim value ep_##name() \
View
28 ocamllib/appruntime/io/binding_iocp.c
@@ -1,5 +1,5 @@
/*
- Copyright © 2011 MLstate
+ Copyright © 2011, 2012 MLstate
This file is part of OPA.
@@ -19,7 +19,7 @@
@author Laurent Le Brun
**/
-/**
+/**
socket : unit -> Unix.file_descr = "iocp_ml_socket"
async_wait : int -> int = "wait"
async_accept : Unix.file_descr -> int = "iocp_ml_accept"
@@ -37,7 +37,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "libbase/mlstate_platform.h"
+#include "ocamllib/libbase/mlstate_platform.h"
#ifdef MLSTATE_WINDOWS
#include <Winsock2.h>
@@ -350,24 +350,24 @@ int async_accept(SOCKET ListenSocket)
memset((OVERLAPPED*)ctx, 0, sizeof(OVERLAPPED));
- WSAIoctl(ListenSocket,
- SIO_GET_EXTENSION_FUNCTION_POINTER,
- &GuidAcceptEx,
+ WSAIoctl(ListenSocket,
+ SIO_GET_EXTENSION_FUNCTION_POINTER,
+ &GuidAcceptEx,
sizeof(GuidAcceptEx),
- &lpfnAcceptEx,
- sizeof(lpfnAcceptEx),
- &dwBytes,
- NULL,
+ &lpfnAcceptEx,
+ sizeof(lpfnAcceptEx),
+ &dwBytes,
+ NULL,
NULL);
- lpfnAcceptEx(ListenSocket,
+ lpfnAcceptEx(ListenSocket,
AcceptSocket,
lpOutputBuf,
0,
- sizeof(sockaddr_in) + 16,
- sizeof(sockaddr_in) + 16,
- &dwBytes,
+ sizeof(sockaddr_in) + 16,
+ sizeof(sockaddr_in) + 16,
+ &dwBytes,
(OVERLAPPED*)ctx);
//----------------------------------------
View
166 ocamllib/database.mllibp
@@ -1,95 +1,95 @@
# -*- conf -*-
# low_level Io
-ocamllib/database/db3/io/FileIo
-ocamllib/database/db3/io/IoMmap
-ocamllib/database/db3/io/IoUnix
-ocamllib/database/db3/io/DbIoSig
-ocamllib/database/db3/io/DbIo
-ocamllib/database/db3/io/IoSig
-ocamllib/database/db3/io/DbTypes
+database/db3/io/FileIo
+database/db3/io/IoMmap
+database/db3/io/IoUnix
+database/db3/io/DbIoSig
+database/db3/io/DbIo
+database/db3/io/IoSig
+database/db3/io/DbTypes
# Db3 low-level
-ocamllib/database/db3/IoManager
-ocamllib/database/db3/Keys
-ocamllib/database/db3/Path
-ocamllib/database/DataImpl
-ocamllib/database/db3/Datas
-ocamllib/database/db3/Common
-ocamllib/database/db3/Eid
-ocamllib/database/db3/EidMap
-ocamllib/database/db3/Uid
-ocamllib/database/db3/UidMap
-ocamllib/database/db3/Revision
-ocamllib/database/db3/RevisionMap
-ocamllib/database/db3/KeyMap
-ocamllib/database/db3/KeyRecMap
-ocamllib/database/db3/Node
-ocamllib/database/db3/Hldb
-ocamllib/database/db3/QueryMap
-ocamllib/database/db3/Unwind
-ocamllib/database/db3/Transaction
-ocamllib/database/db3/RevisionMachine
-ocamllib/database/db3/Dot
-ocamllib/database/db3/Session
+database/db3/IoManager
+database/db3/Keys
+database/db3/Path
+database/DataImpl
+database/db3/Datas
+database/db3/Common
+database/db3/Eid
+database/db3/EidMap
+database/db3/Uid
+database/db3/UidMap
+database/db3/Revision
+database/db3/RevisionMap
+database/db3/KeyMap
+database/db3/KeyRecMap
+database/db3/Node
+database/db3/Hldb
+database/db3/QueryMap
+database/db3/Unwind
+database/db3/Transaction
+database/db3/RevisionMachine
+database/db3/Dot
+database/db3/Session
# Migration machinery (binary changes)
-ocamllib/database/db3/migration/Init
-ocamllib/database/db3/migration/Migration_18
-ocamllib/database/db3/migration/Migration_19
-ocamllib/database/db3/migration/Migration_20
-ocamllib/database/db3/migration/Migration_21
-ocamllib/database/db3/migration/Migration_22
-ocamllib/database/db3/migration/Migration_23
-ocamllib/database/db3/migration/Migration_24
-ocamllib/database/db3/migration/Migration_25
-ocamllib/database/db3/migration/Migration_26
-ocamllib/database/db3/migration/Migration
+database/db3/migration/Init
+database/db3/migration/Migration_18
+database/db3/migration/Migration_19
+database/db3/migration/Migration_20
+database/db3/migration/Migration_21
+database/db3/migration/Migration_22
+database/db3/migration/Migration_23
+database/db3/migration/Migration_24
+database/db3/migration/Migration_25
+database/db3/migration/Migration_26
+database/db3/migration/Migration
# Badop interface generic
-ocamllib/database/badop/Badop_structure
-ocamllib/database/badop/Badop_lib
-ocamllib/database/Badop
+database/badop/Badop_structure
+database/badop/Badop_lib
+database/Badop
# Badop backends: database
-ocamllib/database/Badop_local
-ocamllib/database/Badop_sync
-ocamllib/database/Badop_trans
+database/Badop_local
+database/Badop_sync
+database/Badop_trans
# Badop backends: client-server
-ocamllib/database/Badop_protocol
-ocamllib/database/Badop_server
-ocamllib/database/Badop_client
-ocamllib/database/Badop_locator
-ocamllib/database/Badop_dispatcher
+database/Badop_protocol
+database/Badop_server
+database/Badop_client
+database/Badop_locator
+database/Badop_dispatcher
# Badop more functor fun
-ocamllib/database/Badop_wrapper_template
-ocamllib/database/Badop_stash
-ocamllib/database/Badop_cache
-ocamllib/database/Badop_debug
-ocamllib/database/Badop_stats
-ocamllib/database/Badop_workaround
-ocamllib/database/Badop_check
+database/Badop_wrapper_template
+database/Badop_stash
+database/Badop_cache
+database/Badop_debug
+database/Badop_stats
+database/Badop_workaround
+database/Badop_check
# support for run-time choice of backend (Ocaml 3.12)
-ocamllib/database/Badop_meta
+database/Badop_meta
# high-level run-time schema support
-ocamllib/database/Gml_parser
-ocamllib/database/Dbgraph
-ocamllib/database/Xml_dump
-#ocamllib/database/Xml_import
+database/Gml_parser
+database/Dbgraph
+database/Xml_dump
+#database/Xml_import
#Internal structs
-ocamllib/database/db3/structs/SigListMap
-ocamllib/database/db3/structs/RaListMap
-ocamllib/database/db3/structs/SimpleListMap
-ocamllib/database/db3/structs/TabMap
+database/db3/structs/SigListMap
+database/db3/structs/RaListMap
+database/db3/structs/SimpleListMap
+database/db3/structs/TabMap
# Badop light
-?HAS_DBM:ocamllib/database/Badop_light
-?HAS_DBM:ocamllib/database/light/Node_light
-?HAS_DBM:ocamllib/database/light/Session_light
-?HAS_DBM:ocamllib/database/light/Session_light_sig
-?HAS_DBM:ocamllib/database/light/Transaction_light
-?HAS_DBM:ocamllib/database/light/Transaction_light_sig
-?HAS_DBM:ocamllib/database/light/Db_light
-?HAS_DBM:ocamllib/database/light/Db_light_sig
-?HAS_DBM:ocamllib/database/light/Io_light
-?HAS_DBM:ocamllib/database/light/Io_light_sig
-?HAS_DBM:ocamllib/database/light/Encode_light
-?HAS_DBM:ocamllib/database/light/Mem_tree_light
-?HAS_DBM:ocamllib/database/light/Mst
-?HAS_DBM:ocamllib/database/light/KeySet
-?HAS_DBM:ocamllib/database/light/DbSig
-?HAS_DBM:ocamllib/database/light/DbmDB
+?HAS_DBM:database/Badop_light
+?HAS_DBM:database/light/Node_light
+?HAS_DBM:database/light/Session_light
+?HAS_DBM:database/light/Session_light_sig
+?HAS_DBM:database/light/Transaction_light
+?HAS_DBM:database/light/Transaction_light_sig
+?HAS_DBM:database/light/Db_light
+?HAS_DBM:database/light/Db_light_sig
+?HAS_DBM:database/light/Io_light
+?HAS_DBM:database/light/Io_light_sig
+?HAS_DBM:database/light/Encode_light
+?HAS_DBM:database/light/Mem_tree_light
+?HAS_DBM:database/light/Mst
+?HAS_DBM:database/light/KeySet
+?HAS_DBM:database/light/DbSig
+?HAS_DBM:database/light/DbmDB
View
2  ocamllib/libirc/default.trx
View
4 ocamllib/libirc/ircBotCore.proto
@@ -1,7 +1,7 @@
% vim: syntax=erlang
%
-% Copyright © 2011 MLstate
+% Copyright © 2011, 2012 MLstate
%
% This file is part of OPA.
%
@@ -21,7 +21,7 @@
-generate client
-protocol IRC
-debugvar PROTOCOL_DEBUG
--include "libirc/ircMessages.proto"
+-include "ocamllib/libirc/ircMessages.proto"
-type irc = {
username:string;
View
0  compiler/libnattraversal.mllib → ocamllib/libnattraversal.mllib
File renamed without changes
View
2  ocamllib/libnet/default.trx
View
8 ocamllib/libnet/ftpClientCore.proto
@@ -1,7 +1,7 @@
% -*-erlang-*-
%
-% Copyright © 2011 MLstate
+% Copyright © 2011, 2012 MLstate
%
% This file is part of OPA.
%
@@ -38,7 +38,7 @@
content_hint:int
}
--type result =
+-type result =
| Ok of content
| Error of string
@@ -67,7 +67,7 @@
-define (ENs (num : int, str)) = num "-" str "\r\n"
-define (Ns (num : int, str)) = num " " str "\r\n"
--include "libnet/ftpMessages.proto"
+-include "ocamllib/libnet/ftpMessages.proto"
{{
let dlog sep code _msg = Logger.debug "<<< %d%s%s" code sep _msg
@@ -196,7 +196,7 @@ input_ascii_file(state, ftp, content_ref):
%% % TODO: crlf conversion??? (BIN mode).
%% %let buff = {{ FtpServerType.crlf2cr buff }}
%% input_ascii_file(state, ftp, content_ref)
-
+
%% input_ascii_file_n(state, ftp, content):
%% debug 2 {{ Logger.debug "input_ascii_file_n" }}
View
58 ocamllib/libnet/ftpServerCore.proto
@@ -1,7 +1,7 @@
-generate server (* -*-erlang-*- *)
%
-% Copyright © 2011 MLstate
+% Copyright © 2011, 2012 MLstate
%
% This file is part of OPA.
%
@@ -23,7 +23,7 @@
% ftpServer:
% o Conforms to RFC1123 updated minimal server requirements.
%
-
+
% TODO: (-=todo, /=partial, +=done)
% o RFC959
% + USER <SP> <username> <CRLF>
@@ -77,10 +77,10 @@
-open Printf
-open FtpServerType
--include "libnet/ftpResponses.proto"
--include "libnet/ftpMessages.proto"
+-include "ocamllib/libnet/ftpResponses.proto"
+-include "ocamllib/libnet/ftpMessages.proto"
-type payload = unit
--include "libnet/rt_proto.proto"
+-include "ocamllib/libnet/rt_proto.proto"
-type runtime = {
rt_plim : int;
@@ -110,7 +110,7 @@ wait_for_login(state):
let state = {{ {state with is_admin = false; user = Some str} }}
send(OkLogin);
wait_for_request(state)
- | Syst ->
+ | Syst ->
{{ Printf.eprintf "Syst\n%!" }}
send(OkSyst);
wait_for_login(state)
@@ -118,7 +118,7 @@ wait_for_login(state):
let str = {{ state.goodbye_message }}
send(Bye str);
-!-
- | msg ->
+ | msg ->
{{ Printf.eprintf "Error %s\n%!" (string_of_msg msg) }}
send(ErrLogin);
wait_for_login(state)
@@ -367,7 +367,7 @@ do_wait_for_request(state):
change_dir(state,str)
% Return current directory
- | Pwd ->
+ | Pwd ->
let s = {{ pwd state }}
send(OkPwd s);
wait_for_request(state)
@@ -401,7 +401,7 @@ do_wait_for_request(state):
;
% Define the data port, addr and port no.
- | Port str ->
+ | Port str ->
let state_ok = {{ set_port state str }}
let state = {{ fst state_ok }}
if {{ snd state_ok }}
@@ -414,7 +414,7 @@ do_wait_for_request(state):
end
% Set the transfer type
- | Type str ->
+ | Type str ->
let state_msg = {{ set_type state str }}
let state = {{ fst state_msg }}
let msg = {{ snd state_msg }}
@@ -429,7 +429,7 @@ do_wait_for_request(state):
wait_for_request(state)
% Set the data structure
- | Stru str ->
+ | Stru str ->
let state_msg = {{ set_structure_code state str }}
let state = {{ fst state_msg }}
let msg = {{ snd state_msg }}
@@ -444,7 +444,7 @@ do_wait_for_request(state):
wait_for_request(state)
% Set the transfer mode
- | Mode str ->
+ | Mode str ->
match {{ set_transfer_mode state str }} with
| (state,"200") ->
send(OkCmd "Command okay.");
@@ -522,24 +522,24 @@ do_wait_for_request(state):
wait_for_request(state)
% Delete file
- | Dele str ->
+ | Dele str ->
file_action(state,str,delete_folder)
% Create directory.
- | Mkd str ->
+ | Mkd str ->
file_action(state,str,create_directory)
% Create directory.*)
- | Rmd str ->
+ | Rmd str ->
file_action(state,str,delete_directory)
% System type, just send the usual UNIX one.
- | Syst ->
+ | Syst ->
send(OkSyst);
wait_for_request(state)
% System type, just send the usual UNIX one.
- | Stat ->
+ | Stat ->
send(OkStat211a);
let statstr = {{ server_status state conn }}
send(Dummy statstr);
@@ -547,50 +547,50 @@ do_wait_for_request(state):
wait_for_request(state)
% Seems to be redundant
- | Allo1 ->
+ | Allo1 ->
send(OkAllo);
wait_for_request(state)
- | Allo2 _ ->
+ | Allo2 _ ->
send(OkAllo);
wait_for_request(state)
- | Allo3 _ ->
+ | Allo3 _ ->
send(OkAllo);
wait_for_request(state)
% File size, with no argument???
- | Size ->
+ | Size ->
send(ErrNoSize);
wait_for_request(state)
% File size, as it would be transmitted
- | SizeS _ ->
+ | SizeS _ ->
send(ErrNoSize);
wait_for_request(state)
% File mdtm, with no argument???
- | Mdtm ->
+ | Mdtm ->
send(ErrNoMdtm);
wait_for_request(state)
% File modification time
- | MdtmS _ ->
+ | MdtmS _ ->
send(ErrNoMdtm);
wait_for_request(state)
% Help string, just send implemented commands.
- | Help ->
+ | Help ->
transmit_help(state)
- | HelpS _ ->
+ | HelpS _ ->
transmit_help(state)
% Account, not implemented.
- | Acct _ ->
+ | Acct _ ->
send(ErrAcct);
wait_for_request(state)
% Do nothing, but it's in the minimal spec.
- | Noop ->
+ | Noop ->
send(OkCmd "Command okay.");
wait_for_request(state)
@@ -610,7 +610,7 @@ do_wait_for_request(state):
send(ErrTime);
let str = {{ state.goodbye_message }}
send(Bye str);
- -!-
+ -!-
set_pasv_port_conn(state):
let _ = {{ sched }}
View
8 ocamllib/libnet/httpServerCore.proto
@@ -32,10 +32,10 @@
%-modalias S = String
% This will be for the raw parser
-%-include "libnet/httpMessages.proto"
+%-include "ocamllib/libnet/httpMessages.proto"
--include "libnet/http_messages.proto"
--include "libnet/http_rr.proto"
+-include "ocamllib/libnet/http_messages.proto"
+-include "ocamllib/libnet/http_rr.proto"
-define Crlf = "\r\n"
-define EndBoundary b = "--" !"\r\n" b "--\r\n"
@@ -74,7 +74,7 @@
}
-type payload = string * (header list)
--include "libnet/rt_proto.proto"
+-include "ocamllib/libnet/rt_proto.proto"
-type rt_tmp =
{
View
4 ocamllib/libnet/imapClientCore.proto
@@ -1,7 +1,7 @@
% -*-proto-*-
%
-% Copyright © 2011 MLstate
+% Copyright © 2011, 2012 MLstate
%
% This file is part of OPA.
%
@@ -91,7 +91,7 @@
}
-type payload = unit
--include "libnet/rt_proto.proto"
+-include "ocamllib/libnet/rt_proto.proto"
-type rt_tmp =
{
View
6 ocamllib/libnet/smtpClientCore.proto
@@ -1,7 +1,7 @@
% -*-proto-*-
%
-% Copyright © 2011 MLstate
+% Copyright © 2011, 2012 MLstate
%
% This file is part of OPA.
%
@@ -53,7 +53,7 @@
}
-type payload = unit
--include "libnet/rt_proto.proto"
+-include "ocamllib/libnet/rt_proto.proto"
%-type rt_proto = {
% rt_block_size : int;
% rt_backtrace : bool;
@@ -209,7 +209,7 @@ data(mail, tools):
{{ Buffer.add_string mail.sent dot_stuff }}
send (RawInput dot_stuff);
enddata(mail, tools, {{ String.is_suffix "\r\n" dot_stuff }})
- | ENs (a, b) ->
+ | ENs (a, b) ->
debug {{ eprintf "data received ENs: %d %s\n" a b }}
{{ tools.elog a b }} handle_error(tools, a,b)
| Ns (a, b) -> {{ tools.log a b }} handle_error(tools, a, b)
View
2  ocamllib/libnet/smtpServerCore.proto
@@ -41,7 +41,7 @@
}
-type payload = unit
--include "libnet/rt_proto.proto"
+-include "ocamllib/libnet/rt_proto.proto"
-type runtime = {
rt_plim : int;
View
8 tools/_tags
@@ -1,3 +1,10 @@
+# -*- conf -*- (for emacs)
+#
+# TOOLS TAGS
+#
+
+<dependencies>: -include, -traverse
+
# Odep
<odep*.{ml,byte,native}>: thread, use_str, use_unix, use_graph, use_zip, use_libbase, use_ulex
@@ -19,5 +26,6 @@
<opa-create/**>: traverse
<teerex/**>: traverse
+<dissemination>: traverse
<ocamldoc_plugin.{ml,byte,native}>: use_ocamldoc
View
24 tools/build/myocamlbuild_prefix.ml
@@ -40,6 +40,7 @@ let windows_mode = (os = Win32)
let c_wall,c_werror =
if windows_mode (*&& compiler=microsoft*) then "/Wall","/Wall"
+ (* -Wdeprecated-declarations added for OpenSSL deprecation on 10.8 *)
else if is_mac then "-Wall -Wdeprecated-declarations","-Wall"
else "-Wall","-Werror"
@@ -106,11 +107,10 @@ let set_tool ~internal ?(env="") name f =
in Hashtbl.add tools_table name tool
let tool_deps name =
- try
- (match Hashtbl.find tools_table name with
- | Internal f -> [f]
- | External f -> [])
- with Not_found -> failwith ("Build tool not found (tool_deps) : "^name)
+ try begin match Hashtbl.find tools_table name with
+ | Internal f -> [f]
+ | External f -> []
+ end with Not_found -> failwith ("Build tool not found (tool_deps) : "^name)
let get_tool ?local:(local=false) name =
try
@@ -156,7 +156,8 @@ let trx_build_aux ~just_binary src dst ext ops = fun env build ->
aux (((f :: path), deps) :: (path, rest) :: todo) in
aux [[], [f]]
in
- let trx_cache_tag = Tags.does_match (tags_of_pathname (env src)) (Tags.of_list ["trx_cache"]) in
+ let trx_cache_tag =
+ Tags.does_match (tags_of_pathname (env src)) (Tags.of_list ["trx_cache"]) in
let do_build () =
transitive_deps build (env src);
let trxexec = get_tool trx_tool in
@@ -270,6 +271,12 @@ let _ = dispatch begin function
let ocaml_lib ?(extern=false) ?dir ?tag_name lib =
let tag_name = match tag_name with None -> "use_"^lib | Some n -> n in
+ let lib = match dir with
+ | Some d ->
+ let dir = Pathname.dirname d in
+ if String.get dir 0 == '/' then lib
+ else dir/lib
+ | None -> lib in
ocaml_lib ~extern ?dir ~tag_name lib;
match dir with Some dir -> flag ["use_"^lib; "doc"] (S[A"-I"; P dir])
| None -> ()
@@ -297,8 +304,9 @@ let _ = dispatch begin function
let dir = match dir with None -> lib | Some dir -> dir in
Hashtbl.add mlstate_libs_table lib ([lib],dir);
ocaml_lib ~dir lib;
- dep ["use_"^lib; "byte"] [(Pathname.dirname dir)/(lib^".cma")];
- dep ["use_"^lib; "native"] [(Pathname.dirname dir)/(lib^".cmxa")]
+ let pfx = Pathname.dirname dir in
+ dep ["use_"^lib; "byte"] [pfx/lib^".cma"];
+ dep ["use_"^lib; "native"] [pfx/lib^".cmxa"];
(* How this works: the ~dir is only the top-level of the lib, hence
the .cmi from sub-directories are not seen. That's good, use them
for modules internal to your library *)
View
5 tools/teerex/_tags
@@ -1,6 +1,9 @@
<{mouse,java}>: traverse
+
<*.trx>: trx_cache
-<*.{ml,mli,byte,native}>: use_str, use_ulex, use_libbase, use_compilerlib, use_passlib, use_graph, use_libtrx, use_ocamllang, use_zip, use_buildinfos
+
+<*.{ml,mli,byte,native}>: use_str, use_libbase, use_compilerlib, use_graph, use_libtrx, use_ocamllang, use_zip, use_buildinfos
+#, use_passlib, use_ulex,
<trx_ocaml.{byte,native}>: thread, use_unix
<trx_ocaml_main.{byte,native}>: thread, use_unix
Please sign in to comment.
Something went wrong with that request. Please try again.