Remove config files generation from Makefiles

Makefile

@@ -8,7 +8,8 @@ default all: build
 
 .PHONY: build
 build:
-	${MAKE} -C src
+	dune build -p ocsigenserver
+	${MAKE} -C src/server build
 doc:
 	$(MAKE) -C doc
 
@@ -28,13 +29,14 @@ top:
 ### Cleaning ###
 
 clean: clean.local
-	${MAKE} -C src clean
+	${MAKE} -C src/server clean
 
 clean.local:
+	dune clean
 	-rm -f ocsigenserver-*.tar.gz
 
 distclean: clean.local
-	${MAKE} -C src distclean
+	${MAKE} -C src/server distclean
 	-make -C doc clean
 	-rm Makefile.config
 	-rm -f *~ \#* .\#*
@@ -76,9 +78,9 @@ install.files:
 	@echo INSTALL_CAN_PUT_PERMISSIONS: ${INSTALL_CAN_PUT_PERMISSIONS}
 	 ## Configuration files
 	$(INSTALL) -m ${INSTALL_MOD_755} -d $(TEMPROOT)$(CONFIGDIR)/conf.d
-	${INSTALL} -m ${INSTALL_MOD_644} ocsigenserver.conf.sample $(TEMPROOT)$(CONFIGDIR)/
+	${INSTALL} -m ${INSTALL_MOD_644} _build/install/default/etc/ocsigenserver/ocsigenserver.conf.sample $(TEMPROOT)$(CONFIGDIR)/
 	[ -f $(TEMPROOT)$(CONFIGDIR)/ocsigenserver.conf ] || \
-	  { $(INSTALL) -m ${INSTALL_MOD_644} ocsigenserver.conf.sample \
+	  { $(INSTALL) -m ${INSTALL_MOD_644} _build/install/default/etc/ocsigenserver/ocsigenserver.conf.sample \
 		$(TEMPROOT)$(CONFIGDIR)/ocsigenserver.conf;  }
 	-mv $(TEMPROOT)$(CONFIGDIR)/mime.types $(TEMPROOT)$(CONFIGDIR)/mime.types.old
 	 ## Log directory

Makefile.options

@@ -26,12 +26,3 @@ INCS=   -I ${BLD}/server/.ocsigenserver.objs/byte \
 SERVER_PACKAGE := lwt_ssl,bytes,lwt.unix,lwt_log,ipaddr,findlib,cryptokit,re,str,xml-light,dynlink,cohttp-lwt-unix
 
 LIBS := -package ${SERVER_PACKAGE} ${INCS}
-
-INITPACKAGE := \"$(shell ${OCAMLFIND} query -p-format -recursive        \
-				    -separator '\";\"' ${SERVER_PACKAGE})\"; \
-	       \"ocsigenserver.polytables\";   \
-	       \"ocsigenserver.cookies\";      \
-	       \"ocsigenserver.baselib.base\"; \
-	       \"ocsigenserver.baselib\";      \
-	       \"ocsigenserver.http\";         \
-	       \"ocsigenserver\";              \

configure

@@ -80,6 +80,7 @@ set_defaults () {
     bindir=""
     logdir=""
     libdir=""
+    libdir_set=0
     mandir=""
     docdir=""
     sysconfdir="/etc/ocsigenserver"
@@ -282,6 +283,7 @@ while [ "$#" -gt 0 ]; do
                         ;;
                 --libdir)
                         libdir="$2"
+                        libdir_set=1
                         shift
                         shift
                         ;;
@@ -485,32 +487,14 @@ CC        := gcc
 # optional
 RLWRAP    := $rlwrap
 
-
-### Options ###
-
-# User who will run Ocsigen server (not root) (eg, for debian, www-data)
-# (This user must exist on your system)
-OCSIGENUSER := $ocsigen_user
-
-# group who will run Ocsigen server (not root) (eg, for debian, www-data)
-# (This group must exist)
-OCSIGENGROUP := $ocsigen_group
-
-
 ### Paths ###
 
 # Temporary root directory to install the package (usually always "" but for package makers)
 TEMPROOT := $temproot
 
-# The directory for ocsigen server (binary):
-BINDIR := $root$bindir
-
 # The directory for ocsigen manpage:
 MANDIR := $root$mandir
 
-# Where to install the libraries
-LIBDIR := $libdir
-
 # ocsigen's logs:
 LOGDIR := $root$logdir
 
@@ -538,6 +522,23 @@ SRC := $full_pwd
 include \$(SRC)/Makefile.options
 _EOF_
 
+echo "Writing config options"
+cat <<_EOF_ > $my_pwd/src/files/ocsigenserver.conf/options.ml
+let version = "$version"
+let src = "$full_pwd"
+let port = 80
+let bindir = "$root$bindir"
+let libdir = "$libdir"
+let libdir_set = $libdir_set
+let logdir = "$root$logdir"
+let configdir = "$root$sysconfdir"
+let staticpagesdir = "$root$staticpagesdir"
+let datadir = "$root$datadir"
+let uploaddir = "$root$uploaddir"
+let commandpipe = "$root$commandpipe"
+let mimefile = "$root$sysconfdir/mime.types"
+_EOF_
+
 ######################################################################
 # Finish
 

dune

@@ -2,3 +2,26 @@
  (_
   (flags
    (:standard -w -69))))
+
+(rule
+ (target ocsigenserver.conf.sample)
+ (action
+  (with-stdout-to
+   %{target}
+   (run src/files/ocsigenserver.conf/gen.exe sample))))
+
+(install
+ (files ocsigenserver.conf.sample)
+ (section etc)
+ (package ocsigenserver))
+
+(subdir
+ local/etc
+ (rule
+  (mode
+   (promote (until-clean)))
+  (target ocsigenserver.conf)
+  (action
+   (with-stdout-to
+    %{target}
+    (run ../../src/files/ocsigenserver.conf/gen.exe local)))))

ocsigenserver.opam

@@ -61,7 +61,6 @@ build: [
     "--sysconfdir"
     "%{lib}%/ocsigenserver/etc/ocsigenserver"
   ]
-  [make "-C" "src" "confs"]
   ["dune" "build" "-p" name "-j" jobs]
 ]
 install:[make "install.files"]

ocsigenserver.opam.template

@@ -27,7 +27,6 @@ build: [
     "--sysconfdir"
     "%{lib}%/ocsigenserver/etc/ocsigenserver"
   ]
-  [make "-C" "src" "confs"]
   ["dune" "build" "-p" name "-j" jobs]
 ]
 install:[make "install.files"]

src/baselib/dune

@@ -32,3 +32,8 @@
    from
    (dynlink -> dynlink_wrapper.natdynlink.ml)
    (_ -> dynlink_wrapper.nonatdynlink.ml))))
+
+(rule
+ (with-stdout-to
+  ocsigen_config_static.ml
+  (run ../files/ocsigenserver.conf/gen.exe static.ml)))

src/files/ocsigenserver.conf/dune

@@ -0,0 +1,3 @@
+(executable
+ (name gen)
+ (libraries str unix))