Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
cduce
cduce
Commits
339a5a79
Commit
339a5a79
authored
Oct 05, 2007
by
Pietro Abate
Browse files
[r2007-06-20 09:28:44 by afrisch] make it work with natdynlink
Original author: afrisch Date: 2007-06-20 09:28:44+00:00
parent
7896d25d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Makefile.distrib
View file @
339a5a79
default
:
cduce
include
Makefile.conf
include
VERSION
...
...
@@ -14,7 +16,7 @@ ifeq ($(NATIVE),true)
all
:
cduce_lib.cmxa
endif
PACKAGES
=
ulex
camlp4 pcre num netstring cgi
PACKAGES
=
camlp4
ulex
pcre num netstring cgi
# Call make with VERBOSE=true to get a trace of commands
...
...
@@ -66,7 +68,11 @@ ifeq ($(NATIVE), true)
EXTENSION_LIB
=
cmxa
CAML
=
ocamlopt
COMPILE
=
$(CAMLOPT)
LINK
=
$(CAMLOPT)
-linkpkg
camlp4lib.cmxa
LINK
=
$(CAMLOPT)
-linkpkg
ifeq
($(NATDYNLINK), true)
LINK
+=
dynlink.cmxa
endif
LINK
+=
camlp4lib.cmxa
SYNTAX
+=
-symbol
ocaml_compiler
=
\"
native
\"
else
EXTENSION
=
cmo
...
...
@@ -224,7 +230,8 @@ ALL_INTERFACES = schema/schema_types.mli
DEPEND
=
$(ALL_OBJECTS:.cmo=.ml)
$(ALL_OBJECTS:.cmo=.mli)
$(ALL_INTERFACES)
INCLUDES
=
$
(
DIRS:%
=
-I
%
)
-I
+camlp4
INCLUDES
=
$
(
DIRS:%
=
-I
%
)
# -I +camlp4
cduce
:
$(CDUCE:.cmo=.$(EXTENSION))
@
echo
"Build
$@
"
...
...
@@ -303,7 +310,7 @@ doc: cduce web/site.cdo
mkdir
-p
web/doc
(
cd
web
;
../cduce
--run
site.cdo
--arg
doc.xml
-o
doc
)
web/site.cdo
:
cduce web/xhtml.cdo web/site.cd
web/site.cdo
:
cduce web/xhtml.cdo web/site.cd
web/siteTypes.cd
./cduce
-I
web/
--compile
web/site.cd
web/xhtml.cdo
:
cduce web/xhtml.cd
...
...
configure.ml
View file @
339a5a79
...
...
@@ -241,6 +241,13 @@ let has_forpack =
else
(
print
"not available
\n
"
;
false
)
let
has_natdynlink
=
print
"testing for native dynlink: "
;
if
Sys
.
command
"ocamlopt -o foo dynlink.cmxa && rm -f foo"
=
0
then
(
printf
"available
\n
"
;
true
)
else
(
print
"not available
\n
"
;
false
)
let
()
=
List
.
iter
need_pkg
required_packages
;
if
pxp
then
(
...
...
@@ -271,4 +278,5 @@ let () =
fprintf
out
"EXE=%s
\n
"
exe
;
fprintf
out
"PROFILE=false
\n
"
;
fprintf
out
"FORPACK=%b
\n
"
has_forpack
;
fprintf
out
"NATDYNLINK=%b
\n
"
has_natdynlink
;
close_out
out
web/siteTypes.cd
View file @
339a5a79
...
...
@@ -29,7 +29,6 @@ type Link =
type Content =
[ ( <p style=?String>[InlineText*]
| <ul>[<li>Content +]
| <ol style=?String>[<li>Content +]
| <section title=String>Content
| <sample highlight=?"true"|"false">String
...
...
@@ -46,6 +45,7 @@ type Content =
| <footnotes>[]
| <xhtml>H.Flow
| <demo label=?String prefix=?String>String
| <ul>[<li>Content +]
| InlineText
)* ]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment