Skip to content

Commit

Permalink
Update to oasis 0.3, Makefile and configure script are now generated …
Browse files Browse the repository at this point in the history
…by oasis
  • Loading branch information
pveber committed Jun 8, 2012
1 parent 661a6aa commit 310c01a
Show file tree
Hide file tree
Showing 9 changed files with 2,497 additions and 2,153 deletions.
123 changes: 25 additions & 98 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,111 +1,38 @@
#################################################################################
# OCaml-R #
# #
# Copyright (C) 2008-2010 Institut National de Recherche en #
# Informatique et en Automatique. All rights reserved. #
# #
# Copyright (C) 2009-2010 Guillaume Yziquel. All rights reserved. #
# #
# This program is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as #
# published by the Free Software Foundation; either version 3 of the #
# License, or any later version. #
# #
# This program 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 General Public #
# License along with this program; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA #
# 02111-1307 USA #
# #
# Contact: Maxence.Guesdon@inria.fr #
# guillaume.yziquel@citycable.ch #
#################################################################################
# OASIS_START
# DO NOT EDIT (digest: bc1e05bfc8b39b664f29dae8dbd3ebbb)

# Compilation
#############
SETUP = ocaml setup.ml

first: src
all:
cd src && $(MAKE) all
build: setup.data
$(SETUP) -build $(BUILDFLAGS)

src: dummy
cd src && $(MAKE)
doc: setup.data build
$(SETUP) -doc $(DOCFLAGS)

install: dummy
cd src && $(MAKE) install
test: setup.data build
$(SETUP) -test $(TESTFLAGS)

re : depend clean all
all:
$(SETUP) -all $(ALLFLAGS)

install: setup.data
$(SETUP) -install $(INSTALLFLAGS)

# Documentation :
#################
doc: dummy
cd src && $(MAKE) doc
uninstall: setup.data
$(SETUP) -uninstall $(UNINSTALLFLAGS)

# myself
reinstall: setup.data
$(SETUP) -reinstall $(REINSTALLFLAGS)

master.Makefile: master.Makefile.in config.status
./config.status
clean:
$(SETUP) -clean $(CLEANFLAGS)

config.status: configure master.Makefile.in
./config.status --recheck
distclean:
$(SETUP) -distclean $(DISTCLEANFLAGS)

configure: configure.ac
autoconf
setup.data:
$(SETUP) -configure $(CONFIGUREFLAGS)

