Mercurial > hg > visualvm
changeset 8:37857184a6d9
PR546: Check for the NetBeans platform directory appropriate to the version being built.
2010-09-08 Andrew John Hughes <ahughes@redhat.com>
PR546:
* Makefile.am:
(NB_PLATFORM): Removed; defined by configure.
* acinclude.m4:
(VV_WITH_NETBEANS_PROFILER_ZIP): Define once only.
(VV_WITH_VISUALVM_ZIP): Likewise.
(IT_CHECK_FOR_JDK): Likewise.
(VV_SET_ARCH_SETTINGS): Likewise.
(VV_CHECK_WITH_VISUALVM_VERSION): Likewise.
(VV_CHECK_FOR_NETBEANS): Check that NetBeans home
exists and contains the appropriate platform for
the version being built.
* configure.ac: Call VV_CHECK_FOR_NETBEANS rather
than doing it inline.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Wed, 08 Sep 2010 20:08:55 +0100 |
parents | 11eff73a8d6d |
children | 8b1172973c70 |
files | ChangeLog Makefile.am acinclude.m4 configure.ac |
diffstat | 4 files changed, 55 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Sep 08 19:55:06 2010 +0100 +++ b/ChangeLog Wed Sep 08 20:08:55 2010 +0100 @@ -1,3 +1,20 @@ +2010-09-08 Andrew John Hughes <ahughes@redhat.com> + + PR546: + * Makefile.am: + (NB_PLATFORM): Removed; defined by configure. + * acinclude.m4: + (VV_WITH_NETBEANS_PROFILER_ZIP): Define once only. + (VV_WITH_VISUALVM_ZIP): Likewise. + (IT_CHECK_FOR_JDK): Likewise. + (VV_SET_ARCH_SETTINGS): Likewise. + (VV_CHECK_WITH_VISUALVM_VERSION): Likewise. + (VV_CHECK_FOR_NETBEANS): Check that NetBeans home + exists and contains the appropriate platform for + the version being built. + * configure.ac: Call VV_CHECK_FOR_NETBEANS rather + than doing it inline. + 2010-09-08 Andrew John Hughes <ahughes@redhat.com> * INSTALL: Added.
--- a/Makefile.am Wed Sep 08 19:55:06 2010 +0100 +++ b/Makefile.am Wed Sep 08 20:08:55 2010 +0100 @@ -14,8 +14,6 @@ VISUALVM_13_SRC_ZIP = visualvm_13-src.tar.gz VISUALVM_13_SHA256SUM = 18105c1e05347caac04830a8ee940219c573a5447d3cd9b084d6883c9ff07353 -NB_PLATFORM = $(shell ls $(SYSTEM_NETBEANS_DIR) | grep platform | tail -n1) - if VVVERSION_13 NETBEANS_PROFILER_URL=$(NETBEANS_69_PROFILER_URL) NETBEANS_PROFILER_SRC_ZIP=$(NETBEANS_69_PROFILER_SRC_ZIP)
--- a/acinclude.m4 Wed Sep 08 19:55:06 2010 +0100 +++ b/acinclude.m4 Wed Sep 08 20:08:55 2010 +0100 @@ -1,4 +1,4 @@ -AC_DEFUN([VV_WITH_NETBEANS_PROFILER_ZIP], +AC_DEFUN_ONCE([VV_WITH_NETBEANS_PROFILER_ZIP], [ AC_MSG_CHECKING(for a NetBeans profiler zip) AC_ARG_WITH([netbeans-profiler-zip], @@ -14,7 +14,7 @@ AC_SUBST(ALT_NETBEANS_PROFILER_ZIP) ]) -AC_DEFUN([VV_WITH_VISUALVM_ZIP], +AC_DEFUN_ONCE([VV_WITH_VISUALVM_ZIP], [ AC_MSG_CHECKING(for a VisualVM zip) AC_ARG_WITH([visualvm-zip], @@ -30,7 +30,7 @@ AC_SUBST(ALT_VISUALVM_ZIP) ]) -AC_DEFUN([IT_CHECK_FOR_JDK], +AC_DEFUN_ONCE([IT_CHECK_FOR_JDK], [ AC_MSG_CHECKING([for a JDK home directory]) AC_ARG_WITH([jdk-home], @@ -76,7 +76,7 @@ AC_SUBST([$1]) ]) -AC_DEFUN([VV_SET_ARCH_SETTINGS], +AC_DEFUN_ONCE([VV_SET_ARCH_SETTINGS], [ AC_REQUIRE([AC_CANONICAL_HOST]) case "${host_cpu}" in @@ -108,7 +108,7 @@ AC_SUBST(ARCHFLAG) ]) -AC_DEFUN([VV_CHECK_WITH_VISUALVM_VERSION], +AC_DEFUN_ONCE([VV_CHECK_WITH_VISUALVM_VERSION], [ DEFAULT_VERSION="1.2.2" AC_MSG_CHECKING([which VisualVM version to build]) @@ -128,3 +128,35 @@ AC_MSG_RESULT([${VVVERSION}]) AM_CONDITIONAL([VVVERSION_13], [test "$VVVERSION" = "1.3"]) ]) + +AC_DEFUN_ONCE([VV_CHECK_FOR_NETBEANS], +[ +AC_REQUIRE([VV_CHECK_WITH_VISUALVM_VERSION]) +AC_MSG_CHECKING([for a NetBeans installation]) +AC_ARG_WITH([netbeans-home], + [AS_HELP_STRING([--with-netbeans-home], + [NetBeans home directory (default is /usr/share/netbeans)])], + [ + if test "x${withval}" = x + then + SYSTEM_NETBEANS_DIR=/usr/share/netbeans + else + SYSTEM_NETBEANS_DIR=${withval} + fi + ], + [ + SYSTEM_NETBEANS_DIR=/usr/share/netbeans + ]) +AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}]) +AC_SUBST(SYSTEM_NETBEANS_DIR) +if test "$VVVERSION" = "1.3"; then + NB_PLATFORM=${SYSTEM_NETBEANS_DIR}/platform12; +else + NB_PLATFORM=${SYSTEM_NETBEANS_DIR}/platform11; +fi +if ! test -d ${NB_PLATFORM} ; then + AC_MSG_ERROR([Couldn't find NetBeans platform directory: ${NB_PLATFORM}]) +fi +AC_SUBST([NB_PLATFORM]) +]) +
--- a/configure.ac Wed Sep 08 19:55:06 2010 +0100 +++ b/configure.ac Wed Sep 08 20:08:55 2010 +0100 @@ -13,24 +13,6 @@ AC_PROG_CC -AC_MSG_CHECKING([for a NetBeans installation]) -AC_ARG_WITH([netbeans-home], - [AS_HELP_STRING([--with-netbeans-home], - [NetBeans home directory (default is /usr/share/netbeans)])], - [ - if test "x${withval}" = x - then - SYSTEM_NETBEANS_DIR=/usr/share/netbeans - else - SYSTEM_NETBEANS_DIR=${withval} - fi - ], - [ - SYSTEM_NETBEANS_DIR=/usr/share/netbeans - ]) -AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}]) -AC_SUBST(SYSTEM_NETBEANS_DIR) - IT_CHECK_FOR_JDK IT_FIND_TOOL([ANT], [ant]) IT_FIND_TOOL([SHA256SUM], [sha256sum]) @@ -40,6 +22,6 @@ VV_SET_ARCH_SETTINGS VV_WITH_NETBEANS_PROFILER_ZIP VV_WITH_VISUALVM_ZIP -VV_CHECK_WITH_VISUALVM_VERSION +VV_CHECK_FOR_NETBEANS AC_OUTPUT