Return-Path: 
 <commits-return-34567-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 10693 invoked from network); 11 May 2007 04:52:39 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 11 May 2007 04:52:39 -0000
Received: (qmail 34861 invoked by uid 500); 11 May 2007 04:52:45 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 34840 invoked by uid 500); 11 May 2007 04:52:45 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 34831 invoked by uid 99); 11 May 2007 04:52:45 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 May 2007 21:52:45 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 May 2007 21:52:38 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5CD851A9838; Thu, 10 May 2007 21:52:18 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r537092 - in
 /harmony/enhanced/jdktools/trunk/modules/samsa:
 build.xml src/main/native/samsa/unix/makefile
 src/main/native/samsa/windows/makefile
Date: Fri, 11 May 2007 04:52:18 -0000
To: commits@harmony.apache.org
From: smishura@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070511045218.5CD851A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: smishura
Date: Thu May 10 21:52:17 2007
New Revision: 537092

URL: http://svn.apache.org/viewvc?view=rev&rev=537092
Log:
Apply patch from HARMONY-3833:
([jdktools][samsa] jdk/bin/java introduce unnecessary dependency on classlib libraries)

Modified:
    harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/unix/makefile
    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/build.xml?view=diff&rev=537092&r1=537091&r2=537092
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/build.xml Thu May 10 21:52:17 2007
@@ -115,12 +115,41 @@
         <echo message="Running SAMSA tests" />
         <echo message="test.jre.home=${test.jre.home}" />
 
-        <echo>Run javac in ${hy.tests.reports} - EXCLUDED</echo>
-        <!--exec failonerror="true"
-		                  executable="${test.jre.home}/../bin/javac${exe.suffix}"
-		                  dir="${hy.tests.reports}">
-		                <arg line="" />
-        </exec-->
+        <echo message="Run jdk/bin/java -version in ${hy.tests.reports}"/>
+        <exec failonerror="true"
+	        executable="${test.jre.home}/../bin/java${exe.suffix}"
+	        dir="${hy.tests.reports}">
+	    <arg line="-version" />
+        </exec>
+
+        <echo message="Run jdk/bin/javac -version in ${hy.tests.reports}"/>
+        <exec failonerror="true"
+	        executable="${test.jre.home}/../bin/javac${exe.suffix}"
+	        dir="${hy.tests.reports}">
+	    <arg line="-version" />
+        </exec>
+
+        <echo message="Run jdk/bin/javah in ${hy.tests.reports}"/>
+        <exec failonerror="false"
+	        executable="${test.jre.home}/../bin/javah${exe.suffix}"
+	        dir="${hy.tests.reports}">
+	    <arg line="" />
+        </exec>
+
+        <echo message="Run jdk/bin/jarsigner in ${hy.tests.reports}"/>
+        <exec failonerror="false"
+	        executable="${test.jre.home}/../bin/jarsigner${exe.suffix}"
+	        dir="${hy.tests.reports}">
+	    <arg line="" />
+        </exec>
+
+        <echo message="Run jdk/bin/keytool -help in ${hy.tests.reports}"/>
+        <exec failonerror="true"
+	        executable="${test.jre.home}/../bin/keytool${exe.suffix}"
+	        dir="${hy.tests.reports}">
+	    <arg line="-help" />
+        </exec>
+
     </target>
 
     <!-- Clean natives -->

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/unix/makefile?view=diff&rev=537092&r1=537091&r2=537092
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/unix/makefile (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/unix/makefile Thu May 10 21:52:17 2007
@@ -23,4 +23,6 @@
 
 EXENAME = samsa
 
+MDLLIBFILES = 
+
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile?view=diff&rev=537092&r1=537091&r2=537092
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile Thu May 10 21:52:17 2007
@@ -24,4 +24,8 @@
 EXEFLAGS=$(conlflags) -subsystem:console
 EXEDLLFILES=$(conlibsdll)
 
+VIRTFILES =
+SYSLIBFILES =
+MDLLIBFILES =
+
 !include <$(HY_HDK)\build\make\rules.mak>