# headers :
###########
HEADFILES= configure.ac configure \
master.Makefile.in Makefile \
src/*.ml src/*.mli src/*.c src/math/*.ml src/math/*.mli src/math/*.c \
src/Makefile
headers: dummy
echo $(HEADFILES)
headache -h header -c .headache_config `ls $(HEADFILES)`
.PHONY: build doc test all install uninstall reinstall clean distclean configure

noheaders: dummy
headache -r -c .headache_config `ls $(HEADFILES)`

# backup, clean and depend :
############################

distclean: clean
$(RM) config.cache config.log config.status configure.lineno config.status.lineno
$(RM) master.Makefile
$(RM) config_check.log
$(RM) autom4te.cache

clean:: dummy
$(RM) *~ \#*\#
cd src && $(MAKE) clean


depend: dummy
cd src && $(MAKE) depend

dummy:

#################
# code count
#################
codecount:
@echo `cat src/*.ml src/*.mli | wc -l` lines


#################
# installation
#################

install: dummy
cd src && $(MAKE) install


###########################
# additional dependencies
###########################

# DO NOT DELETE
# OASIS_STOP
13 changes: 6 additions & 7 deletions _oasis
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
OASISFormat: 0.2
OASISFormat: 0.3
OCamlVersion: >= 3.12.0
Name: ocaml-r
Version: 2010-02-09
Authors: Maxence Guesdon, Guillaume Yziquel
License: GPL-3.0
LicenseFile: LICENSE
Plugins: META (0.2)
Buildtools: ocamlbuild
Synopsis: Objective Caml binding embedding R's interpreter into OCaml code
LicenseFile: LICENSE
Plugins: META (0.3), DevFiles (0.3)
Buildtools: ocamlbuild
Synopsis: Objective Caml binding embedding R's interpreter into OCaml code

Library R_math
FindlibName: math
Expand Down Expand Up @@ -64,7 +64,6 @@ Library R_interpreter
Modules: OCamlR
BuildDepends: R


Library R_base
FindlibName: base
FindlibParent: R
Expand Down Expand Up @@ -106,7 +105,7 @@ Library R_grDevices

Document doclib
Title: API reference for OCaml-R
Type: ocamlbuild (0.2)
Type: ocamlbuild (0.3)
Install: false
BuildTools+: ocamldoc
XOCamlbuildPath: src
Expand Down
58 changes: 36 additions & 22 deletions _tags
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
# OASIS_START
# DO NOT EDIT (digest: 36ed67ef6b454c739e3da18b047ab06f)
# DO NOT EDIT (digest: 5f471db2fa3fab727616dce36572400d)
# 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
<**/.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 R
"src/R.cmxs": use_R
<src/*.ml{,i}>: oasis_library_r_ccopt
"src/initialisation_stub.c": oasis_library_r_ccopt
"src/databridge.c": oasis_library_r_ccopt
Expand All @@ -15,11 +29,11 @@
"src/reduction_stub.c": oasis_library_r_ccopt
"src/parser_stub.c": oasis_library_r_ccopt
<src/R.{cma,cmxa}>: oasis_library_r_cclib
"src/libR.lib": oasis_library_r_cclib
"src/dllR.dll": oasis_library_r_cclib
"src/libR.a": oasis_library_r_cclib
"src/dllR.so": oasis_library_r_cclib
<src/R.{cma,cmxa}>: use_libR
"src/libR_stubs.lib": oasis_library_r_cclib
"src/dllR_stubs.dll": oasis_library_r_cclib
"src/libR_stubs.a": oasis_library_r_cclib
"src/dllR_stubs.so": oasis_library_r_cclib
<src/R.{cma,cmxa}>: use_libR_stubs
"src/initialisation_stub.c": pkg_calendar
"src/databridge.c": pkg_calendar
"src/sexp.c": pkg_calendar
Expand All @@ -33,42 +47,42 @@
"src/reduction_stub.c": pkg_calendar
"src/parser_stub.c": pkg_calendar
# Library R_interpreter
"src": include
"src/R_interpreter.cmxs": use_R_interpreter
<src/*.ml{,i}>: use_R
<src/*.ml{,i}>: pkg_calendar
# Library R_graphics
"src/graphics": include
"src/graphics/R_graphics.cmxs": use_R_graphics
<src/graphics/*.ml{,i}>: use_R_interpreter
<src/graphics/*.ml{,i}>: use_R
<src/graphics/*.ml{,i}>: pkg_calendar
# Library R_grDevices
"src/grDevices": include
"src/grDevices/R_grDevices.cmxs": use_R_grDevices
<src/grDevices/*.ml{,i}>: use_R_interpreter
<src/grDevices/*.ml{,i}>: use_R
<src/grDevices/*.ml{,i}>: pkg_calendar
# Library R_methods
"src/methods": include
"src/methods/R_methods.cmxs": use_R_methods
<src/methods/*.ml{,i}>: use_R_interpreter
<src/methods/*.ml{,i}>: use_R
<src/methods/*.ml{,i}>: pkg_calendar
# Library R_math
"src/math": include
<src/math/*.ml{,i}>: oasis_library_r_math_ccopt
"src/math/rmath_stubs.c": oasis_library_r_math_ccopt
<src/math/R_math.{cma,cmxa}>: oasis_library_r_math_cclib
"src/math/libR_math.lib": oasis_library_r_math_cclib
"src/math/dllR_math.dll": oasis_library_r_math_cclib
"src/math/libR_math.a": oasis_library_r_math_cclib
"src/math/dllR_math.so": oasis_library_r_math_cclib
<src/math/R_math.{cma,cmxa}>: use_libR_math
# Library R_base
"src/base": include
"src/base/R_base.cmxs": use_R_base
<src/base/*.ml{,i}>: use_R_interpreter
<src/base/*.ml{,i}>: use_R
<src/base/*.ml{,i}>: pkg_calendar
# Library R_stats
"src/stats": include
"src/stats/R_stats.cmxs": use_R_stats
<src/stats/*.ml{,i}>: use_R_interpreter
<src/stats/*.ml{,i}>: use_R
<src/stats/*.ml{,i}>: pkg_calendar
# Library R_math
"src/math/R_math.cmxs": use_R_math
<src/math/*.ml{,i}>: oasis_library_r_math_ccopt
"src/math/rmath_stubs.c": oasis_library_r_math_ccopt
<src/math/R_math.{cma,cmxa}>: oasis_library_r_math_cclib
"src/math/libR_math_stubs.lib": oasis_library_r_math_cclib
"src/math/dllR_math_stubs.dll": oasis_library_r_math_cclib
"src/math/libR_math_stubs.a": oasis_library_r_math_cclib
"src/math/dllR_math_stubs.so": oasis_library_r_math_cclib
<src/math/R_math.{cma,cmxa}>: use_libR_math_stubs
# OASIS_STOP
27 changes: 27 additions & 0 deletions configure
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/bin/sh

# OASIS_START
# DO NOT EDIT (digest: 425187ed8bfdbdd207fd76392dd243a7)
set -e

FST=true
for i in "$@"; do
if $FST; then
set --
FST=false
fi

case $i in
--*=*)
ARG=${i%%=*}
VAL=${i##*=}
set -- "$@" "$ARG" "$VAL"
;;
*)
set -- "$@" "$i"
;;
esac
done

ocaml setup.ml -configure "$@"
# OASIS_STOP
Loading

0 comments on commit 310c01a

Please sign in to comment.