Permalink
Browse files

Rename 'OASIS' exec to 'oasis' (Closes: #769)

Ignore-this: 3683db2e3aaea2cef9dd328ca8a6bd93

This patch also splits OASISConf.version between version_full and
version_short. It avoids too much versions for only minor releases.

darcs-hash:20101015093758-a43a9-e6e1326a7222ca35e69f1e4d6bb0e6f64b84db3e
  • Loading branch information...
1 parent 82581a3 commit a2875754b473a55d086f36dc80b01319f6373f57 @gildor478 gildor478 committed Oct 15, 2010
View
@@ -179,7 +179,7 @@ Library cli
Install$: flag(libraries)
-Executable OASIS
+Executable oasis
Path: src/cli
MainIs: Main.ml
BuildDepends: oasis, oasis.base, oasis.cli, oasis.builtin-plugins
@@ -193,17 +193,17 @@ Executable test
Test main
Type: custom (0.1.0)
- Command: $test -oasis-exec $OASIS -has-ocamlopt $is_native
+ Command: $test -oasis-exec $oasis -has-ocamlopt $is_native
WorkingDirectory: test
- TestTools: OASIS, test
+ TestTools: oasis, test
Document manual
Type: custom (0.1.0)
Title: OASIS User Manual
if flag(gettext)
- XCustom: env LANG=C $OASIS manual > doc/MANUAL.mkd
+ XCustom: env LANG=C $oasis manual > doc/MANUAL.mkd
else
- XCustom: $OASIS manual > doc/MANUAL.mkd
+ XCustom: $oasis manual > doc/MANUAL.mkd
XCustomClean: $rm doc/MANUAL.mkd
DataFiles: doc/MANUAL.mkd
View
@@ -20,7 +20,7 @@
################################################################################
# OASIS_START
-# DO NOT EDIT (digest: faebd70ab65ed22b29926d59462ea068)
+# DO NOT EDIT (digest: 6aafe185defa04a606fef7201e83fcb6)
# Executable ocamlmod
"src/tools/ocamlmod.byte": pkg_pcre
"src/tools/ocamlmod.byte": pkg_fileutils
@@ -153,7 +153,7 @@
<test/*.ml{,i}>: pkg_fileutils
<test/*.ml{,i}>: pkg_extlib
<test/*.ml{,i}>: pkg_expect.pcre
-# Executable OASIS
+# Executable oasis
"src/cli/Main.byte": use_cli
"src/cli/Main.byte": use_builtin-plugins
"src/cli/Main.byte": use_base
View
@@ -27,13 +27,13 @@ configure step try to auto detect various parameters and see if they match with
should create files which summarize choices made. Files are created through
replacement of variable in files (%.ab -> %).
-We rely on OASIS file to describe "user choices" (Flag) and "build
+We rely on `_oasis` file to describe "user choices" (Flag) and "build
dependencies" (BuildDepends and BuildTools).
OASIS should provide 2 choices for configure:
- internal (default): an OCaml module is embedded in the project that perform
- all this checks, use translated OASIS in setup.ml structure.
-- ocaml-autoconf: use translated OASIS in configure.ac, output setup.data.
+ all this checks, use translated `_oasis` in setup.ml structure.
+- ocaml-autoconf: use translated `_oasis` in configure.ac, output setup.data.
build
-----
@@ -42,11 +42,11 @@ The build phase should build all the project objects. It should take care of
building native and bytecode object depending on the target system.
OASIS provides 3 choices for build:
-- ocamlbuild (default): use translated OASIS files (.mllib, .itarget...) and
+- ocamlbuild (default): use translated `_oasis` files (.mllib, .itarget...) and
ocamlbuild shipped with ocaml, add ocamlbuild detection to configure
-- OCamlMakefile: use translated OASIS files (Makefile) and OCamlMakefile
+- OCamlMakefile: use translated `_oasis` files (Makefile) and OCamlMakefile
shipped externally, add OCamlMakefile user choice and detection
-- OMake: use translated OASIS files (TODO)
+- OMake: use translated `_oasis` files (TODO)
build phase use configure phase result through a generated file that list
important variable regarding build process.
Oops, something went wrong. Retry.

0 comments on commit a287575

Please sign in to comment.