SUGGESTED FIX

(cd /w/ohair/svc/control/make && sccs diffs -w -C -r1.7 jprt.gmk )

------- jprt.gmk -------
*** /tmp/sccs.hiaW3t    Fri Jul  6 15:40:25 2007
--- jprt.gmk    Thu Jul  5 13:33:41 2007
***************
*** 27,37 ****
  # JPRT rule to build
  ################################################################
  
! JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
  
  jprt_build_product:  product_build
        ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
          $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
  
  jprt_build_fastdebug: fastdebug_build
        ( $(CD) $(OUTPUTDIR)-fastdebug/j2sdk-image && \
--- 27,45 ----
  # JPRT rule to build
  ################################################################
  
! DEFAULT_BUILD_FLAVOR=product
  
+ # JPRT will define these when it builds
+ JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip
+ JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip
+ 
  jprt_build_product:  product_build
        ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
          $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
+ ifdef HAVE_JPRT_SAVE_BUNDLES
+       ( $(CD) $(OUTPUTDIR)/bundles && \
+         $(ZIPEXE) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . )
+ endif
  
  jprt_build_fastdebug: fastdebug_build
        ( $(CD) $(OUTPUTDIR)-fastdebug/j2sdk-image && \
                                     

SUGGESTED FIX

(cd /w/ohair/svc/control/make && sccs diffs -w -C -r1.306 Makefile )

------- Makefile -------
*** /tmp/sccs.JhaO2t    Fri Jul  6 15:40:25 2007
--- Makefile    Thu Jul  5 13:33:42 2007
***************
*** 95,101 ****
  
  product_build:
        @$(ECHO) $@ build started: `$(DATE) '+%y-%m-%d %H:%M'`
!       $(MAKE) setup build
        @$(ECHO) $@ build finished: `$(DATE) '+%y-%m-%d %H:%M'`
  
  generic_debug_build:
--- 95,101 ----
  
  product_build:
        @$(ECHO) $@ build started: `$(DATE) '+%y-%m-%d %H:%M'`
!       $(MAKE) SKIP_FASTDEBUG_BUILD=true SKIP_DEBUG_BUILD=true all
        @$(ECHO) $@ build finished: `$(DATE) '+%y-%m-%d %H:%M'`
  
  generic_debug_build:
 
 

*** (#1 of 1): [ UNSAVED ] ###@###.###
                                     

EVALUATION

See suggested fix.