Skip to content

Commit d48f713

Browse files
committed
Remove the unused opam-admin.top.exe tool
1 parent 6b00c13 commit d48f713

File tree

8 files changed

+3
-231
lines changed

8 files changed

+3
-231
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,8 @@ Opam.Runtime.*/
4747
\#*#
4848
opam
4949
opam-installer
50-
opam-admin.top
5150
opam.exe
5251
opam-installer.exe
53-
opam-admin.top.exe
5452
# debug files
5553
*.log
5654
*.cudf

Makefile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ endif
55
all: opam opam-installer
66
@
77

8-
admin:
9-
$(DUNE) build $(DUNE_PROFILE_ARG) --root . $(DUNE_ARGS) opam-admin.install
10-
118
# $(call CYGPATH,file) will convert file to a Windows path if opam is being
129
# compiled for native Windows _and_ cygpath is available in PATH. The check
1310
# on PATH is done once only.
@@ -79,10 +76,6 @@ opam-stripped: $(DUNE_DEP) build-opam processed-opam.install
7976
opam-installer: $(DUNE_DEP) build-opam-installer processed-opam-installer.install
8077
@$(LN_S) -f _build/default/src/tools/opam_installer.exe $@$(EXE)
8178

82-
opam-admin.top: $(DUNE_DEP)
83-
$(DUNE) build $(DUNE_PROFILE_ARG) --root . $(DUNE_ARGS) src/tools/opam_admin_topstart.bc
84-
$(LN_S) -f _build/default/src/tools/opam_admin_topstart.bc $@$(EXE)
85-
8679
lib-ext:
8780
$(MAKE) -j -C src_ext lib-ext
8881

@@ -94,7 +87,7 @@ clean-ext:
9487

9588
clean:
9689
$(MAKE) -C doc $@
97-
rm -f *.install *.env *.err *.info *.out opam$(EXE) opam-admin.top$(EXE) opam-installer$(EXE)
90+
rm -f *.install *.env *.err *.info *.out opam$(EXE) opam-installer$(EXE)
9891
rm -f src/client/no-git-version
9992
rm -rf _build Opam.Runtime.*
10093

@@ -165,7 +158,7 @@ endif
165158
uninstalllib-%: opam-installer opam-%.install
166159
$(OPAMINSTALLER) -u $(OPAMINSTALLER_FLAGS) opam-$*.install
167160

168-
libinstall: $(DUNE_DEP) opam-admin.top $(OPAMLIBS:%=installlib-%)
161+
libinstall: $(DUNE_DEP) $(OPAMLIBS:%=installlib-%)
169162
@
170163

171164
custom-libinstall: $(DUNE_DEP) opam-lib opam

doc/index.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,6 @@ <h1>opam %{OPAMVERSION}% API and libraries documentation</h1>
334334

335335
<tr><td colspan="2" class="sublib">Auxiliary standalone tools</td></tr>
336336

337-
<tr><th><a>opam_admin_top.ml</a></th>
338-
<td>Tiny library for admin-scripts, included in opam-admin.top</td></tr>
339337
<tr><th><a>opam-putenv.c</a></th>
340338
<td>Tiny C tool used on Windows for cross-architecture process injection</td></tr>
341339
<tr><th><a>opam_installer.ml</a></th>

doc/modules

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,17 +103,4 @@ src
103103
│   └── opamMain.ml Main, including cmdliner command handling
104104
105105
└── tools
106-
│   [ opam-admin tool ]
107-
├── opam_mk_repo.ml Repo index and archives generation
108-
├── opam_depexts_change.ml Operation on external dependencies in a repo
109-
├── opam_findlib.ml Automatically add some findlib information to a repo
110-
├── opam_rename.ml Package renaming
111-
├── opam_stats.ml Repo stats & graphs generation
112-
├── opam_repo_check.ml Check the repo for errors
113-
├── opam_admin.ml Source of the opam-admin tool, main
114-
│   [ other stand-alone tools ]
115-
├── opam_admin_top.ml Tiny library for admin-scripts, included in opam-admin.top
116-
├── opam-putenv.c Tiny C tool used on Windows for cross-architecture process injection
117-
├── opam_check.ml Tiny tool used in internal checks ("make tests")
118-
├── opam_installer.ml Handles OPAM's ".install" files
119-
└── opamlfind.ml Experimental ocamlfind wrapper tool
106+
└─── opam_installer.ml Handles OPAM's ".install" files

dune-project

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@
1414

1515
; Meta packages
1616
(package (name opam))
17-
(package (name opam-admin))

src/tools/dune

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,3 @@
1-
(library
2-
(name opam_admin_top)
3-
(public_name opam-admin.top)
4-
(synopsis "OCaml Package Manager admin toplevel")
5-
(modules opam_admin_top)
6-
; TODO: Remove (re_export ...) when CI uses the OCaml version that includes https://github.com/ocaml/ocaml/pull/11989
7-
(libraries opam-client opam-file-format (re_export compiler-libs.toplevel) re)
8-
(wrapped false))
9-
10-
(executable
11-
(name opam_admin_topstart)
12-
(public_name opam-admin.top)
13-
(package opam-admin)
14-
(modes byte)
15-
(modules opam_admin_topstart)
16-
(libraries opam-admin.top)
17-
(ocamlc_flags (:standard
18-
(:include ../ocaml-flags-standard.sexp)
19-
(:include ../ocaml-flags-configure.sexp)
20-
(:include ../ocaml-context-flags.sexp)
21-
-linkall)))
22-
23-
(rule (with-stdout-to opam_admin_topstart.ml (echo "include Opam_admin_top\n\nlet _ = Topmain.main ()")))
24-
251
(rule (write-file opam_installer.mli ""))
262

273
(executable

src/tools/opam_admin_top.ml

Lines changed: 0 additions & 129 deletions
This file was deleted.

src/tools/opam_admin_top.mli

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)