test/java/lang/instrument/MakeJAR2.sh

*** 39,48 ****
--- 39,54 ----
    echo "TESTJAVA not set.  Test cannot execute.  Failed."
    exit 1
  fi
  echo "TESTJAVA=${TESTJAVA}"
  
+ if [ "${COMPILEJAVA}" = "" ]
+ then
+   COMPILEJAVA="${TESTJAVA}"
+ fi
+ echo "COMPILEJAVA=${COMPILEJAVA}"
+ 
  if [ "${TESTCLASSES}" = "" ]
  then
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
*** 62,73 ****
        echo "Unrecognized system!  $OS"
        fail "Unrecognized system!  $OS"
        ;;
  esac
  
! JAVAC="${TESTJAVA}/bin/javac -g"
! JAR="${TESTJAVA}/bin/jar"
  
  cp ${TESTSRC}/${AGENT}.java .
  cp ${TESTSRC}/${APP}.java .
  rm -rf ilib
  mkdir ilib
--- 68,79 ----
        echo "Unrecognized system!  $OS"
        fail "Unrecognized system!  $OS"
        ;;
  esac
  
! JAVAC="${COMPILEJAVA}/bin/javac -g"
! JAR="${COMPILEJAVA}/bin/jar"
  
  cp ${TESTSRC}/${AGENT}.java .
  cp ${TESTSRC}/${APP}.java .
  rm -rf ilib
  mkdir ilib
*** 75,97 ****
  rm -rf bootpath
  mkdir -p bootpath/bootreporter
  cp ${TESTSRC}/bootreporter/*.java bootpath/bootreporter
  
  cd bootpath
! ${JAVAC} bootreporter/*.java
  cd ..
  
! ${JAVAC} ${AGENT}.java ilib/*.java
! ${JAVAC} -classpath .${PATHSEP}bootpath ${APP}.java
  
  echo "Manifest-Version: 1.0"    >  ${AGENT}.mf
  echo Premain-Class: ${AGENT} >> ${AGENT}.mf
  echo Boot-Class-Path: bootpath >> ${AGENT}.mf
  shift 2
  while [ $# != 0 ] ; do
    echo $1 >> ${AGENT}.mf
    shift
  done
  
! ${JAR} cvfm ${AGENT}.jar ${AGENT}.mf ${AGENT}*.class ilib/*.class
  
  # rm -rf  ${AGENT}.java ilib ${AGENT}.mf ${AGENT}*.class
--- 81,103 ----
  rm -rf bootpath
  mkdir -p bootpath/bootreporter
  cp ${TESTSRC}/bootreporter/*.java bootpath/bootreporter
  
  cd bootpath
! ${JAVAC} ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} bootreporter/*.java
  cd ..
  
! ${JAVAC} ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} ${AGENT}.java ilib/*.java
! ${JAVAC} ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -classpath .${PATHSEP}bootpath ${APP}.java
  
  echo "Manifest-Version: 1.0"    >  ${AGENT}.mf
  echo Premain-Class: ${AGENT} >> ${AGENT}.mf
  echo Boot-Class-Path: bootpath >> ${AGENT}.mf
  shift 2
  while [ $# != 0 ] ; do
    echo $1 >> ${AGENT}.mf
    shift
  done
  
! ${JAR} ${TESTTOOLVMOPTS} cvfm ${AGENT}.jar ${AGENT}.mf ${AGENT}*.class ilib/*.class
  
  # rm -rf  ${AGENT}.java ilib ${AGENT}.mf ${AGENT}*.class