Merge pull request #141 from Michaaell/fix_package

Fix package
OCamlPro · Apr 7, 2017 · aa0e597 · aa0e597
2 parents eab7820 + 1079b8c
commit aa0e597
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 122 deletions.
diff --git a/Makefile b/Makefile
@@ -30,10 +30,10 @@ opam-deps:
 	opam install $(OPAMDEPS)
 
 install:
-	cp _obuild/ocp-lint/ocp-lint.asm $(bindir)/ocp-lint
+	$(OCPBUILD) install
 
 uninstall:
-	rm $(bindir)/ocp-lint
+	$(OCPBUILD) install --uninstall-only
 
 include autoconf/Makefile.rules
 
diff --git a/autoconf/Makefile.config.in b/autoconf/Makefile.config.in
@@ -26,5 +26,3 @@ OCAMLDOC=@OCAMLDOC@
 OCAMLLIB=@OCAMLLIB@
 OCAMLBIN=@OCAMLBIN@
 OCAML_USE_BINANNOT=@OCAML_USE_BINANNOT@
-tyxml_ENABLED=@tyxml_ENABLED@
-omd_ENABLED=@omd_ENABLED@
diff --git a/autoconf/config.ocp2gen.in b/autoconf/config.ocp2gen.in
@@ -26,8 +26,6 @@ autoconf = {
   conf_ocamllib="@OCAMLLIB@";
   conf_ocamlbin="@OCAMLBIN@";
   ocaml_use_binannot = @OCAML_USE_BINANNOT@;
-  tyxml_enabled = @tyxml_ENABLED@;
-  omd_enabled = @omd_ENABLED@;
   autoconf_dir = "@PACKAGE_NAME@-autoconf-dir";
 
 }; (* end of "autoconf = {" *)

diff --git a/autoconf/config.ocpgen.in b/autoconf/config.ocpgen.in
@@ -25,8 +25,6 @@ conf_ocamldoc="@OCAMLDOC@"
 conf_ocamllib="@OCAMLLIB@"
 conf_ocamlbin="@OCAMLBIN@"
 ocaml_use_binannot = @OCAML_USE_BINANNOT@
-tyxml_enabled = @tyxml_ENABLED@
-omd_enabled = @omd_ENABLED@
 autoconf_dir = "@PACKAGE_NAME@-autoconf-dir"
 
 

diff --git a/autoconf/configure b/autoconf/configure
@@ -592,10 +592,6 @@ OPAM_REPO_FORK_REMOTE
 OPAM_REPO_OFFICIAL_REMOTE
 OPAM_REPO
 ROOTDIR
-omd_ENABLED
-OCAML_PKG_omd
-tyxml_ENABLED
-OCAML_PKG_tyxml
 OCAML_PKG_ocp_indent_lib
 OCAML_PKG_ocplib_config
 OCAML_PKG_menhirLib
@@ -675,7 +671,6 @@ enable_version_check
 enable_bin_annot
 with_ocamldir
 with_metadir
-enable_lwt
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1296,8 +1291,6 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-version-check            do not check OCaml version
   --disable-bin-annot            do not use -bin-annot
-  --disable-tyxml           to disable tyxml
-  --disable-omd           to disable omd
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4292,82 +4285,6 @@ $as_echo "not found" >&6; }
 if test "$OCAML_PKG_ocp_indent.lib" = "no"; then
    as_fn_error $? "Please install OCaml package 'ocp-indent.lib'." "$LINENO" 5
 fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCaml findlib package tyxml" >&5
-$as_echo_n "checking for OCaml findlib package tyxml... " >&6; }
-
-  unset found
-  unset pkg
-  found=no
-  for pkg in tyxml  ; do
-    if $OCAMLFIND query $pkg >/dev/null 2>/dev/null; then
-      OCAML_PKG_tyxml=$pkg
-      ocaml_pkg_version=$($OCAMLFIND query -l $pkg|grep version: | awk '{ print $2}')
-      OCAML_PKG_tyxml_VERSION=$ocaml_pkg_version
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ocaml_pkg_version" >&5
-$as_echo "$ocaml_pkg_version" >&6; }
-      found=yes
-      break
-    fi
-  done
-  if test "$found" = "no" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-    OCAML_PKG_tyxml=no
-  fi
-
-
-
-# Check whether --enable-lwt was given.
-if test "${enable_lwt+set}" = set; then :
-  enableval=$enable_lwt; OCAML_PKG_tyxml=no
-fi
-
-if test "$OCAML_PKG_tyxml" = "no"; then
-   tyxml_ENABLED=false
-else
-   tyxml_ENABLED=true
-fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCaml findlib package omd" >&5
-$as_echo_n "checking for OCaml findlib package omd... " >&6; }
-
-  unset found
-  unset pkg
-  found=no
-  for pkg in omd  ; do
-    if $OCAMLFIND query $pkg >/dev/null 2>/dev/null; then
-      OCAML_PKG_omd=$pkg
-      ocaml_pkg_version=$($OCAMLFIND query -l $pkg|grep version: | awk '{ print $2}')
-      OCAML_PKG_omd_VERSION=$ocaml_pkg_version
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ocaml_pkg_version" >&5
-$as_echo "$ocaml_pkg_version" >&6; }
-      found=yes
-      break
-    fi
-  done
-  if test "$found" = "no" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-    OCAML_PKG_omd=no
-  fi
-
-
-
-# Check whether --enable-lwt was given.
-if test "${enable_lwt+set}" = set; then :
-  enableval=$enable_lwt; OCAML_PKG_omd=no
-fi
-
-if test "$OCAML_PKG_omd" = "no"; then
-   omd_ENABLED=false
-else
-   omd_ENABLED=true
-fi
-
 OPAM_REPO=
 OPAM_REPO_OFFICIAL_REMOTE=
 OPAM_REPO_FORK_REMOTE=
@@ -4416,8 +4333,6 @@ DOWNLOAD_URL_PREFIX=http://github.com//archive/
 
 
 
-
-
 
 
 

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
@@ -133,24 +133,6 @@ AC_CHECK_OCAML_PKG(ocp-indent.lib)
 if test "$OCAML_PKG_ocp_indent.lib" = "no"; then
    AC_MSG_ERROR([Please install OCaml package 'ocp-indent.lib'.])
 fi
-AC_CHECK_OCAML_PKG([tyxml])
-AC_ARG_ENABLE(lwt,  [  --disable-tyxml           to disable tyxml],
-                    [OCAML_PKG_tyxml=no],[])
-if test "$OCAML_PKG_tyxml" = "no"; then
-   tyxml_ENABLED=false
-else
-   tyxml_ENABLED=true
-fi
-AC_SUBST(tyxml_ENABLED)
-AC_CHECK_OCAML_PKG([omd])
-AC_ARG_ENABLE(lwt,  [  --disable-omd           to disable omd],
-                    [OCAML_PKG_omd=no],[])
-if test "$OCAML_PKG_omd" = "no"; then
-   omd_ENABLED=false
-else
-   omd_ENABLED=true
-fi
-AC_SUBST(omd_ENABLED)
 OPAM_REPO=
 OPAM_REPO_OFFICIAL_REMOTE=
 OPAM_REPO_FORK_REMOTE=
@@ -202,8 +184,6 @@ AC_SUBST(OCAMLDOC)
 AC_SUBST(OCAMLLIB)
 AC_SUBST(OCAMLBIN)
 AC_SUBST(OCAML_USE_BINANNOT)
-AC_SUBST(tyxml_ENABLED)
-AC_SUBST(omd_ENABLED)
 AC_CONFIG_FILES(Makefile.config config.ocpgen config.ocp2gen ocaml-config.h)
 AC_OUTPUT
 

diff --git a/ocp-autoconf.config b/ocp-autoconf.config
@@ -53,8 +53,6 @@ need_tools = [
 
 (* [optional_packages]: ocamlfind packages that could be used by the project *)
 optional_packages = [
-  tyxml;
-  omd;
 ]
 
 (* [need_modules]: Modules needed by the project *)

diff --git a/opam b/opam
@@ -11,11 +11,6 @@ depends: [
   "menhir"
   "ocp-indent"
   "ppx_tools"
-  "omd"
-]
-depopts: [
-  "tyxml"
-  "omd"
 ]
 available: ocaml-version >= "4.02"
 build: [

diff --git a/plugins/ocp-lint-plugin-indent/build.ocp b/plugins/ocp-lint-plugin-indent/build.ocp
@@ -19,8 +19,11 @@
 (**************************************************************************)
 
 begin library "ocp-lint-plugin-indent"
-  install_META = true
-  install_subdir = "ocp-lint-plugins"
+    (* Uncomment when: *)
+    (*   * ocp-indent'META has field plugin *)
+    (*   * ocp-intent installs its .cmxs *)
+    (* install_META = true *)
+    (* install_subdir = "ocp-lint-plugins" *)
   files = [
     "plugin_indent.ml"
     "ocp_indent.ml"

diff --git a/tools/ocp-lint-doc/build.ocp b/tools/ocp-lint-doc/build.ocp
@@ -19,6 +19,7 @@
 (**************************************************************************)
 
 begin program "ocp-lint-doc"
+  install_META = false
   files = [
     "make_doc.ml"
   ]

diff --git a/tools/ocp-lint-doc/ocp.stop b/tools/ocp-lint-doc/ocp.stop