Merge pull request #202 from ocsigen/multiple-fixes

vouillon · web-flow · commit 749deb56eb6e · 2021-07-12T12:00:50.000+02:00
Multiple fixes
diff --git a/.jenkins.sh b/.jenkins.sh
@@ -1,5 +1,4 @@
 opam pin add --no-action ocsigenserver .
-opam install camlzip
 opam install --deps-only ocsigenserver
 opam install --verbose ocsigenserver
 
diff --git a/Makefile b/Makefile
@@ -3,8 +3,8 @@ include Makefile.config
 
 ### Building
 
-.PHONY: default
-default: build
+.PHONY: default all
+default all: build
 
 .PHONY: build
 build:
diff --git a/Makefile.options b/Makefile.options
@@ -28,7 +28,7 @@ INCS=   -I ${BLD}/server/.ocsigenserver.objs/byte \
 ## ${SERVER_PACKAGE} is not only used to build the 'ocsigenserver' executable
 ## but also to generate src/baselib/ocsigen_config_static.ml
 
-SERVER_PACKAGE := lwt_ssl,bytes,lwt.unix,lwt_log,ipaddr,findlib,cryptokit,netstring-pcre,str,xml-light,dynlink,cohttp-lwt-unix,hmap
+SERVER_PACKAGE := lwt_ssl,bytes,lwt.unix,lwt_log,ipaddr,findlib,cryptokit,pcre,str,xml-light,dynlink,cohttp-lwt-unix,hmap
 
 LIBS := -package ${SERVER_PACKAGE} ${INCS}
 
diff --git a/configure b/configure
@@ -75,7 +75,6 @@ check_library () {
 set_defaults () {
     with_sqlite=1
     with_pgsql=1
-    with_camlzip=1
     with_dbm=1
     prefix="/usr/local"
     bindir=""
@@ -103,7 +102,7 @@ full_pwd=`pwd`
 
 ## Which options exist? eoptions for enable/disable, woptions for with/without:
 eoptions=""
-woptions="pgsql sqlite dbm camlzip"
+woptions="pgsql sqlite dbm"
 
 print_options () {
 	for opt in $eoptions; do
@@ -178,8 +177,6 @@ usage: ./configure [ options ]
   --with-sqlite,	--without-sqlite	Compile ocsipersist with SQLite for persistent storage
   --with-pgsql,	--without-pgsql		Compile ocsipersist with PostgreSQL for persistent storage
   --with-dbm,		--without-dbm		Compile ocsipersist with DBM for persistent storage
-  --with-camlzip,	--without-camlzip	Compile deflatemod extension, requires camlzip
-
   --name NAME		The name of the server binary and ocamlfind package.
 
   --ocsigen-user NAME	The name of the ocsigen user
@@ -435,17 +432,6 @@ if [ "$with_dbm" -gt 0 ]; then
     fi
 fi
 
-# Check Camlzip
-if [ "$with_camlzip" -gt 0 ]; then
-    if test_library camlzip; then
-	echo -n
-    elif [ "$with_camlzip" -gt 1 ]; then
-	fail_library camlzip "https://forge.ocamlcore.org/projects/camlzip/"
-    else
-	with_camlzip=0
-    fi
-fi
-
 # Check rlwrap or ledit
 if test_binary rlwrap; then
     rlwrap=rlwrap
@@ -480,11 +466,6 @@ if [ $with_pgsql -gt 0 ] ; then
 else
 	with_pgsql="NO"
 fi
-if [ $with_camlzip -gt 0 ] ; then
-	with_camlzip="YES"
-else
-	with_camlzip="NO"
-fi
 
 ocamlinclude=`ocamlfind printconf stdlib`
 
@@ -518,9 +499,6 @@ OCSIGENUSER := $ocsigen_user
 # (This group must exist)
 OCSIGENGROUP := $ocsigen_group
 
-# Do you want deflatemod? YES/NO (requires camlzip)
-CAMLZIP:=$with_camlzip
-
 # Do you want ocsipersist with sqlite? YES/NO
 OCSIPERSISTSQLITE:=$with_sqlite
 
diff --git a/doc/Makefile b/doc/Makefile
@@ -29,11 +29,8 @@ DOC := baselib/ocsigen_cache.mli          \
 PLUGINS_DOC := extensions/accesscontrol.mli extensions/authbasic.mli	\
 	       extensions/cors.mli extensions/ocsipersist.mli		\
 	       extensions/outputfilter.mli				\
-	       extensions/redirectmod.mli extensions/staticmod.mli
-
-ifeq "$(CAMLZIP)" "YES"
-PLUGINS_DOC += extensions/deflatemod/deflatemod.mli
-endif
+	       extensions/redirectmod.mli extensions/staticmod.mli	\
+	       extensions/deflatemod/deflatemod.mli
 
 all: doc wikidoc
 
diff --git a/ocsigenserver.opam b/ocsigenserver.opam
@@ -38,7 +38,7 @@ build: [
     "--sysconfdir"
     "%{lib}%/ocsigenserver/etc/ocsigenserver"
   ]
-  [make]
+  [make "-C" "src" "confs"]
   ["dune" "build" "-p" name "-j" jobs]
 ]
 install:[make "install.files"]
@@ -62,8 +62,8 @@ depends: [
   "hmap"
   "xml-light"
   "conf-which"
+  "camlzip"
 ]
-depopts: "camlzip"
 conflicts: [
   "camlzip" {< "1.04"}
   "pgocaml" {< "2.2"}
diff --git a/src/Makefile b/src/Makefile
@@ -1,7 +1,7 @@
 include ../Makefile.config
 
 all: confs
-	dune build
+	dune build @install
 
 ### CONF ####
 
diff --git a/src/baselib/dune b/src/baselib/dune
@@ -18,7 +18,7 @@
     ocsigen_loader
     ocsigen_stream)
   (libraries
-     str findlib lwt_log lwt.unix cryptokit netstring-pcre ocsigen_lib_base
+     str findlib lwt_log lwt.unix cryptokit pcre ocsigen_lib_base
      (select dynlink_wrapper.ml from
        (dynlink -> dynlink_wrapper.natdynlink.ml)
        (_ -> dynlink_wrapper.nonatdynlink.ml))))
diff --git a/src/extensions/Makefile b/src/extensions/Makefile
@@ -7,11 +7,6 @@ default: build
 build::
 	dune build
 
-ifeq "$(CAMLZIP)" "YES"
-build::
-	$(MAKE) -C deflatemod
-endif
-
 ### PostgreSQL ###
 
 ifeq "$(OCSIPERSISTPGSQL)" "YES"
@@ -34,8 +29,6 @@ endif
 
 ## Clean up
 
-clean:
-
 distclean: clean
 	-rm -f *~ \#* .\#*
 	${MAKE} -C ocsipersist-dbm distclean
diff --git a/src/extensions/deflatemod.ml b/src/extensions/deflatemod.ml
diff --git a/src/extensions/deflatemod.mli b/src/extensions/deflatemod.mli
diff --git a/src/extensions/deflatemod/Makefile b/src/extensions/deflatemod/Makefile
diff --git a/src/extensions/deflatemod/dune b/src/extensions/deflatemod/dune
diff --git a/src/extensions/dune b/src/extensions/dune
@@ -16,6 +16,12 @@
   (modules cors)
   (libraries ocsigenserver))
 
+(library
+  (name deflatemod)
+  (public_name ocsigenserver.ext.deflatemod)
+  (modules deflatemod)
+  (libraries camlzip ocsigenserver))
+
 (library
   (name extendconfiguration)
   (public_name ocsigenserver.ext.extendconfiguration)
diff --git a/src/extensions/ocsipersist-dbm/dune b/src/extensions/ocsipersist-dbm/dune
@@ -16,4 +16,5 @@
   (name ocsidbm)
   (modules ocsidbm)
   (libraries lwt lwt.unix dbm ocsidbmtypes)
-  (modes byte exe))
+  (modes byte exe)
+  (optional))
diff --git a/src/http/Makefile b/src/http/Makefile
@@ -7,8 +7,5 @@ build:
 
 ## Clean up
 
-clean:
-
-
 distclean: clean
 	-rm -f *~ \#* .\#*
diff --git a/src/ocsigenserver.ml b/src/ocsigenserver.ml
@@ -7,6 +7,8 @@ let () =
   and pid_msg = "Specify a file where to write the PIDs of servers"
   and daemon_msg = "Daemon mode (detach the process)"
   and verbose_msg = "Verbose mode"
+  and veryverbose_msg = "Very verbose mode (info)"
+  and debug_msg = "Extremely verbose mode (debug)"
   and version_msg = "Display version number and exit" in
   try
     Arg.parse_argv Sys.argv [
@@ -18,6 +20,10 @@ let () =
       "--pidfile", Arg.String Ocsigen_config.set_pidfile, pid_msg;
       "-v", Arg.Unit Ocsigen_config.set_verbose, verbose_msg;
       "--verbose", Arg.Unit Ocsigen_config.set_verbose, verbose_msg;
+      "-vv", Arg.Unit Ocsigen_config.set_veryverbose, veryverbose_msg;
+      "--veryverbose", Arg.Unit Ocsigen_config.set_veryverbose, veryverbose_msg;
+      "-vvv", Arg.Unit Ocsigen_config.set_debug, debug_msg;
+      "--debug", Arg.Unit Ocsigen_config.set_debug, debug_msg;
       "-d", Arg.Unit Ocsigen_config.set_daemon, daemon_msg;
       "--daemon", Arg.Unit Ocsigen_config.set_daemon, daemon_msg;
       "--version", Arg.Unit Ocsigen_config.display_version, version_msg

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`opam pin add --no-action ocsigenserver .`
`2`		`-opam install camlzip`
`3`	`2`	`opam install --deps-only ocsigenserver`
`4`	`3`	`opam install --verbose ocsigenserver`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ build: [`
`38`	`38`	`"--sysconfdir"`
`39`	`39`	`"%{lib}%/ocsigenserver/etc/ocsigenserver"`
`40`	`40`	`]`
`41`		`- [make]`
	`41`	`+ [make "-C" "src" "confs"]`
`42`	`42`	`["dune" "build" "-p" name "-j" jobs]`
`43`	`43`	`]`
`44`	`44`	`install:[make "install.files"]`
`@@ -62,8 +62,8 @@ depends: [`
`62`	`62`	`"hmap"`
`63`	`63`	`"xml-light"`
`64`	`64`	`"conf-which"`
	`65`	`+ "camlzip"`
`65`	`66`	`]`
`66`		`-depopts: "camlzip"`
`67`	`67`	`conflicts: [`
`68`	`68`	`"camlzip" {< "1.04"}`
`69`	`69`	`"pgocaml" {< "2.2"}`