Commit graph

126 commits

Author SHA1 Message Date
jschauma
913617419c - Run a single find(1) command to get the list of new files rather than running
two finds+two greps.
- Run a single find(1) command rather than ls | grep to determine pkg count.
2006-11-26 03:08:24 +00:00
rillig
90f265272e Creating an archive from the working directory may take some time for
big packages, so print an informational message before doing that.
2006-10-13 23:14:45 +00:00
rillig
ee85496ac5 Renamed the "pack" option for _PRESERVE_WRKSRC to "pack-if-failed",
since that's what I really wanted. It's just one day old, so I hope that
nobody has gotten used to it.
2006-10-07 06:35:01 +00:00
rillig
e20633395b _PRESERVE_WRKDIR can be set to "pack" to save a .tar.gz archive of
WRKDIR in the directory where the other log files are.
2006-10-06 09:41:23 +00:00
jlam
c489860d62 Whenever we invoke a recursive make, we need to ensure that the proper
environment ${PKGSRC_MAKE_ENV} is also passed along.  Create a
convenience variable RECURSIVE_MAKE that does exactly this and that
can be used in place of MAKE when invoking make recursively.

Use RECURSIVE_MAKE everywhere in pkgsrc/mk that we invoke make
recursively.
2006-07-27 21:46:45 +00:00
wiz
7400a7cf16 When the bulk build code encounters a directory in *SPECIFIC_PKGS
that does not exist, it stopped.

Now it instead adds an entry to the main broken file and marks
it as not package with maintainer "directory_does_not_exist"
in the HTML output. (Not packaged directories are not mentioned
in the text version.)
2006-07-26 17:00:03 +00:00
rillig
9ead885465 After converting it to HTML format, the build log file is not needed
anymore.
2006-07-03 00:00:56 +00:00
rillig
bca88fe217 Only write the terminating HTML code to the ${_BROKENFILE} if the
package is really broken.
2006-02-13 14:55:26 +00:00
rillig
c04d1cf1cf Fixed double quoting of _BROKENWRKLOG. 2006-02-11 11:46:41 +00:00
rillig
cf9992988e A small step in the direction of valid HTML for the build log files. 2006-02-10 12:21:16 +00:00
rillig
91f9cc1a62 Indented the variable definitions more consistently. 2006-02-10 10:41:58 +00:00
rillig
09e7dbca5e Added the KEEP_BUILDLOGS variable. If it is set to "yes", the build logs
of successful builds are not removed, only renamed. This variable will
be useful for examining the warnings that appear during the bulk builds
but are thrown away because the package builds fine. This feature is
experimental and thus not enabled by default.
2006-02-04 01:08:25 +00:00
rillig
2aa47ceaea If a package is still up to date, it doesn't matter if it is currently
installed or not. So there is no need for two different messages. (They
had been necessary in revision 1.1, though.)
2006-02-03 20:47:06 +00:00
rillig
f8c8696542 Fixed pkglint warnings. 2006-01-21 15:44:23 +00:00
rillig
1278e33918 - Added a new top level file that saves the REPORT_BASEDIR from the first
call to the mk/bulk/build script. This is to allow restarting the bulk
  build without getting confused by the various timestamps that occur
  during a bulk build. It also fixes some problems where the text/plain
  report had ended up in a directory different from the other files.

- Changed the default filename for the text/plain report from
  "pkgsrc-results-${BUILDDATE}.txt" to simply "report.txt", as the
  ${BUILDDATE} variable didn't give a hint to when the bulk build had been
  started, which is often more important than when the bulk build stopped.

- Changed the way to specify the directory and the URL where the bulk build
  reports are made available. See

      http://mail-index.netbsd.org/tech-pkg/2005/12/05/0002.html

  for details. Specifying the directories using the FTPHOST and FTPURL
  variables will be possible for some months, after which it support for
  it will be dropped.
