flambda-backend: Revert "Rename extension otherlibs" (#2579)

Revert "Rename extension otherlibs (#2564)"

This reverts commit 2207eb1.

Author: mshinwell

Makefile.common-jst

@@ -251,15 +251,15 @@ install_for_test: _install
 	 ln -s . lex; ln -s . yacc; \
 	 ln -s _install/lib/ocaml/compiler-libs compilerlibs; \
 	 mkdir -p otherlibs/{unix,dynlink/native,str,bigarray,runtime_events}; \
+	 mkdir -p otherlibs/{upstream_compatible,stable,beta,alpha}; \
 	 ln -s ../stdlib/threads otherlibs/systhreads$(RUNTIME_SUFFIX); \
          $(cpl) stdlib/unix/{lib,}unix* otherlibs/unix; \
          $(cpl) stdlib/dynlink/dynlink* otherlibs/dynlink; \
          $(cpl) stdlib/str/{lib,}str* otherlibs/str; \
-	 for universe in upstream_compatible stable beta alpha ; do \
-		mkdir -p otherlibs/{stdlib_,}$${universe}; \
-		$(cpl) stdlib/stdlib_$${universe}/* otherlibs/stdlib_$${universe}; \
-		$(cpl) stdlib/$${universe}/* otherlibs/$${universe}; \
-	 done; \
+         $(cpl) stdlib/upstream_compatible/* otherlibs/upstream_compatible; \
+         $(cpl) stdlib/stable/* otherlibs/stable; \
+         $(cpl) stdlib/beta/* otherlibs/beta; \
+         $(cpl) stdlib/alpha/* otherlibs/alpha; \
      if [[ x"$(RUNTIME_DIR)" = x"runtime" ]]; then \
 	     $(cpl) stdlib/runtime_events/{lib,}runtime_events* otherlibs/runtime_events; \
      fi; \

ocamltest/ocaml_modifiers.ml

@@ -93,6 +93,18 @@ let dynlink =
 let str = make_library_modifier
   "str" [compiler_subdir ["otherlibs"; "str"]]
 
+let upstream_compatible = make_library_modifier
+  "upstream_compatible" [compiler_subdir ["otherlibs"; "upstream_compatible"]]
+
+let stable = make_library_modifier
+  "stable" [compiler_subdir ["otherlibs"; "stable"]]
+
+let beta = make_library_modifier
+  "beta" [compiler_subdir ["otherlibs"; "beta"]]
+
+let alpha = make_library_modifier
+  "alpha" [compiler_subdir ["otherlibs"; "alpha"]]
+
 let systhreads =
   unix @
   (make_library_modifier
@@ -128,28 +140,17 @@ let runtime_suffix = if Config.runtime5 then "" else "4"
 
 let debugger = [add_compiler_subdir ("debugger" ^ runtime_suffix)]
 
-let extension_universe_lib name =
-  make_library_modifier name [compiler_subdir ["otherlibs"; name]]
-
 let _ =
   register_modifiers "principal" principal;
   register_modifiers "config" config;
   register_modifiers "testing" testing;
   register_modifiers "unix" unix;
   register_modifiers "dynlink" dynlink;
   register_modifiers "str" str;
-  List.iter
-    (fun old_name ->
-      let new_name = "stdlib_" ^ old_name in
-      register_modifiers old_name (extension_universe_lib old_name);
-      register_modifiers new_name (extension_universe_lib new_name);
-    )
-    [
-      "upstream_compatible";
-      "stable";
-      "beta";
-      "alpha";
-    ];
+  register_modifiers "upstream_compatible" upstream_compatible;
+  register_modifiers "stable" stable;
+  register_modifiers "beta" beta;
+  register_modifiers "alpha" alpha;
   List.iter
     (fun archive -> register_modifiers archive (compilerlibs_archive archive))
     [

otherlibs/stdlib_alpha/.ocamlformat-enable renamed to otherlibs/alpha/.ocamlformat-enable

@@ -12,9 +12,6 @@
 ;*                                                                        *
 ;**************************************************************************
 
-;; [alpha] was renamed to [stdlib_alpha]. This library clones [stdlib_alpha]
-;; until we move all existing uses of [alpha] to [stdlib_alpha].
-
 (library
  (name alpha)
  (wrapped false)
@@ -37,17 +34,6 @@
  (library_flags
   (:standard -linkall)))
 
-;; We clone files from [stdlib_alpha] instead of re-exporting the library
-;; to avoid adding a new transitive dependency to builds.
-
-(rule
- (deps
-  (glob_files ../stdlib_alpha/*.{ml,mli}))
- (targets alpha.ml alpha.mli)
- (action
-  (bash
-   "cp ../stdlib_alpha/*.{ml,mli} .; mv stdlib_alpha.ml alpha.ml; mv stdlib_alpha.mli alpha.mli")))
-
 (install
  (files
   (glob_files

otherlibs/stdlib_alpha/stdlib_alpha.ml renamed to otherlibs/alpha/alpha.ml

@@ -12,9 +12,6 @@
 ;*                                                                        *
 ;**************************************************************************
 
-;; [beta] was renamed to [stdlib_beta]. This library clones [stdlib_beta]
-;; until we move all existing uses of [beta] to [stdlib_beta].
-
 (library
  (name beta)
  (wrapped false)
@@ -37,17 +34,6 @@
  (library_flags
   (:standard -linkall)))
 
-;; We clone files from [stdlib_beta] instead of re-exporting the library
-;; to avoid adding a new transitive dependency to builds.
-
-(rule
- (deps
-  (glob_files ../stdlib_beta/*.{ml,mli}))
- (targets float32.ml float32.mli float32_u.ml float32_u.mli beta.ml beta.mli)
- (action
-  (bash
-   "cp ../stdlib_beta/*.{ml,mli} .; mv stdlib_beta.ml beta.ml; mv stdlib_beta.mli beta.mli")))
-
 (install
  (files
   (glob_files

otherlibs/stdlib_alpha/stdlib_alpha.mli renamed to otherlibs/alpha/alpha.mli

@@ -12,9 +12,6 @@
 ;*                                                                        *
 ;**************************************************************************
 
-;; [stable] was renamed to [stdlib_stable]. This library clones [stdlib_stable]
-;; until we move all existing uses of [stable] to [stdlib_stable].
-
 (library
  (name stable)
  (wrapped false)
@@ -37,27 +34,6 @@
  (library_flags
   (:standard -linkall)))
 
-;; We clone files from [stdlib_stable] instead of re-exporting the library
-;; to avoid adding a new transitive dependency to builds.
-
-(rule
- (deps
-  (glob_files ../stdlib_stable/*.{ml,mli}))
- (targets
-  float_u.ml
-  float_u.mli
-  int32_u.ml
-  int32_u.mli
-  int64_u.ml
-  int64_u.mli
-  nativeint_u.ml
-  nativeint_u.mli
-  stable.ml
-  stable.mli)
- (action
-  (bash
-   "cp ../stdlib_stable/*.{ml,mli} .; mv stdlib_stable.ml stable.ml; mv stdlib_stable.mli stable.mli")))
-
 (install
  (files
   (glob_files

otherlibs/alpha/dune

@@ -12,10 +12,6 @@
 ;*                                                                        *
 ;**************************************************************************
 
-;; [upstream_compatible] was renamed to [stdlib_upstream_compatible].
-;; This library clones [stdlib_upstream_compatible] until we move all
-;; existing uses of [upstream_compatible] to [stdlib_upstream_compatible].
-
 (library
  (name upstream_compatible)
  (wrapped false)
@@ -38,17 +34,6 @@
  (library_flags
   (:standard -linkall)))
 
-;; We clone files from [stdlib_upstream_compatible] instead of re-exporting the library
-;; to avoid adding a new transitive dependency to builds.
-
-(rule
- (deps
-  (glob_files ../stdlib_upstream_compatible/*.{ml,mli}))
- (targets upstream_compatible.ml upstream_compatible.mli)
- (action
-  (bash
-   "cp ../stdlib_upstream_compatible/*.{ml,mli} .; mv stdlib_upstream_compatible.ml upstream_compatible.ml; mv stdlib_upstream_compatible.mli upstream_compatible.mli")))
-
 (install
  (files
   (glob_files