7053576 canonical source location for beanshell, gcc3, and tidy is changing
7053723 tk, expect, and xml-simple should use build, not prep dependencies
--- a/components/Makefile Fri Jun 17 10:55:05 2011 -0700
+++ b/components/Makefile Fri Jun 17 15:03:50 2011 -0700
@@ -54,8 +54,6 @@
build: TARGET = build
install: TARGET = install
publish: TARGET = publish
-install-packages: TARGET = install-packages
-validate: TARGET = validate
clean: TARGET = clean
clobber: TARGET = clobber
test: TARGET = test
@@ -67,15 +65,16 @@
.DEFAULT: publish
-download prep build install publish install-packages validate \
-test: $(COMPONENT_DIRS)
+build install publish test: $(COMPONENT_DIRS)
COMPONENT_DIRS.nosetup = $(COMPONENT_DIRS:%=%.nosetup)
-clean: $(COMPONENT_DIRS:%=%.nosetup)
+download prep: $(COMPONENT_DIRS.nosetup)
+
+clean: $(COMPONENT_DIRS.nosetup)
$(RM) components.mk depends.mk .profile
-clobber: $(COMPONENT_DIRS:%=%.nosetup) clean
+clobber: $(COMPONENT_DIRS.nosetup) clean
$(RM) -r $(WS_REPO) $(WS_LOGS) $(WS_LINT_CACHE)
setup: $(WS_LOGS) $(WS_REPO) tools $(WS_LINT_CACHE)
@@ -107,7 +106,7 @@
echo "WS_TOP=$(WS_TOP)" >>$@
echo "export PATH WS_TOP" >>$@
-$(COMPONENT_DIRS): setup FORCE
+$(COMPONENT_DIRS): $(WS_LOGS) setup FORCE
@cd $@ && echo "$(TARGET) $@" && \
$(BASS_O_MATIC) $(TEMPLATE_ZONE:%=--template-zone %) \
$(@:%=--component %) --make $(TARGET) $(LOG)
@@ -122,7 +121,7 @@
$(shell find . -name 'manifest-*.published')
endif
-$(COMPONENT_DIRS.nosetup): FORCE
+$(COMPONENT_DIRS.nosetup): $(WS_LOGS) FORCE
@cd $(@:%.nosetup=%) && echo "$(TARGET) $(@:%.nosetup=%)" && \
$(BASS_O_MATIC) $(TEMPLATE_ZONE:%=--template-zone %) \
$(@:%.nosetup=--component %) --make $(TARGET) $(LOG)
--- a/components/beanshell/Makefile Fri Jun 17 10:55:05 2011 -0700
+++ b/components/beanshell/Makefile Fri Jun 17 15:03:50 2011 -0700
@@ -33,7 +33,7 @@
# component is upgraded the download location should revert back to
# beanshell.org if possible. Note also a fork of beanshell is receiving
# more attention at the google code repository of late.
-COMPONENT_ARCHIVE_URL= http://static.opensolaris.org/tarball/userland/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL= $(EXTERNAL_ARCHIVE_MIRROR)/$(SOURCE_ARCHIVE)
IPS_COMPONENT_VERSION= 2.0
--- a/components/gcc3/Makefile Fri Jun 17 10:55:05 2011 -0700
+++ b/components/gcc3/Makefile Fri Jun 17 15:03:50 2011 -0700
@@ -28,7 +28,7 @@
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
# unfortunately we have our own "special" tarball and not the community version, so use that.
COMPONENT_ARCHIVE_HASH= sha1:f7a27d5aeb07748eb6e924abfcfcf469c378b13e
-COMPONENT_ARCHIVE_URL= http://static.opensolaris.org/tarball/userland/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL= $(EXTERNAL_ARCHIVE_MIRROR)/$(SOURCE_ARCHIVE)
include ../../make-rules/prep.mk
include ../../make-rules/configure.mk
--- a/components/perl_modules/xml-simple/Makefile Fri Jun 17 10:55:05 2011 -0700
+++ b/components/perl_modules/xml-simple/Makefile Fri Jun 17 15:03:50 2011 -0700
@@ -55,8 +55,8 @@
../xml-parser/build/5.8.4/.installed ../xml-parser/build/5.12/.installed:
(cd ../xml-parser ; $(GMAKE) install)
-$(SOURCE_DIR)/.prep: ../xml-parser/build/5.8.4/.installed \
- ../xml-parser/build/5.12/.installed
+$(BUILD_32): ../xml-parser/build/5.8.4/.installed \
+ ../xml-parser/build/5.12/.installed
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
--- a/components/tcl/expect/Makefile Fri Jun 17 10:55:05 2011 -0700
+++ b/components/tcl/expect/Makefile Fri Jun 17 15:03:50 2011 -0700
@@ -64,8 +64,7 @@
../tcl/build/%/.built:
(cd ../tcl ; $(GMAKE) build)
-$(SOURCE_DIR)/.prep: ../tcl/build/$(MACH32)/.built \
- ../tcl/build/$(MACH64)/.built
+$(BUILD_32): ../tcl/build/$(MACH32)/.built
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
--- a/components/tcl/tk/Makefile Fri Jun 17 10:55:05 2011 -0700
+++ b/components/tcl/tk/Makefile Fri Jun 17 15:03:50 2011 -0700
@@ -75,8 +75,8 @@
../tcl/build/%/.built:
(cd ../tcl ; $(GMAKE) build)
-$(SOURCE_DIR)/.prep: ../tcl/build/$(MACH32)/.built \
- ../tcl/build/$(MACH64)/.built
+$(BUILD_32): ../tcl/build/$(MACH32)/.built
+$(BUILD_64): ../tcl/build/$(MACH64)/.built
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
--- a/components/tidy/Makefile Fri Jun 17 10:55:05 2011 -0700
+++ b/components/tidy/Makefile Fri Jun 17 15:03:50 2011 -0700
@@ -30,7 +30,7 @@
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= sha1:305704f7569b9e0abea81033f609f9a19dbbcfe2
-COMPONENT_ARCHIVE_URL= http://static.opensolaris.org/tarball/userland/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL= $(EXTERNAL_ARCHIVE_MIRROR)/$(SOURCE_ARCHIVE)
include ../../make-rules/prep.mk
--- a/make-rules/shared-macros.mk Fri Jun 17 10:55:05 2011 -0700
+++ b/make-rules/shared-macros.mk Fri Jun 17 15:03:50 2011 -0700
@@ -23,9 +23,22 @@
PATH=/usr/bin:/usr/gnu/bin
-# Default to looking for source archives on the internal mirror before we
-# hammer on the external repositories.
-export DOWNLOAD_SEARCH_PATH += http://userland.us.oracle.com/source-archives/
+# The location of an internal mirror of community source archives that we build
+# in this gate. This mirror has been seeded to include "custom" source archives
+# for a few components where the communities either no longer provide matching
+# source archives or we have changes that aren't reflected in their archives or
+# anywhere else.
+INTERNAL_ARCHIVE_MIRROR = http://userland.us.oracle.com/source-archives
+
+# The location of an external mirror of community source archives that we build
+# in this gate. The external mirror is a replica of the internal mirror.
+EXTERNAL_ARCHIVE_MIRROR = \
+ http://static.opensolaris.org/action/browse/userland/tarball/userland
+
+# Default to looking for source archives on the internal mirror and the external
+# mirror before we hammer on the community source archive repositories.
+export DOWNLOAD_SEARCH_PATH += $(INTERNAL_ARCHIVE_MIRROR)
+export DOWNLOAD_SEARCH_PATH += $(EXTERNAL_ARCHIVE_MIRROR)
# The workspace starts at the mercurial root
export WS_TOP ?= $(shell hg root)