2006-01-21 11:29:31 +00:00
jdc
a82b7c9750 tsort creates temporary files in the current directory, so change to the
BULKFILESDIR directory before running it.  We can now bulk build with a
read-only pkgsrc.
2006-01-17 22:35:13 +00:00
joerg
f8ae6026cd Revert unintended part of last commit. 2006-01-05 23:18:26 +00:00
joerg
c750987c17 Adjust comment about SUBST_FILES to match reality:
absolute file names work as well.
2006-01-05 23:16:01 +00:00
rillig
d3b9bf035d If the package-specific log directory is empty after building a package,
and ${BULKFILESDIR} != ${PKGSRCDIR}, try to remove the directory.
2005-11-28 20:08:37 +00:00
rillig
678f9c3d5a 1. Added section headers in the part of the user-settable variables.
2. Reindented two "if" statements that looked like this:

if long_long_command; then :; else
	else_commands
fi

By just scanning the beginnings of the lines, which is a common way of
reading source code, one may easily miss the "hidden" "then" branch at
the end of the line. I have changed it to:

if long_long_command; then :;
else
	else_commands
fi
2005-11-24 12:14:32 +00:00
rillig
63e9bd3fa3 Changed the file extension of BROKENWRKLOG from ".html" to ".txt". This is
mostly a cosmetic change. The motives for this change are that the HTML
files only consisted of "<pre>", the properly quoted text/plain contents
and "</pre>". There has been no documentation of reasons for encoding plain
text in HTML unnecessarily, so this change will produce text/plain files
instead.

Another change is that instead of appending to the BROKENWRKSRC, the file is
overwritten each time. In a single bulk build this will not change anything.
Only when the package is built multiple times in a single bulk build, the
behavior will differ.

Ok'ed by agc.
2005-11-23 20:45:11 +00:00
agc
9ee6f68b3c Despite having ALLOW_VULNERABLE_PACKAGES in my /etc/mk.conf, I found
that the bulk builds would only work properly with the audit-packages
package installed at all times.

I am obviously hideously mistaken in this.

By popular request, revert the change to add audit-packages, since I
am told this is the incorrect way of doing this.
2005-11-20 09:52:51 +00:00
agc
3940af4d32 Allow the bulk builds to work by adding security/audit-packages as a
BULK_PREREQ package.
2005-11-19 19:21:47 +00:00
rillig
4100185f57 Replaced ${ECHO_MSG} with ${ECHO} where appropriate. While there, quoted
the filename of the toplevel BROKENFILE correctly.
2005-11-19 03:53:50 +00:00
rillig
f0d0e72266 Corrected the comment above BULKFILESDIR. It is not only used for the
global log files but also for the package-specific ones.
2005-11-18 08:48:09 +00:00
rillig
f6c9f12624 Properly indented preprocessing directives. 2005-11-18 08:42:35 +00:00
rillig
5a0e397d42 Allow FORCEBROKENFILE files to be created in either PKGSRCDIR or
BULKFILESDIR.
2005-11-18 08:35:58 +00:00
rillig
0c5c5c91ec Changes for separation of BULKFILESDIR and PKGSRCDIR.
- Added a bunch of internal variables that determine the correct places
  for the build log files of the current package.
- Added section headings.
- Moved a sanity check out of the configuration section to not confuse
  the reader.
- mk/bulk/print{depends,index} are called with two arguments, which allows
  separation of BULKFILESDIR and PKGSRCDIR.
- Replaced uses of BUILDLOG, BROKENFILE and BROKENWRKLOG with their
  internal counterparts, which use ${BULKFILESDIR} instead of ${PKGSRCDIR}.
2005-11-16 22:58:59 +00:00
kristerw
c504daf326 Fix a typo that in some cases prevented a BROKENFILE from being
created.
2005-11-12 16:44:20 +00:00
kristerw
24e619dca7 Remove some redundant printing of messages when we are cleaning
before/after building the package.
2005-11-11 18:09:13 +00:00
rillig
8808ec4369 - A warning is printed if there is no PKGNAME matching for a PKGPATH in the
.index file.
- Condensed the code for printing to another package's .broken file in case
  of failure. (Added a variable pkg_brokenfile.)
2005-11-11 13:17:58 +00:00
rillig
032798a500 Added two variables BULK_MSG and BULK_MSG_CONT that are used for printing
messages. Replaced all instances of ${ECHO_MSG} "BULK> " with ${BULK_MSG}.
2005-11-11 10:40:41 +00:00
rillig
3b91bec8e6 Fixed the remaining instances of code relying on trailing white-space in
the INDEXFILE.
2005-11-10 07:19:17 +00:00
rillig
e84e44ce14 Replaced another instance of grep|awk with a simple awk. A warning is
printed if no package name could be found for a package directory.
2005-11-10 07:11:37 +00:00
rillig
6b1abc9aff Don't rely on the INDEXFILE having trailing white-space in each line.
Whoever had written such unusual code should have left a note in the
printindex script that the trailing white-space was required. It is such
an uncommon assumption that I treated it as a typo and removed it. Now
it's fixed. I also replaced the use of grep|awk with a simple awk, as
grep would have interpreted regular expressions in the package name.

In general, please think more about _appropriate_ ways to handle data.
grep(1) is not a tool for searching strings. It's a tool for searching
regular expressions.
2005-11-10 07:04:00 +00:00
tv
dd3ba1b122 Add .forcebroken, a builder-created text file that becomes a PKG_FAIL_REASON
if present.  By design, it is not cleaned at the start of a bulk build; it
is intended to allow a bulk build admin to mark a time-consuming package as
not buildable, but which shouldn't be marked permanently as such in the
package's Makefile.
2005-11-07 18:22:22 +00:00
rillig
55af86eea4 Replaced a complicated expression with the equivalent ${PKGWILDCARD}. Added
the :Q operator to all instances of ${PKGWILDCARD}.
2005-11-05 16:58:34 +00:00
kristerw
1a69e27f40 Remove the cleaning of pre-requisite packages before and after building
a package.

This functionality consumed an enormous amount and time, and did not
do much useful work:
* It is not needed when doing a bulk build of the full pkgrsrc tree,
  since the pre-requisite packages already have been built and cleaned.
* It does not work when doing a bulk build of a subset of the packages,
  since it only cleans the direct dependencies, and not the full list.
2005-11-05 15:02:28 +00:00
tv
975ce705a3 Add lang/perl5 early, but not specifically as part of BULK_PREREQ, so that
it is available at tflat time.
2005-10-27 13:04:54 +00:00
tv
8365241b72 Use Perl-based tflat, which is up to 90% faster than the awk-based one
(necause it was forking off "sort" subprocesses on every package).
2005-10-26 16:54:04 +00:00
tv
ea9310e16a Add USE_BULK_BROKEN_CHECK variable, default 'yes'; if set to 'no', skips
the extra BROKEN/PKG_FAIL_REASON/PKG_SKIP_REASON checks when marking
dependent packages as broken.
2005-10-16 17:35:25 +00:00
reed
1f611d7e2f Make sure TEE is defined.
I saw:
-a: not found
2005-08-25 22:57:29 +00:00
reed
69eb1bfee2 iUse "up-to-date" instead of "upto date" to be consistent. 2005-08-25 22:56:03 +00:00
jlam
c2fb31ba79 Drop the perl-5.6.x package from pkgsrc. Remove lang/perl58 and update
lang/perl5 to perl-5.8.6nb4.  Modify packages that referred to
lang/perl58 to point to lang/perl5 instead.
2005-06-24 06:43:43 +00:00
rillig
e3aa46eedc Added a leading underscore to the names of the *_COOKIE variables, as they
are not part of the public interface.
2005-06-04 20:56:47 +00:00
jlam
87110dbd7b PERL5_PKGSRCDIR is no more. Explicitly use "lang/perl58" for the
location of the perl package to install for bulk builds.
2005-05-19 15:18:13 +00:00
rillig
1c499d648b Properly quote the &, <, and > characters when generating BROKENWORKLOG.
Approved by wiz.
2005-05-06 00:52:30 +00:00
agc
c42f7878b8 Be more informative when cleaning packages and pre-requisites, and clean
up the English in two informational messages. No functional changes.
2005-04-11 11:18:01 +00:00
tv
0facf8765f With the SORT=gsort hack for Interix, all hell breaks loose on pkg_add
because pkginstall encodes it into its scripts.  sigh.

Hack around this.  For bulk builds on Interix only, use gsort for "tflat";
use the system-supplied sort for the rest of the build.
2005-03-28 15:04:07 +00:00
tv
432b696c8e Correctly pass ${SORT} to tflat. Interix needs something other than the
OS-supplied one (currently, it will use gsort from coreutils).
2005-03-24 16:47:34 +00:00