Revert ocaml#4861

   Keep the additional tests. Sections are added in the dune-package not only
   when dune-site is activated

Signed-off-by: François Bobot <[email protected]>

Author: bobot

CHANGES.md

@@ -13,9 +13,6 @@ Unreleased
 
 - Fix plugins with dot in the name (#5182, @bobot, review @rgrinberg)
 
-- Don't generate the dune-site build part when not needed (#4861, @bobot,
-  review @kit-ty-kate)
-
 - Fix installation of implementations of virtual libraries (#5150, fix #3636,
   @rgrinberg)
 

src/dune_rules/opam_create.ml

@@ -57,41 +57,29 @@ let default_build_command =
   [ "dune" "install" "-p" name "--create-install-files" name ]
 ]
 |}))
-  and from_3_0 ~with_subst ~with_sites =
+  and from_3_0 ~with_subst =
     let subst =
       if with_subst then
         {|  [ "dune" "subst" ] {dev} |}
       else
         ""
     in
-    let promote_install_files =
-      if with_sites then
-        {|  "--promote-install-files=false" |}
-      else
-        ""
-    in
-    let install =
-      if with_sites then
-        {| [ "dune" "install" "-p" name "--create-install-files" name ] |}
-      else
-        ""
-    in
     lazy
       (Opam_file.parse_value
          (Lexbuf.from_string ~fname:"<internal>"
             (Printf.sprintf
                {|
 [
   %s
-  [ "dune" "build" "-p" name "-j" jobs %s
+  [ "dune" "build" "-p" name "-j" jobs "--promote-install-files=false"
       "@install"
       "@runtest" {with-test}
       "@doc" {with-doc}
   ]
-  %s
+  [ "dune" "install" "-p" name "--create-install-files" name ]
 ]
 |}
-               subst promote_install_files install)))
+               subst)))
   in
   fun project ->
     Lazy.force
@@ -106,9 +94,7 @@ let default_build_command =
       else
         from_3_0
           ~with_subst:
-            (Subst_config.is_enabled (Dune_project.subst_config project))
-          ~with_sites:
-            Dune_project.(is_extension_set project dune_site_extension))
+            (Subst_config.is_enabled (Dune_project.subst_config project)))
 
 let package_fields
     { Package.synopsis

test/blackbox-tests/test-cases/dune-init.t/run.t

@@ -371,10 +371,12 @@ And the opam file will be generated as expected
       name
       "-j"
       jobs
+      "--promote-install-files=false"
       "@install"
       "@runtest" {with-test}
       "@doc" {with-doc}
     ]
+    ["dune" "install" "-p" name "--create-install-files" name]
   ]
   dev-repo: "git+https://github.com/username/reponame.git"
 
@@ -478,10 +480,12 @@ And the opam file will be generated as expected
       name
       "-j"
       jobs
+      "--promote-install-files=false"
       "@install"
       "@runtest" {with-test}
       "@doc" {with-doc}
     ]
+    ["dune" "install" "-p" name "--create-install-files" name]
   ]
   dev-repo: "git+https://github.com/username/reponame.git"
 

test/blackbox-tests/test-cases/dune-package.t/run.t

@@ -134,7 +134,7 @@ Build with "DUNE_STORE_ORIG_SOURCE_DIR=true" profile
 
 Install the package directly
 
-  $ dune install --prefix=$PWD/prefix --root=a 2>&1 | grep -v "Installing"
+  $ dune install "--prefix=$PWD/prefix" --root=a 2>&1 | grep -v "Installing"
   Entering directory 'a'
 
   $ dune_cmd cat prefix/lib/a/dune-package | grep 'lib/a'
@@ -160,24 +160,34 @@ Install as opam does
       name
       "-j"
       jobs
+      "--promote-install-files=false"
       "@install"
       "@runtest" {with-test}
       "@doc" {with-doc}
     ]
+    ["dune" "install" "-p" name "--create-install-files" name]
   ]
 
-  $ (cd a; "dune" "build" "-p" a "@install")
+  $ (cd a; "dune" "build" "-p" a "--promote-install-files=false" "@install")
+
+  $ ROOT=$PWD
+
+  $ (cd a; "dune" "install" "-p" a "--create-install-files" a "--prefix=$ROOT/prefix")
+  Copying to _destdir$TESTCASE_ROOT/prefix/lib/a/META
+  Copying to _destdir$TESTCASE_ROOT/prefix/lib/a/dune-package
 
   $ ls a
   _build
+  _destdir
   a.install
   a.opam
   dune
   dune-project
 
   $ dune_cmd cat a/a.install | grep dune-package
-    "_build/install/default/lib/a/dune-package"
+    "_destdir$TESTCASE_ROOT/prefix/lib/a/META"
+    "_destdir$TESTCASE_ROOT/prefix/lib/a/dune-package"
 
-  $ dune_cmd cat a/_build/install/default/lib/a/dune-package | grep 'lib/a'
-    $TESTCASE_ROOT/a/_build/install/default/lib/a)
-    $TESTCASE_ROOT/a/_build/install/default/lib/a))
+  $ dune_cmd cat "a/_destdir/$PWD/prefix/lib/a/dune-package" | grep 'lib/a'
+    $TESTCASE_ROOT/prefix/lib/a)
+    $TESTCASE_ROOT/prefix/lib/a))

test/blackbox-tests/test-cases/dune-project-meta/main.t/run.t

@@ -562,10 +562,12 @@ the doc dependencies:
       name
       "-j"
       jobs
+      "--promote-install-files=false"
       "@install"
       "@runtest" {with-test}
       "@doc" {with-doc}
     ]
+    ["dune" "install" "-p" name "--create-install-files" name]
   ]
 
   $ cat > dune-project <<EOF
@@ -587,8 +589,10 @@ the doc dependencies:
       name
       "-j"
       jobs
+      "--promote-install-files=false"
       "@install"
       "@runtest" {with-test}
       "@doc" {with-doc}
     ]
+    ["dune" "install" "-p" name "--create-install-files" name]
   ]