Commit be103b29 authored by Pascal Raymond's avatar Pascal Raymond
Browse files

Add a 'local' install directory for GBDDML and polka in

concerned Makefiles.
parent 4cb3b776
......@@ -107,6 +107,7 @@ mac
lib
include
i386-linux-gcc3
local
dll
crazy-rabbit-cstva
CruiseControl
......
......@@ -32,7 +32,6 @@ include ../Makefile.common.source
AR=ar
OCAML_LIB=$(OCAMLLIB)
CPP_COMPILER=$(GPP)
CPP_LINKER=$(GPP)
......@@ -92,10 +91,10 @@ clean:
rm -f *.o *.cmo *.cmi *.cmx *.a *.cma *.cmxa
cp:
cp libbdd_stubs.a ../$(HOSTTYPE)/lib/
cp bdd.a ../$(HOSTTYPE)/lib/
cp bdd.a ../$(HOSTTYPE)/lib/libbdd.a
cp bdd.cm* ../$(HOSTTYPE)/lib/
cp libbdd_stubs.a $(LIBDIRS)/
cp bdd.a $(LIBDIRS)/
cp bdd.a $(LIBDIRS)/libbdd.a
cp bdd.cm* $(LIBDIRS)/
install:cp
......
-include ./Makefile.version
include ./Makefile.version
include ./Makefile.common.source
# migth be necessary if camlidl is not installed for the current version of ocaml
......@@ -11,6 +13,12 @@ camlidl:
source: build
build: gen_version
./lnsw
mkdir -p $(LOCAL_INSTALL)/lib
mkdir -p $(LOCAL_INSTALL)/bin
mkdir -p $(LOCAL_INSTALL)/include
mkdir -p $(BIN_INSTALL_DIR)
mkdir -p $(LIB_INSTALL_DIR)
mkdir -p $(INC_INSTALL_DIR)
cd install && autoconf && cd .. &&\
cd polka && make clean && make all && make install&& cd .. &&\
cd GBDDML && make clean && make && make all && make cp && cd ..&&\
......
......@@ -18,8 +18,12 @@ AS=as
OCAMLC=$(shell which ocamlc)
SYNCHRONE_DIR=/usr/local/www/DIST-TOOLS/SYNCHRONE
SYNCHRONE_LURETTE_DIR=$(SYNCHRONE_DIR)/lurette/
INCDIRS = $(PREFIX)/$(HOSTTYPE)/lib
LIBDIRS = $(PREFIX)/$(HOSTTYPE)/lib
#INCDIRS = $(PREFIX)/$(HOSTTYPE)/lib
#LIBDIRS = $(PREFIX)/$(HOSTTYPE)/lib
LOCAL_INSTALL=$(PREFIX)/local/$(HOSTTYPE)
INCDIRS = $(LOCAL_INSTALL)/lib
LIBDIRS = $(LOCAL_INSTALL)/lib
CAMLIDL = camlidl
DWIN32 =
EXE :=
......
#!/bin/sh
saofdm=$1
dir=`dirname $saofdm`
l_fic=/tmp/l.$$
sed -n -e "/^MODEL.*$/,/^LIBRARY.*$/ p" $saofdm \
| sed -n -e "/^MODEL.*$/,/^NOTES_TYPE.*$/ p" \
| sed -n -e "/^MODEL.*$/,/^DIAG_SEM.*$/ p" \
| sed -n -e "/^MODEL.*$/,/^DIAG_MET.*$/ p" \
| egrep -v "(^$|^MODEL|^LIBRARY|^NOTES_TYPE|^DIAG_SEM|^DIAG_MET)" > $l_fic.s
for saofd in `cat $l_fic.s`
do
sed -n -e "s/^node *\([^ (]*\) *(.*/\1/p" $dir/$saofd.saofd
done
/* File generated from ocaml2c.idl */
#ifndef _CAMLIDL_OCAML2C_H
#define _CAMLIDL_OCAML2C_H
#ifdef __cplusplus
#define _CAMLIDL_EXTERN_C extern "C"
#else
#define _CAMLIDL_EXTERN_C extern
#endif
#ifdef _WIN32
#pragma pack(push,8) /* necessary for COM interfaces */
#endif
struct vn_t {
char *var_name;
char *var_type;
};
typedef struct vn_t vnt_type;
_CAMLIDL_EXTERN_C void lurette__sut_init(void);
_CAMLIDL_EXTERN_C void lurette__oracle_init(void);
_CAMLIDL_EXTERN_C void lurette__sut_save_state(void);
_CAMLIDL_EXTERN_C void lurette__sut_restore_state(void);
_CAMLIDL_EXTERN_C void lurette__oracle_save_state(void);
_CAMLIDL_EXTERN_C void lurette__oracle_restore_state(void);
_CAMLIDL_EXTERN_C int lurette__sut_get_val_int(/*in*/ int arg_nb);
_CAMLIDL_EXTERN_C double lurette__sut_get_val_float(/*in*/ int arg_nb);
_CAMLIDL_EXTERN_C int lurette__sut_get_val_bool(/*in*/ int arg_nb);
_CAMLIDL_EXTERN_C void lurette__sut_set_val_int(/*in*/ int arg_nb, /*in*/ int i);
_CAMLIDL_EXTERN_C void lurette__sut_set_val_float(/*in*/ int arg_nb, /*in*/ double f);
_CAMLIDL_EXTERN_C void lurette__sut_set_val_bool(/*in*/ int arg_nb, /*in*/ int b);
_CAMLIDL_EXTERN_C int lurette__oracle_get_val_int(/*in*/ int arg_nb);
_CAMLIDL_EXTERN_C double lurette__oracle_get_val_float(/*in*/ int arg_nb);
_CAMLIDL_EXTERN_C int lurette__oracle_get_val_bool(/*in*/ int arg_nb);
_CAMLIDL_EXTERN_C void lurette__oracle_set_val_int(/*in*/ int arg_nb, /*in*/ int i);
_CAMLIDL_EXTERN_C void lurette__oracle_set_val_float(/*in*/ int arg_nb, /*in*/ double f);
_CAMLIDL_EXTERN_C void lurette__oracle_set_val_bool(/*in*/ int arg_nb, /*in*/ int b);
_CAMLIDL_EXTERN_C void lurette__sut_step(void);
_CAMLIDL_EXTERN_C void lurette__oracle_step(void);
_CAMLIDL_EXTERN_C int lurette__sut_input_arg_nb(void);
_CAMLIDL_EXTERN_C int lurette__sut_output_arg_nb(void);
_CAMLIDL_EXTERN_C int lurette__oracle_input_arg_nb(void);
_CAMLIDL_EXTERN_C int lurette__oracle_output_arg_nb(void);
_CAMLIDL_EXTERN_C void lurette__sut_input_var_name_and_type_array(/*in*/ int n, /*out*/ vnt_type *vnta);
_CAMLIDL_EXTERN_C void lurette__sut_output_var_name_and_type_array(/*in*/ int n, /*out*/ vnt_type *vnta);
_CAMLIDL_EXTERN_C void lurette__oracle_input_var_name_and_type_array(/*in*/ int n, /*out*/ vnt_type *vnta);
_CAMLIDL_EXTERN_C void lurette__oracle_output_var_name_and_type_array(/*in*/ int n, /*out*/ vnt_type *vnta);
#ifdef _WIN32
#pragma pack(pop)
#endif
#endif /* !_CAMLIDL_OCAML2C_H */
......@@ -10,6 +10,7 @@
#CAMLIDL_INSTALL = $(HOME)/$(HOSTTYPE)
#GMP_INSTALL=$(HOME)/$(HOSTTYPE)
include $(LURETTE_PATH)/Makefile.common.source
OCAML_BINDIR=$(shell dirname $(OCAMLC))
......@@ -50,9 +51,9 @@ CURDIR = $(shell pwd)
PREFIX = $(POLKA_INSTALL)
# C include and lib directories
INCDIR = $(CURDIR)/../../$(HOSTTYPE)/include
LIBDIR = $(CURDIR)/../../$(HOSTTYPE)/lib
BINDIR = $(CURDIR)/../../$(HOSTTYPE)/bin
INCDIR = $(LOCAL_INSTALL)/include
LIBDIR = $(LOCAL_INSTALL)/lib
BINDIR = $(LOCAL_INSTALL)/bin
#
......
......@@ -76,6 +76,9 @@ install: $(CCINC_TO_INSTALL) $(MLLIB_TO_INSTALL) $(INSTALL) $(INCDIR)/polka $(LI
if test -f $$i; then $(INSTALL) $$i ${BINDIR}; fi \
done
$(INCDIR)/polka:
mkdir -p $(INCDIR)/polka
distclean: clean
for i in $(CCINC_TO_INSTALL); do \
/bin/rm -f $(INCDIR)/polka/$$i;\
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment