• R/O
  • HTTP
  • SSH
  • HTTPS

mingw-get: Commit

The MinGW.org Installation Manager Tool


Commit MetaInfo

Revisãob6fec4cdf067a85b7b092d9f3154c609adf2d724 (tree)
Hora2020-06-25 06:29:21
AutorKeith Marshall <keith@user...>
CommiterKeith Marshall

Mensagem de Log

Streamline the installation procedure.

Mudança Sumário

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
1+2020-06-24 Keith Marshall <keith@users.osdn.me>
2+
3+ Streamline the installation procedure.
4+
5+ * Makefile.in (LIBEXEC_DATA): Rename it as...
6+ (LIBEXEC_DLLS): ...this; other data should be enumerated separately,
7+ but there is currently none. Update all references, as appropriate.
8+ (install): Add dependency on "all". Eliminate "for" loops, using...
9+ (INSTALL_PROGRAM): ...this, to perform one-shot installation for...
10+ (BIN_PROGRAMS, LIBEXEC_PROGRAMS): ...each of these sets, and...
11+ (INSTALL_DATA): ...this, for one-shot installation of...
12+ (LIBEXEC_SCRIPTS): ...these.
13+ (install-strip): Reimplement recursively, appending "-s" to...
14+ (INSTALL_PROGRAM): ...this; hence remove requirement for...
15+ (STRIP): ...this; delete definition.
16+
17+ * configure.ac (STRIP): No longer used, so no need for...
18+ (AC_CHECK_TOOL): ...this, to locate it; delete configuration check.
19+
120 2020-06-23 Keith Marshall <keith@users.osdn.me>
221
322 Delete an unnecessary duplicate function call.
--- a/Makefile.in
+++ b/Makefile.in
@@ -195,7 +195,7 @@ script_srcdir = ${srcdir}/scripts/libexec
195195
196196 BIN_PROGRAMS = pkginfo$(EXEEXT) mingw-get$(EXEEXT)
197197 LIBEXEC_PROGRAMS = guistub$(EXEEXT) guimain$(EXEEXT) lastrites$(EXEEXT)
198-LIBEXEC_DATA = mingw-get-0.dll
198+LIBEXEC_DLLS = mingw-get-0.dll
199199
200200 LIBEXEC_SCRIPTS = ${script_srcdir}/setup.lua \
201201 ${script_srcdir}/shlink.js ${script_srcdir}/unlink.js
@@ -203,7 +203,7 @@ LIBEXEC_SCRIPTS = ${script_srcdir}/setup.lua \
203203 # Primary build goals...
204204 #
205205 all: all-core all-setup
206-all-core: $(BIN_PROGRAMS) $(LIBEXEC_PROGRAMS) $(LIBEXEC_DATA)
206+all-core: $(BIN_PROGRAMS) $(LIBEXEC_PROGRAMS) $(LIBEXEC_DLLS)
207207 all-setup: all-setup-dll all-setup-exe
208208 all-setup-dll: mingw-get-setup-0.dll
209209
@@ -222,7 +222,7 @@ mingw-get$(EXEEXT): $(CLI_EXE_OBJECTS)
222222 guistub$(EXEEXT): guistub.$(OBJEXT) pkgicon.$(OBJEXT)
223223 $(CXX) -o $@ $(CXXFLAGS) $(GUI_LDFLAGS) $+
224224
225-guimain$(EXEEXT): $(GUIMAIN_OBJECTS) $(LIBEXEC_DATA)
225+guimain$(EXEEXT): $(GUIMAIN_OBJECTS) $(LIBEXEC_DLLS)
226226 $(CXX) -o $@ $(CXXFLAGS) $(GUI_LDFLAGS) $+ $(GUIMAIN_LIBS)
227227
228228 lastrites$(EXEEXT): rites.$(OBJEXT)
@@ -336,7 +336,6 @@ INSTALL_DATA = @INSTALL_DATA@
336336 INSTALL_PROGRAM = @INSTALL_PROGRAM@
337337 INSTALL_SCRIPT = @INSTALL_SCRIPT@
338338
339-STRIP = @STRIP@
340339 LN_S = @LN_S@
341340
342341 # Installation rules...
@@ -346,16 +345,11 @@ installdirs:
346345 $(mkinstalldirs) ${libexecdir}/${PACKAGE_TARNAME}
347346 $(mkinstalldirs) ${PACKAGE_CONFIG_DIR}
348347
349-install: installdirs install-profile
350- for image in $(BIN_PROGRAMS); do \
351- $(INSTALL_PROGRAM) $$image ${bindir}; \
352- done
353- for image in $(LIBEXEC_PROGRAMS); do \
354- $(INSTALL_PROGRAM) $$image ${libexecdir}/${PACKAGE_TARNAME}; \
355- done
356- for image in $(LIBEXEC_DATA) $(LIBEXEC_SCRIPTS); do \
357- $(INSTALL_DATA) $$image ${libexecdir}/${PACKAGE_TARNAME}; \
358- done
348+install: all installdirs install-profile
349+ $(INSTALL_PROGRAM) $(BIN_PROGRAMS) ${bindir}
350+ $(INSTALL_PROGRAM) $(LIBEXEC_DLLS) ${libexecdir}/${PACKAGE_TARNAME}
351+ $(INSTALL_PROGRAM) $(LIBEXEC_PROGRAMS) ${libexecdir}/${PACKAGE_TARNAME}
352+ $(INSTALL_DATA) $(LIBEXEC_SCRIPTS) ${libexecdir}/${PACKAGE_TARNAME}
359353
360354 vpath %.xml.in ${srcdir}/xml
361355 install-profile: install-%: %.xml
@@ -364,13 +358,8 @@ install-profile: install-%: %.xml
364358 %.xml: %.xml.in
365359 $(TAG_SCRIPT) $< > $@
366360
367-install-strip: install
368- for image in $(BIN_PROGRAMS); do \
369- $(STRIP) ${bindir}/$$image; \
370- done
371- for image in $(LIBEXEC_PROGRAMS) $(LIBEXEC_DATA); do \
372- $(STRIP) ${libexecdir}/${PACKAGE_TARNAME}/$$image; \
373- done
361+install-strip:
362+ $(QUIET_MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
374363
375364 # Packaging and distribution...
376365 # "Native" source files, (i.e. those specific to mingw-get), are...
--- a/configure.ac
+++ b/configure.ac
@@ -107,11 +107,6 @@
107107 AC_PROG_INSTALL
108108 AC_PROG_LN_S
109109
110-# As for the archive librarian, we need to ensure that the tool
111-# for stripping binaries is compatible with the compiler
112-#
113- AC_CHECK_TOOL([STRIP],[strip],[strip])
114-
115110 # Identify features to be traced to facilitate debugging; make
116111 # it precious, to avoid introducing accidental inconsistencies.
117112 #
Show on old repository browser