[Gsrc-commit] trunk r8669: better informative messages about operations

[Carl Hansen]

------------------------------------------------------------
revno: 8669
revision-id: carlhansen1234@gmail.com-20221018012017-f72q17risi1qvp1c
parent: carlhansen1234@gmail.com-20221017081812-ljplmd47gj71anr8
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Mon 2022-10-17 18:20:17 -0700
message:
  better informative messages about operations
modified:
  gar/gar.lib.mk                 gar.lib.mk-20160617013741-ul4q527k85thcz4p-1
  gar/gar.mk                     gar.mk-20160617013745-r4h3dj0kiuppihsx-1

=== modified file 'gar/gar.lib.mk'
--- a/gar/gar.lib.mk    2022-10-14 08:11:26 +0000
+++ b/gar/gar.lib.mk    2022-10-18 01:20:17 +0000
@@ -731,7 +731,7 @@
     root /
 
 prepare-install:
-       @printf "[$(OK)prepare-install$(OFF)] $(MSG)Preparing staging 
area$(OFF)\n"
+       @printf "[$(OK)prepare-install into packages$(OFF)] $(MSG)Preparing 
staging area$(OFF)\n"
        rm -fr $(packageDESTDIR)
        mkdir -p $(packageDESTDIR)$(prefix)
        @set -e; \
@@ -748,12 +748,12 @@
         done $(OUTPUT)
        $(MAKECOOKIE)
 
-finish-install:
-       @printf "[$(OK)finish-install$(OFF)] $(MSG)Moving files from staging 
area$(OFF)\n"
+finish-package-install:
+       @printf "[$(OK)finish-package-install$(OFF)] $(MSG)Moving files from 
staging area to packages$(OFF)\n"
        @set -e; \
         set -- $(CREATED_MERGE_DIRS); \
         while [ "$$1" != "" ]; do \
-            echo echoing .... finish-install t 1  $$1 and 2 $$2; \
+            echo echoing .... finish-package-install to packages t 1  $$1 and 
2 $$2; \
             rmdir -v $(packagedotgardir)/$$1 $(OUTPUT) || true; \
             rm -v $(packageDESTDIR)$$2 $(OUTPUT); \
             shift; shift; \
@@ -798,14 +798,14 @@
 # We have to create the installation directory first because otherwise
 # setuptools (spit) will complain.
 install-%/setup.py:
-       @printf "[$(OK)install$(OFF)] $(MSG)Running setup.py install in 
$(OFF)$*\n"
+       @printf "[$(OK)install$(OFF)] $(MSG)Running python setup.py install in 
$(OFF)$*\n"
        mkdir -p $(packageDESTDIR)`python -c 'from distutils.sysconfig import 
get_python_lib; print get_python_lib()'`
        cd $* && $(INSTALL_ENV) $(PYTHON) setup.py install 
--root=$(packageDESTDIR) $(PY_INSTALL_ARGS) $(OUTPUT)
        $(MAKECOOKIE)
 
 # install using Ruby setup.rb
 install-%/setup.rb:
-       @printf "[$(OK)install$(OFF)] $(MSG)Running setup.rb install in 
$(OFF)$*\n"
+       @printf "[$(OK)install$(OFF)] $(MSG)Running ruby setup.rb install in 
$(OFF)$*\n"
        cd $* && $(INSTALL_ENV) ruby setup.rb install $(RUBY_INSTALL_ARGS) 
$(OUTPUT)
        $(MAKECOOKIE)
 
@@ -1015,10 +1015,7 @@
        $(MAKECOOKIE)
 
 #################### SYS-INSTALL RULES ####################
-
-#carl
-#SYSINSTALL_TARGETS =       normalise collisions packagevars install
-#??
+# SYS-INSTALL means STOWing into known PATH etc lib...
 SYSINSTALL_TARGETS = check normalise collisions packagevars install
 
 # Some files which multiple packages seem to contain. These get
@@ -1096,7 +1093,7 @@
 # carl ls ? backtick or $sheel
 #
 sysinstall-check:
-       @printf "[$(OK)sysinstall-check$(OFF)] $(MSG)Checking status of DESTDIR 
install$(OFF)\n"
+       @printf "[$(OK)sysinstall-check$(OFF)] $(MSG)Checking status of DESTDIR 
staging install$(OFF)\n"
        @if [ "`ls $(packagedir)`" ]; then \
         printf "[$(OK)sysinstall-check$(OFF)] $(MSG)Successful DESTDIR 
$(packagedir)  install$(OFF)\n"; \
     else \
@@ -1113,7 +1110,7 @@
        $(MAKECOOKIE)
 
 sysinstall-normalise:
-       @printf "[$(OK)sysinstall-normalise$(OFF)] $(MSG)Normalising directory 
layout$(OFF)\n"
+       @printf "[$(OK)sysinstall-normalise$(OFF)] $(MSG)Normalising directory 
layout in staging$(OFF)\n"
        @set -e; \
     normalise () { \
         rmdir $$1 2>/dev/null || true; \
@@ -1127,11 +1124,12 @@
     normalise $(packagedir)/man $(packagedir)/share/man; \
     normalise $(packagedir)/info $(packagedir)/share/info; \
     normalise $(packagedir)/doc $(packagedir)/share/doc; \
+    normalise $(packagedir)/examples $(packagedir)/share/doc/examples; \
     normalise $(packagedir)/games $(packagedir)/bin  $(OUTPUT)
        $(MAKECOOKIE)
 
 sysinstall-packagevars:
-       @printf "[$(OK)sysinstall-packagevars$(OFF)] $(MSG)Writing package 
metadata$(OFF)\n"
+       @printf "[$(OK)sysinstall-packagevars$(OFF)] $(MSG)Writing package 
metadata FILES DIRS BUILD$(OFF)\n"
        @test -d $(dotgardir) || mkdir -p $(dotgardir);
        @(cd $(packagedir) \
        && find . -not -type d -print > $(dotgardir)/FILES \
@@ -1142,11 +1140,12 @@
 SYSINSTALL_FAIL = (rm -f $(packagesdir)/$(strip $(GARNAME)) 
$(COOKIEDIR)/sysinstall-*; false)
 
 sysinstall-install:
-       @printf "[$(OK)sysinstall-install$(OFF)] $(MSG)Installing to 
$(prefix)$(OFF)\n"
+       @printf "[$(OK)sysinstall-install$(OFF)] $(MSG)Stowing to packages 
$(OFF)\n"
        (cp -r -v -f --symbolic-link --target-directory=$(prefix) 
$(packagedir)/* $(OUTPUT) && \
         ln -n -v -f -s $(PACKAGENAME) $(dotgardir)/VERSION $(OUTPUT)) || 
$(SYSINSTALL_FAIL) $(OUTPUT)
 
 sysinstall-uninstall:
+       @printf "[$(OK)sysinstall-uninstall$(OFF)] $(MSG)Unstowing from 
packages $(OFF)\n"
        rm -f $(COOKIEDIR)/sysinstall-*
        (test -d $(dotgardir) || (printf "[$(ERR)sysinstall-uninstall$(OFF)] 
$(MSG)$(GARNAME) is not installed$(OFF)\n" && exit 1)) && \
        ( cd $(prefix) ; \
@@ -1156,7 +1155,8 @@
        rmdir $(dotgardir) $(OUTPUT))
        rm -f $(packagesdir)/$(strip $(GARNAME))
 
-sysinstall-uninstall-pkg:
+sysinstall-uninstall-pkg: sysinstall-uninstall
+       @printf "[$(OK)sysinstall-uninstall-pkg$(OFF)] $(MSG)removing 
$(packagedir) $(OFF)\n"
        rm -rvf $(packagedir) $(OUTPUT)
        rm -f $(COOKIEDIR)/sysinstall-* $(COOKIEDIR)/*-install $(OUTPUT)
        rm -rf $(COOKIEDIR)/install-* $(OUTPUT)

=== modified file 'gar/gar.mk'
--- a/gar/gar.mk        2022-09-27 05:35:42 +0000
+++ b/gar/gar.mk        2022-10-18 01:20:17 +0000
@@ -324,7 +324,7 @@
        $(foreach COOKIEFILE,$(addprefix 
$(COOKIEDIR)/test-,$(ALL_TEST_SCRIPTS)), test -e $(COOKIEFILE) ;)
 
 # install     - Install the results of a build.
-install: $(if $(USE_TESTS),test,build) $(addprefix 
dep-$(GARDIR)/,$(INSTALLDEPS)) prepare-install pre-install custom-pre-install 
$(addprefix install-,$(ALL_INSTALL_SCRIPTS)) finish-install pre-stow 
custom-pre-stow $(addprefix sysinstall-,$(filter-out 
$(SYSINSTALL_IGNORE),$(SYSINSTALL_TARGETS))) post-install custom-post-install
+install: $(if $(USE_TESTS),test,build) $(addprefix 
dep-$(GARDIR)/,$(INSTALLDEPS)) prepare-install pre-install custom-pre-install 
$(addprefix install-,$(ALL_INSTALL_SCRIPTS)) finish-package-install pre-stow 
custom-pre-stow $(addprefix sysinstall-,$(filter-out 
$(SYSINSTALL_IGNORE),$(SYSINSTALL_TARGETS))) post-install custom-post-install
        $(DONADA)
 
 # returns true if install has completed successfully, false
@@ -361,7 +361,7 @@
 uninstall: pre-uninstall custom-pre-uninstall sysinstall-uninstall 
post-uninstall custom-post-uninstall
        $(DONADA)
 
-uninstall-pkg: sysinstall-uninstall-pkg
+uninstall-pkg: sysinstall-uninstall-pkg uninstall
        $(DONADA)
 
 uninstall-pkg-old: