[Gsrc-commit] trunk r8473: gar.lib.mk gar.mk git improvements

[Carl Hansen]

------------------------------------------------------------
revno: 8473
revision-id: carlhansen1234@gmail.com-20220710211727-aa78j5y4z0sqo2pr
parent: carlhansen1234@gmail.com-20220630212132-fzhlqwbpk0cnarz0
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Sun 2022-07-10 14:17:27 -0700
message:
  gar.lib.mk  gar.mk git improvements
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-03-27 02:38:39 +0000
+++ b/gar/gar.lib.mk    2022-07-10 21:17:27 +0000
@@ -165,7 +165,7 @@
 # Check out source from Git.
 GIT_REVISION ?= v$(strip $(GARVERSION))
 git//%:
-       mkdir -p $(DOWNLOADDIR)/git
+       mkdir -p $(DOWNLOADDIRGIT)
        cd $(DOWNLOADDIR)/git && \
                git clone $(GIT_PATH) $(DISTNAME) && \
                (cd $(DISTNAME) && git checkout $(GIT_REVISION)) && \
@@ -176,18 +176,30 @@
 # main purpose is to save the download to DISTNAME rather that github goofy 
name
 # a rather annoying kludge
 
-githttps//%:
-       @echo githttp $*
-       wget $(WGET_OPTS) -O $(DOWNLOADDIR)/$(notdir $*).partial https://$*
-       mv $(DOWNLOADDIR)/$(notdir $*).partial  $(DOWNLOADDIR)/$(notdir $*) 
-       cp $(DOWNLOADDIR)/$(notdir $*)          
$(DOWNLOADDIR)/$(DISTNAME).tar.gz
-       @echo before ----------------ALLFILES      $(ALLFILES)
-       echo ALLFILES = $(subst    $(notdir $*) , $(DISTNAME).tar.gz, 
$(ALLFILES) )
-       @echo after ----------------ALLFILES      $(ALLFILES)
-       #$(MAKE) garchve-$(DOWNLOADDIR)/$(DISTNAME).tar.gz
-
-
-## 
+#githttps//%:
+#      @echo gitting it
+#      mkdir -p $(DOWNLOADDIRGIT)`
+#      cd $(DOWNLOADDIR)-git && \
+#              git clone $(GIT_PATH) $(DISTNAME) && \
+#              (cd $(DISTNAME) && git checkout $(GIT_REVISION)) 
+
+
+
+
+
+
+
+#      @echo githttp $*
+#      wget $(WGET_OPTS) -O $(DOWNLOADDIR)/$(notdir $*).partial https://$*
+#      mv $(DOWNLOADDIR)/$(notdir $*).partial  $(DOWNLOADDIR)/$(notdir $*) 
+#      cp $(DOWNLOADDIR)/$(notdir $*)          
$(DOWNLOADDIR)/$(DISTNAME).tar.gz
+#      @echo before ----------------ALLFILES      $(ALLFILES)
+#      echo ALLFILES = $(subst    $(notdir $*) , $(DISTNAME).tar.gz, 
$(ALLFILES) )
+#      @echo after ----------------ALLFILES      $(ALLFILES)
+#      #$(MAKE) garchve-$(DOWNLOADDIR)/$(DISTNAME).tar.gz
+
+
+## working notes 
 ## # download an http URL (colons omitted)
 ## http//%:
 ##     wget $(WGET_OPTS) -O $(DOWNLOADDIR)/$(notdir $*).partial http://$*

=== modified file 'gar/gar.mk'
--- a/gar/gar.mk        2021-05-01 23:33:15 +0000
+++ b/gar/gar.mk        2022-07-10 21:17:27 +0000
@@ -38,6 +38,7 @@
 TEMPDIR = $(GARDIR_ABSOLUTE)/gar.tmp
 FILEDIR ?= files
 DOWNLOADDIR ?= download
+DOWNLOADDIRGIT ?= download-git
 COOKIEDIR ?= cookies/$(DISTNAME)$(strip $(GARPROFILE))
 WORKDIR ?= work
 LOGDIR ?= logs
@@ -79,7 +80,7 @@
 #################### DIRECTORY MAKERS ####################
 
 # This is to make dirs as needed by the base rules
-$(sort $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR) $(WORKSRC) $(WORKDIR) 
$(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR)):
+$(sort $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR) $(WORKSRC) $(WORKDIR) 
$(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR)) $(DOWNLOADDIRGIT):
        if test -d "$@"; then : ; else \
                mkdir -p "$@"; \
        fi
@@ -131,7 +132,7 @@
 #        then run pre-configure)
 #      - generate a set of files to depend on.  These are typically
 #        cookie files in $(COOKIEDIR), but in the case of fetch are
-#        actual downloaded files in $(DOWNLOADDIR)
+#        actual downloaded files in $(DOWNLOADDIR) |GIT
 #      - run the post- rule for the target
 #
 # The main rules also run the $(DONADA) code, which prints out
@@ -400,7 +401,8 @@
 # cookie, but that would be lame and unportable).
 clean:
        @printf "[$(OK)clean$(OFF)] $(MSG)Removing working files and 
directories$(OFF)\n"
-       rm --preserve-root=all -rf $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR) 
$(WORKSRC) $(WORKDIR) $(EXTRACTDIR) $(SCRATCHDIR) $(SCRATCHDIR)-$(COOKIEDIR) *~
+       rm --preserve-root=all -rf $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR)        
    $(WORKDIR) $(EXTRACTDIR) $(SCRATCHDIR) $(SCRATCHDIR)-$(COOKIEDIR) *~
+       # cwh changed 6-2022 rm --preserve-root=all -rf $(DOWNLOADDIR) 
$(COOKIEDIR) $(LOGDIR) $(WORKSRC) $(WORKDIR) $(EXTRACTDIR) $(SCRATCHDIR) 
$(SCRATCHDIR)-$(COOKIEDIR) *~
 
 # could be dangerous....