[BACK]Return to cdgen.awk CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / pkgtools / cdpack / files

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /pkgsrc/pkgtools/cdpack/files/cdgen.awk between version 1.6 and 1.7

version 1.6, 2005/08/01 21:47:43 version 1.7, 2009/02/20 05:16:51
Line 1 
Line 1 
 #!@AWK@ -f  #!@AWK@ -f
 # $NetBSD$  # $NetBSD$
 #  #
 # Copyright (c) 2001, 2002, 2003, 2005 Dan McMahill, All rights reserved.  # Copyright (c) 2001, 2002, 2003, 2005, 2009 Dan McMahill, All rights reserved.
 #  #
 # Redistribution and use in source and binary forms, with or without  # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions  # modification, are permitted provided that the following conditions
Line 33 
Line 33 
   
 BEGIN {  BEGIN {
   
   # all of the PKG_SUFX values which are currently allowed.  This is hardcoded into
   # pkg_create(1) and friends.
   
       allsf[1] = ".tgz";
       allsf[2] = ".tbz";
   
 # ARGV[0] = program name  # ARGV[0] = program name
 # ARGV[1] = packages directory (/usr/pkgsrc/packages/All)  # ARGV[1] = packages directory (/usr/pkgsrc/packages/All)
 # ARGV[2] = output directory  # ARGV[2] = output directory
Line 179  BEGIN {
Line 185  BEGIN {
         }          }
         else{          else{
             printf("WARNING:  binary package \"%s\" has zero size\n",pkgorder[n]);              printf("WARNING:  binary package \"%s\" has zero size\n",pkgorder[n]);
               if(!verbose) {
                   verbose = 1;
                   getsize(pkgorder[n]);
                   verbose = 0;
               }
         }          }
         totsize = totsize + pkgsize[pkgorder[n]];          totsize = totsize + pkgsize[pkgorder[n]];
     }      }
Line 393  BEGIN {
Line 404  BEGIN {
 # populate it with the symlinks to the binary packages  # populate it with the symlinks to the binary packages
         for (n=1; n<=npkgs; n++){          for (n=1; n<=npkgs; n++){
             if (cdcontents[cdn":"pkgorder[n]]){              if (cdcontents[cdn":"pkgorder[n]]){
                 cmd = "cd " outdir " && ln -s " packages "/" ;                  for(i in allsf) {
                 cmd = cmd pkgorder[n] ".tgz";                      cmd="test -f " packages "/" pkgorder[n] allsf[i];
                 do_system(cmd);                      if( (r = system(cmd)) == 0){
                           cmd = "cd " outdir " && ln -s " packages "/" ;
                           cmd = cmd pkgorder[n] allsf[i];
                           do_system(cmd);
                       }
                   }
             }              }
         }          }
   
Line 414  BEGIN {
Line 430  BEGIN {
     exit 0      exit 0
         } # BEGIN          } # BEGIN
   
 function getsize(name,cmd,sz){  # This is a bit of a hack, but in the event that we have both a
   # foo-1.3.tgz and a foo-1.3.tbz, we currently take them both.
     cmd="test -f " packages "/" name ".tgz";  # I'm not sure how we avoid this.  One option is a flag to
     if(system(cmd) == 0){  # cdpack that says to prefer the .tbz over the .tgz for example.
         cmd="du -k " packages "/" name ".tgz";  # To implement that, the cdpack.sh shell script would need some
         cmd | getline ;  # updating as well as this function.  Grep for ".tgz" in
         close(cmd);  # pkgsrc/pkgutils/cdpack/files/* and also grep for allsf in this file
         sz=$1;  
     }  function getsize(name,cmd,sz,i,pkgsfx,r){
     else{      sz=0;
         sz=0;      for(i in allsf) {
           pkgsfx=allsf[i];
           cmd="test -f " packages "/" name pkgsfx;
           if( verbose ) {
               printf("getsize(%s):  Checking for suffix \"%s\" with:\n", name, pkgsfx);
               printf("    %s\n", cmd);
           }
           if( (r = system(cmd)) == 0){
               cmd="du -k " packages "/" name pkgsfx;
               cmd | getline ;
               close(cmd);
               if( verbose ) {
                   printf("    \"%s\" gave %s\n", cmd, $0);
               }
               sz=sz + $1;
           } else {
               if( verbose ) {
                   printf("    command returned %d\n", r);
               }
           }
     }      }
   
     return(sz);      return(sz);
Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7
CVSweb <webmaster@jp.NetBSD.org>