4719 update gate build environment to [open]jdk7 4742 update manifests for javadoc7 4743 Fix deprecated /usr/j2se usage in slp and remove from filesystem(5) manpage 4744 remove traces of /var/sadm/system/admin/default_java Reviewed by: Dan McDonald <danmcd@omniti.com> Reviewed by: Richard Lowe <richlowe@richlowe.net>

          --- old/usr/src/cmd/dtrace/test/tst/common/java_api/Makefile
          +++ new/usr/src/cmd/dtrace/test/tst/common/java_api/Makefile

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the

  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  24   24  # Use is subject to license terms.
  25   25  #
  26      -#ident  "%Z%%M% %I%     %E% SMI"
  27   26  
  28   27  include $(SRC)/Makefile.master
  29   28  
  30   29  ROOTOPTPKG = $(ROOT)/opt/SUNWdtrt
  31   30  JAR_DSTDIR = $(ROOTOPTPKG)/tst/common/java_api
  32   31  JAR_SRCDIR = $(SRC)/cmd/dtrace/test/tst/common/java_api
  33   32  
  34   33  # Use the proto dtrace.jar if it exists, otherwise use whatever is
  35   34  # installed on the system. It should be possible to build
  36   35  # usr/src/cmd/dtrace/test independently, even if only on systems that

  37   36  # have a compatible dtrace.jar installed.
  38   37  DTRACE_JAR=usr/share/lib/java/dtrace.jar
  39   38  PROTO_DTRACE_JAR=$(ROOT)/$(DTRACE_JAR)
  40   39  INSTALLED_DTRACE_JAR=/$(DTRACE_JAR)
  41   40  CLASSPATH=$(PROTO_DTRACE_JAR):$(INSTALLED_DTRACE_JAR)
  42   41  SRCDIR=src
  43   42  CLASSDIR=classes
  44   43  MANIFESTDIR=manifest
  45   44  MANIFEST=$(MANIFESTDIR)/test.jar-manifest
  46   45  TEST_JAR=$(JAR_SRCDIR)/test.jar
  47   46  PROTO_TEST_JAR=$(JAR_DSTDIR)/test.jar
  48   47  
  49   48  default: $(TEST_JAR)
  50   49  
  51   50  clean:
  52   51          $(RM) $(CLASSDIR)/*.class

  53   52  
  54   53  clobber: clean
  55   54          $(RM) $(TEST_JAR)
  56   55  
  57   56  all: default
  58   57  
  59   58  lint:
  60   59  
  61   60  install: all $(PROTO_TEST_JAR)
  62   61  
  63      -JFLAGS= -g -cp $(CLASSPATH) -d $(CLASSDIR) -deprecation
  64      -JFLAGS += -target 1.5
  65      -JFLAGS += -Xlint
       62 +JFLAGS= -g -cp $(CLASSPATH) -d $(CLASSDIR)
       63 +JFLAGS += -source 1.5 -target 1.6 -Xlint:all,-options,-rawtypes
  66   64  COMPILE.java=$(JAVAC) $(JFLAGS)
  67   65  
  68   66  $(TEST_JAR): $(SRCDIR)/*.java
  69   67          @mkdir -p $(CLASSDIR)
  70   68          $(COMPILE.java) $(SRCDIR)/*.java
  71   69          $(JAR) -cmf $(MANIFEST) $(TEST_JAR) -C $(CLASSDIR) .
  72   70  
  73   71  $(PROTO_TEST_JAR): $(JAR_DSTDIR)
  74   72  
  75   73  $(JAR_DSTDIR):
  76   74          $(INS.dir)
  77   75  
  78   76  $(JAR_DSTDIR)/%: $(JAR_SRCDIR)/%
  79   77          $(INS.file)
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX