changeset in /hg/icedtea6: 2009-04-24 Lillian Angel <langel at re...

[Lillian Angel]

changeset ac377bd5008f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ac377bd5008f
description:
	2009-04-24  Lillian Angel  <langel at redhat.com>

	        Fixes #497191
	        * Makefile.am
	        (NETBEANS_PROFILER_MD5SUM): Updated.
	        (stamps/nbplatform.stamp): Fixed to build on amd64 properly.

diffstat:

2 files changed, 16 insertions(+), 7 deletions(-)
ChangeLog   |   13 ++++++++++---
Makefile.am |   10 ++++++----

diffs (58 lines):

diff -r 03f65b9f0411 -r ac377bd5008f ChangeLog
--- a/ChangeLog	Fri Apr 24 15:37:48 2009 +0200
+++ b/ChangeLog	Fri Apr 24 14:09:22 2009 -0400
@@ -1,8 +1,15 @@ 2009-04-24 Xerxes RÃ¥nby <xerxes at zafena.
+2009-04-24  Lillian Angel  <langel at redhat.com>
+
+	Fixes #497191
+	* Makefile.am
+	(NETBEANS_PROFILER_MD5SUM): Updated.
+	(stamps/nbplatform.stamp): Fixed to build on amd64 properly.
+
 2009-04-24 Xerxes RÃ¥nby <xerxes at zafena.se>
 
-        * patches/icedtea-jpegclasses.patch
-        (openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java
-        setJPEGEncodeParam): New function.
+	* patches/icedtea-jpegclasses.patch
+	(openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java
+	setJPEGEncodeParam): New function.
 
 2009-04-23 Deepak Bhole <dbhole at redhat.com>
 
diff -r 03f65b9f0411 -r ac377bd5008f Makefile.am
--- a/Makefile.am	Fri Apr 24 15:37:48 2009 +0200
+++ b/Makefile.am	Fri Apr 24 14:09:22 2009 -0400
@@ -5,7 +5,7 @@ CACAO_VERSION = 0.99.3
 CACAO_VERSION = 0.99.3
 CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
 
-NETBEANS_PROFILER_MD5SUM = 786ab31817cbd902a7211cd6a6161750
+NETBEANS_PROFILER_MD5SUM = a6756a62291ebea5c0e2431389b31380
 VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642cfcc1e83fe
 
 if ENABLE_GCJWEBPLUGIN
@@ -1821,18 +1821,20 @@ if WITH_VISUALVM
 if WITH_VISUALVM
 	cd netbeans ; \
         rm nbbuild/external/binaries-list ; \
-        mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \
-        mkdir -p lib.profiler/release/lib/deployed/jdk16/linux ; \
 	mkdir -p ./nbbuild/netbeans_visualvm/ ; \
 	ln -s $(SYSTEM_NETBEANS_DIR)/platform9/ ./nbbuild/netbeans_visualvm/platform9 ; \
 	ln -s $(SYSTEM_NETBEANS_DIR)/apisupport1/ ./nbbuild/netbeans_visualvm/apisupport1 ; \
 	ln -s $(SYSTEM_NETBEANS_DIR)/harness/ ./nbbuild/netbeans_visualvm/harness ; \
-	cd lib.profiler/native/build ; \
 	if ! (uname -a | grep x86_64) ; then \
+	  mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \
+	  mkdir -p lib.profiler/release/lib/deployed/jdk16/linux ; \
 	  buildscript=./buildnative-linux-15.sh ; \
 	else \
+	  mkdir -p lib.profiler/release/lib/deployed/jdk15/linux-amd64 ; \
+	  mkdir -p lib.profiler/release/lib/deployed/jdk16/linux-amd64 ; \
 	  buildscript=./buildnative-linux64-15.sh ; \
 	fi ; \
+	cd lib.profiler/native/build ; \
 	JAVA_HOME_15=$(ICEDTEA_HOME) JAVA_HOME_16=$(ICEDTEA_HOME) \
 	  $$buildscript ; \
 	cd ../../.. ; \