Return-Path: 
 <commits-return-34192-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 43057 invoked from network); 2 May 2007 20:00:41 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 2 May 2007 20:00:41 -0000
Received: (qmail 61362 invoked by uid 500); 2 May 2007 20:00:48 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 61261 invoked by uid 500); 2 May 2007 20:00:47 -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 61252 invoked by uid 99); 2 May 2007 20:00:47 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2007 13:00:47 -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; Wed, 02 May 2007 13:00:40 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9CE5A1A9838; Wed,  2 May 2007 13:00:20 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r534604 - in /harmony/enhanced/jdktools/trunk: make/
 modules/jpda/src/main/native/jdwp/unix/agent/
 modules/jpda/src/main/native/jdwp/unix/transport/ modules/launcher/
 modules/launcher/src/main/native/launcher/unix/ modules/samsa/
Date: Wed, 02 May 2007 20:00:20 -0000
To: commits@harmony.apache.org
From: tellison@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070502200020.9CE5A1A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tellison
Date: Wed May  2 13:00:18 2007
New Revision: 534604

URL: http://svn.apache.org/viewvc?view=rev&rev=534604
Log:
More changes to enable the jdktools to compile on linux.


Added:
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/exports.txt
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/exports.txt
Removed:
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/libjdwp.exp
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/libdt_socket.exp
Modified:
    harmony/enhanced/jdktools/trunk/make/properties.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/makefile
    harmony/enhanced/jdktools/trunk/modules/launcher/build.xml
    harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/unix/makefile
    harmony/enhanced/jdktools/trunk/modules/samsa/build.xml

Modified: harmony/enhanced/jdktools/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/properties.xml?view=diff&rev=534604&r1=534603&r2=534604
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/properties.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/properties.xml Wed May  2 13:00:18 2007
@@ -342,6 +342,7 @@
                 <env key="HY_OS" value="${hy.os}" />
                 <env key="HY_NO_SIG" value="false" />
                 <env key="HY_NO_THR" value="false" />
+                <env key="HY_SHLIB_SUFFIX" value="${shlib.suffix}" />
                 <env key="HY_PLATFORM" value="${hy.platform}" />
                 <env key="HY_CFLAGS" value="${hy.cflags}" />
                 <env key="HY_ARCH_DEFINE" value="${hy.arch.define}" />

Added: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/exports.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/exports.txt?view=auto&rev=534604
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/exports.txt (added)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/exports.txt Wed May  2 13:00:18 2007
@@ -0,0 +1 @@
+*

Added: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/exports.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/exports.txt?view=auto&rev=534604
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/exports.txt (added)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/exports.txt Wed May  2 13:00:18 2007
@@ -0,0 +1 @@
+*

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/makefile?view=diff&rev=534604&r1=534603&r2=534604
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/makefile (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/makefile Wed May  2 13:00:18 2007
@@ -26,7 +26,7 @@
 COMMON=../../common/
 CMNTRANS=$(COMMON)transport/
 
-HYCFLAGS += -I$(CMNTRANS)common -I$(CMNTRANS)dt_socket \
+INCLUDES += -I$(CMNTRANS)common -I$(CMNTRANS)dt_socket \
             -I$(COMMON)generic -Idt_socket
 
 HYLDFLAGS += -lstdc++ -lgcc_s

Modified: harmony/enhanced/jdktools/trunk/modules/launcher/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/launcher/build.xml?view=diff&rev=534604&r1=534603&r2=534604
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/launcher/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/launcher/build.xml Wed May  2 13:00:18 2007
@@ -48,7 +48,7 @@
         <echo message="harmony.jdktools=${harmony.jdktools}" />
             
         <!-- Build launcher executables -->
-        <make dir="${hy.luni.src.main.native}/launcher/${hy.os}" />
+        <make dir="${hy.luni.src.main.native}/launcher/${hy.os.family}" />
 
         <!-- Copy across the built executables -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
@@ -89,7 +89,7 @@
     <!-- Clean natives -->
     <target name="clean-native">
         <echo message="Cleaning LAUNCHER natives" />
-        <make dir="${hy.luni.src.main.native}/launcher/${hy.os}"
+        <make dir="${hy.luni.src.main.native}/launcher/${hy.os.family}"
               target="clean" />
     </target>
 

Modified: harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/unix/makefile?view=diff&rev=534604&r1=534603&r2=534604
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/unix/makefile (original)
+++ harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/unix/makefile Wed May  2 13:00:18 2007
@@ -20,13 +20,15 @@
 include $(HY_HDK)/build/make/defines.mk
 
 BUILDFILES = $(SHAREDSUB)main.o $(SHAREDSUB)cmain.o \
-	$(SHAREDSUB)launcher_copyright.o $(SHAREDSUB)strbuf.o \
-	$(SHAREDSUB)libhlp.o
+             $(SHAREDSUB)launcher_copyright.o $(SHAREDSUB)strbuf.o \
+             $(SHAREDSUB)libhlp.o
+
 ifeq ($(HY_NO_THR),false)
 MDLLIBFILES += $(DLLPATH)libhyprt$(HY_SHLIB_SUFFIX)
 else
 BUILDFILES += main_hlp.o
 endif
+
 EXENAME = $(EXEPATH)java
 
 include $(HY_HDK)/build/make/rules.mk

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=534604&r1=534603&r2=534604
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/build.xml Wed May  2 13:00:18 2007
@@ -50,14 +50,15 @@
         <echo message="hy.drlvm=${hy.drlvm}" />
         <echo message="harmony.jdktools=${harmony.jdktools}" />
             
-        <make dir="${hy.samsa.src.main.native}/samsa/${hy.os}" />
+        <make dir="${hy.samsa.src.main.native}/samsa/${hy.os.family}" />
 
     </target>
 
     <!-- copy samsa executable for different tools -->
     <target name="-copy-native-exe" >
 
-        <property name="hy.samsa.exe" location="${hy.samsa.src.main.native}/samsa/${hy.os}/samsa${exe.suffix}" />
+        <property name="hy.samsa.exe"
+                  location="${hy.samsa.src.main.native}/samsa/${hy.os.family}/samsa${exe.suffix}" />
 
         <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javac${exe.suffix}" />
         <chmod file="${hy.jdk}/bin/javac${exe.suffix}" perm="ugo+x" />
@@ -79,7 +80,8 @@
     <!-- copy samsa symbol info for different tools -->
     <target name="-copy-native-progdb" if="is.windows" >
 
-        <property name="hy.samsa.progdb" location="${hy.samsa.src.main.native}/samsa/${hy.os}/samsa${progdb.suffix}" />
+        <property name="hy.samsa.progdb"
+                  location="${hy.samsa.src.main.native}/samsa/${hy.os.family}/samsa${progdb.suffix}" />
 
         <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/javac${progdb.suffix}" />
         <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/javah${progdb.suffix}" />
@@ -124,7 +126,7 @@
     <!-- Clean natives -->
     <target name="clean-native">
         <echo message="Cleaning SAMSA natives" />
-        <make dir="${hy.samsa.src.main.native}/samsa/${hy.os}"
+        <make dir="${hy.samsa.src.main.native}/samsa/${hy.os.family}"
               target="clean" />
     </target>