Merge pull request #2676 from OCamlPro/fix-release

Better `opam-admin --mirror`, fixed Makefile

Makefile

@@ -58,20 +58,20 @@ opam-%.install:
 	$(MAKE) -C src ../opam-$*.install
 
 opam.install:
-	echo 'bin: [' >$@
-	echo '  "src/opam"' >>$@
-	echo '  "src/opam-admin"' >>$@
-	echo '  "src/opam-installer"' >>$@
-	echo ']' >>$@
-	echo 'man: [' >>$@
-	$(patsubst %,echo '  "'%'"' >>$@;,$(wildcard doc/man/*.1))
-	echo ']' >>$@
-	echo 'doc: [' >>$@
-	$(foreach x,$(wildcard doc/man-html/*.html),\
+	@echo 'bin: [' >$@
+	@echo '  "src/opam"' >>$@
+	@echo '  "src/opam-admin"' >>$@
+	@echo '  "src/opam-installer"' >>$@
+	@echo ']' >>$@
+	@echo 'man: [' >>$@
+	@$(patsubst %,echo '  "'%'"' >>$@;,$(wildcard doc/man/*.1))
+	@echo ']' >>$@
+	@echo 'doc: [' >>$@
+	@$(foreach x,$(wildcard doc/man-html/*.html),\
 	  echo '  "$x" {"man/$(notdir $x)"}' >>$@;)
-	$(foreach x,$(wildcard doc/pages/*.html),\
+	@$(foreach x,$(wildcard doc/pages/*.html),\
 	  echo '  "$x" {"$(notdir $x)"}' >>$@;)
-	echo ']' >>$@
+	@echo ']' >>$@
 
 opam-devel.install:
 	@echo 'libexec: [' >$@

src/Makefile

@@ -213,8 +213,8 @@ endef
 export PROJ_state
 
 # -- opam-client -- #
-opam-client.cma: opam-core.cma opam-format.cma opam-solver.cma opam-repository.cma opam-state.cma ALWAYS
-opam-client.cmxa: opam-core.cmxa opam-format.cmxa opam-solver.cmxa opam-repository.cmxa opam-state.cmxa ALWAYS
+opam-client.cma: client/opamGitVersion.ml opam-core.cma opam-format.cma opam-solver.cma opam-repository.cma opam-state.cma ALWAYS
+opam-client.cmxa: client/opamGitVersion.ml opam-core.cmxa opam-format.cmxa opam-solver.cmxa opam-repository.cmxa opam-state.cmxa ALWAYS
 
 SRC_client = \
   opamClientConfig.ml \
@@ -242,7 +242,7 @@ client/opamGitVersion.ml: ALWAYS
 	cd .. && ocaml shell/get-git-id.ml src/$@
 	touch $@
 
-opam: $(addsuffix $(LIBEXT),$(OPAMLIB)) client/opamGitVersion.ml ALWAYS
+opam: $(addsuffix $(LIBEXT),$(OPAMLIB)) ALWAYS
 	$(MAKE) -f $(OCAMLMAKEFILE) subprojs SUBPROJS=opam SUBTARGET=$(BINTARGET)
 
 define PROJ_opam

src/core/opamSystem.ml

@@ -454,8 +454,11 @@ let copy_file src dst =
 let copy_dir src dst =
   if Sys.file_exists dst then
     if Sys.is_directory dst then
-      command ~verbose:(verbose_for_base_commands ())
-        ([ "cp"; "-PR" ] @ ls src @ [ dst ])
+      match ls src with
+      | [] -> ()
+      | srcfiles ->
+        command ~verbose:(verbose_for_base_commands ())
+          ([ "cp"; "-PR" ] @ srcfiles @ [ dst ])
     else internal_error "Can not copy dir %s to %s, which is not a directory"
         src dst
   else

src/tools/opam_format_upgrade.ml

@@ -410,6 +410,7 @@ let process args =
       OpamFilename.with_tmp_dir @@ fun tmp_mirror_dir ->
       OpamFilename.copy_dir ~src:(OpamFilename.cwd ()) ~dst:tmp_mirror_dir;
       OpamFilename.rmdir OpamFilename.Op.(tmp_mirror_dir / "2.0");
+      OpamFilename.rmdir OpamFilename.Op.(tmp_mirror_dir / ".git");
       OpamFilename.in_dir tmp_mirror_dir do_upgrade;
       let repo_file = OpamFile.make (OpamFilename.of_string "repo") in
       let repo0 = OpamFile.Repo.safe_read repo_file in
@@ -446,4 +447,7 @@ let process args =
         repo_20;
       let dir20 = OpamFilename.Dir.of_string "2.0" in
       OpamFilename.rmdir dir20;
-      OpamFilename.move_dir ~src:tmp_mirror_dir ~dst:dir20
+      OpamFilename.move_dir ~src:tmp_mirror_dir ~dst:dir20;
+      if OpamFilename.exists (OpamFilename.of_string "urls.txt") then
+        OpamConsole.note
+          "Indexes need updating: remember to re-run `opam-admin make`"

src/tools/opam_mk_repo.ml

@@ -195,7 +195,7 @@ let resolve_deps args index names =
               (OpamFormula.string_of_atom atom))
          cs)
 
-let process
+let rec process
     ({index; gener_digest; dryrun; recurse;
       names; debug; resolve; dev;_} as args) =
   OpamStd.Config.init
@@ -410,4 +410,14 @@ let process
     OpamConsole.error "Got some errors while processing: %s"
       (OpamStd.List.concat_map ", " OpamPackage.to_string all_errors);
     List.iter display_error !errors
+  );
+  let subdir = OpamFilename.Dir.of_string "2.0" in
+  if OpamFilename.exists (subdir // "repo") then (
+    OpamConsole.header_msg "Now processing within subdir 2.0/";
+    let archives = OpamFilename.Dir.of_string "archives" in
+    if OpamFilename.exists_dir archives then
+      OpamFilename.copy_dir
+        ~src:archives
+        ~dst:(subdir / "archives");
+    OpamFilename.in_dir subdir (fun () -> process args)
   )