/hg/icedtea6: 2009-09-09 Lillian Angel <langel at redhat.com>

[langel at icedtea.classpath.org]

changeset 738d06e2778e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=738d06e2778e
author: langel
date: Thu Sep 10 16:31:56 2009 -0400

	2009-09-09 Lillian Angel <langel at redhat.com>

	 * Makefile.am: Added NB_PLATFORM and NB_APISUPPORT to
	determine current versions to use. This will prevent future
	failures whenever NetBeans is updated.


diffstat:

2 files changed, 18 insertions(+), 4 deletions(-)
ChangeLog   |    6 ++++++
Makefile.am |   16 ++++++++++++----

diffs (60 lines):

diff -r dbf2dacce14a -r 738d06e2778e ChangeLog
--- a/ChangeLog	Wed Sep 09 16:44:12 2009 +0100
+++ b/ChangeLog	Thu Sep 10 16:31:56 2009 -0400
@@ -1,3 +1,9 @@ 2009-09-09  Andrew Haley  <aph at redhat.co
+2009-09-09  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Added NB_PLATFORM and NB_APISUPPORT to determine
+	current versions to use. This will prevent future failures whenever
+	NetBeans is updated.
+
 2009-09-09  Andrew Haley  <aph at redhat.com>
 
 	* NEWS: Update for 1.6.
diff -r dbf2dacce14a -r 738d06e2778e Makefile.am
--- a/Makefile.am	Wed Sep 09 16:44:12 2009 +0100
+++ b/Makefile.am	Thu Sep 10 16:31:56 2009 -0400
@@ -28,6 +28,14 @@ LIVECONNECT_DIR =
 LIVECONNECT_DIR =
 NPPLUGIN_DIR =
 endif
+endif
+
+if WITH_VISUALVM
+NB_PLATFORM= $(shell ls /usr/share/netbeans | grep platform | tail -n1)
+NB_APISUPPORT=$(shell ls /usr/share/netbeans | grep apisupport | tail -n1)
+else
+NB_PLATFORM=
+NB_APISUPPORT=
 endif
 
 if ENABLE_PULSE_JAVA
@@ -1190,7 +1198,7 @@ if WITH_VISUALVM
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
 	cp -r visualvm/build/cluster/* \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
-	cp -r netbeans/nbbuild/netbeans_visualvm/platform9 \
+	cp -r netbeans/nbbuild/netbeans_visualvm/$(NB_PLATFORM) \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \
 	cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm	
@@ -1275,7 +1283,7 @@ if WITH_VISUALVM
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
 	cp -r visualvm/build/cluster/* \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
-	cp -r netbeans/nbbuild/netbeans_visualvm/platform9 \
+	cp -r netbeans/nbbuild/netbeans_visualvm/$(NB_PLATFORM) \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \
 	cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm
@@ -2033,8 +2041,8 @@ if WITH_VISUALVM
 	cd netbeans ; \
         rm nbbuild/external/binaries-list ; \
 	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)/$(NB_PLATFORM)/ ./nbbuild/netbeans_visualvm/$(NB_PLATFORM) ; \
+	ln -s $(SYSTEM_NETBEANS_DIR)/$(NB_APISUPPORT)/ ./nbbuild/netbeans_visualvm/$(NB_APISUPPORT) ; \
 	ln -s $(SYSTEM_NETBEANS_DIR)/harness/ ./nbbuild/netbeans_visualvm/harness ; \
 	if ! (uname -a | grep x86_64) ; then \
 	  mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \