make/jprt.gmk

*** 1,7 ****
  #
! # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 25,45 ****
  
  # JPRT rule to build this workspace
  
  JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
  
  jprt_build_product:  all images
          ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
!           $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
  
  jprt_build_fastdebug: fastdebug images
          ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
!           $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
  
  jprt_build_debug: debug images 
          ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
!           $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
  
  #
  # Phonies to avoid accidents.
  #
  .PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug
--- 25,52 ----
  
  # JPRT rule to build this workspace
  
  JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
  
+ ifeq ($(PLATFORM),windows)
+   ZIPFLAGS=-q
+ else
+   # store symbolic links as the link
+   ZIPFLAGS=-q -y
+ endif
+ 
  jprt_build_product:  all images
          ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
!           $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
  
  jprt_build_fastdebug: fastdebug images
          ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
!           $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
  
  jprt_build_debug: debug images 
          ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
!           $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
  
  #
  # Phonies to avoid accidents.
  #
  .PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug