From 29b1490f1e2a5b40596692527185fd793cd94cf1 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 25 Nov 2010 12:32:13 +0100 Subject: [PATCH 01/12] initial commit --- .gitignore | 4 + jvisualvm-luncher.patch | 22 +++++ sources | 4 + visualvm-debuginfo.patch | 24 ++++++ visualvm.spec | 180 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 234 insertions(+) create mode 100644 jvisualvm-luncher.patch create mode 100644 visualvm-debuginfo.patch create mode 100644 visualvm.spec diff --git a/.gitignore b/.gitignore index e69de29..60fd89e 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,4 @@ +/build.jar.tar.gz +/netbeans-profiler-visualvm_release69.tar.gz +/visualvm_13-src.tar.gz +/visualvm_harness-1.0.tar.gz diff --git a/jvisualvm-luncher.patch b/jvisualvm-luncher.patch new file mode 100644 index 0000000..bfc328c --- /dev/null +++ b/jvisualvm-luncher.patch @@ -0,0 +1,22 @@ +--- visualvm/launcher/visualvm 2010-11-22 09:22:54.055717346 +0100 ++++ visualvm/launcher/visualvm 2010-11-22 09:28:49.441713784 +0100 +@@ -25,8 +25,9 @@ + elif [ -f "$progdir/../etc/$APPNAME".conf ] ; then + BASEDIR="$progdir/../" + fi ++BASEDIR="/XprefixX/" + +-. "$BASEDIR/etc/$APPNAME".conf ++. "/etc/$APPNAME".conf + + # XXX does not correctly deal with spaces in non-userdir params + args="" +@@ -74,7 +75,7 @@ + done + } + +-clusters=`(cat "$BASEDIR/etc/$APPNAME".clusters; echo) | readClusters | tr '\012' ':'` ++clusters=`(cat "/etc/$APPNAME".clusters; echo) | readClusters | tr '\012' ':'` + + if [ ! -z "$extra_clusters" ] ; then + clusters="$clusters:$extra_clusters" diff --git a/sources b/sources index e69de29..5d297a0 100644 --- a/sources +++ b/sources @@ -0,0 +1,4 @@ +44f6465fc9a7ae73f7f2c21291cdd22a build.jar.tar.gz +aeca7cbd0f1dfb30858d80fa1e150820 netbeans-profiler-visualvm_release69.tar.gz +f1a28e24451982114be6590ceddeae12 visualvm_13-src.tar.gz +3dac8c562bc847d2782bdc192826271f visualvm_harness-1.0.tar.gz diff --git a/visualvm-debuginfo.patch b/visualvm-debuginfo.patch new file mode 100644 index 0000000..d3c5b41 --- /dev/null +++ b/visualvm-debuginfo.patch @@ -0,0 +1,24 @@ +diff -up ./netbeans/lib.profiler/native/build/buildnative-linux.sh.sav ./netbeans/lib.profiler/native/build/buildnative-linux.sh +--- ./netbeans/lib.profiler/native/build/buildnative-linux.sh.sav 2010-10-06 18:13:51.305833833 -0700 ++++ ./netbeans/lib.profiler/native/build/buildnative-linux.sh 2010-10-06 18:14:00.653893178 -0700 +@@ -5,7 +5,7 @@ BuildForJDK() + JAVA_HOME=$1 + JDK_ID=$2 + echo $JAVA_HOME $JDK_ID +- gcc -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -DLINUX -pthread -fPIC -shared -O3 -Wall \ ++ gcc -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -DLINUX -pthread -fPIC -shared -O3 -Wall -g \ + -o ../../release/lib/deployed/$JDK_ID/linux/libprofilerinterface.so \ + ../src-jdk15/class_file_cache.c \ + ../src-jdk15/attach.c \ +diff -up ./netbeans/lib.profiler/native/build/buildnative-linux64.sh.sav ./netbeans/lib.profiler/native/build/buildnative-linux64.sh +--- ./netbeans/lib.profiler/native/build/buildnative-linux64.sh.sav 2010-10-06 18:14:05.855642743 -0700 ++++ ./netbeans/lib.profiler/native/build/buildnative-linux64.sh 2010-10-06 18:29:26.111892884 -0700 +@@ -5,7 +5,7 @@ BuildForJDK() + JAVA_HOME=$1 + JDK_ID=$2 + echo $JAVA_HOME $JDK_ID +- gcc32 -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -DLINUX -pthread -fPIC -shared -O3 -Wall -m64 \ ++ gcc32 -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -DLINUX -pthread -fPIC -shared -O3 -Wall -m64 -g \ + -o ../../release/lib/deployed/$JDK_ID/linux-amd64/libprofilerinterface.so \ + ../src-jdk15/class_file_cache.c \ + ../src-jdk15/attach.c \ diff --git a/visualvm.spec b/visualvm.spec new file mode 100644 index 0000000..74bab9e --- /dev/null +++ b/visualvm.spec @@ -0,0 +1,180 @@ +%global nbprofilerurl https://visualvm.dev.java.net/files/documents/7163/152022/ +%global visualvmurl https://visualvm.dev.java.net/files/documents/7163/151835/ +%global visualvmharnessver 1.0 + +Name: visualvm +Version: 1.3 +Release: 9%{?dist} +Summary: Lightweight profiler that integrates many command-line JDK tools + +Group: Development/Tools +License: GPLv2 and GPLv2+ and (GPLv2 with exceptions or CDDL) +URL: http://visualvm.dev.java.net/ +Source0: http://icedtea.classpath.org/download/source/visualvm_harness-%{visualvmharnessver}.tar.gz +Source1: %{visualvmurl}/visualvm_13-src.tar.gz +Source2: %{nbprofilerurl}/netbeans-profiler-visualvm_release69.tar.gz +Source3: build.jar.tar.gz + +Patch0: visualvm-debuginfo.patch +Patch1: jvisualvm-luncher.patch + +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +BuildRequires: netbeans >= 6.9 +BuildRequires: wget +BuildRequires: java >= 1.6.0 +BuildRequires: java-devel >= 1.6.0 +BuildRequires: jakarta-commons-logging +BuildRequires: desktop-file-utils + +Requires: netbeans >= 6.9 +Requires: netbeans-platform >= 6.9 +Requires: java >= 1.6.0 + +Conflicts: java-1.6.0-openjdk <= 1:1.6.0.0-43 + + +%description +VisualVM is a visual tool integrating several command-line JDK tools and +lightweight profiling capabilities. Designed for both production and +development time use, it further enhances the capability of monitoring and +performance analysis for the Java SE platform. + + +%prep +%setup -q -n visualvm_harness-%{visualvmharnessver} +#untar sources of bundled jar, because all other sources are unntared by make +tar -zxvf %{SOURCE3} -C . + +%build +./configure --libdir=%{_libdir} \ + --prefix=%{_libdir}/%{name} \ + --with-visualvm-zip=%{SOURCE1} \ + --with-netbeans-profiler-zip=%{SOURCE2} \ + --with-visualvm-version=1.3 +# --sysconfdir=/etc - is ignored! + +#applying patch - not standard. But patch is applied to script called by make. Thats why it's here. +make extract-netbeans-profiler +patch -p0 < %{PATCH0} + +#build bundled jar +rm netbeans/nbbuild/sierra/build.jar +javac build.jar/build/build.java +jar cvf netbeans/nbbuild/sierra/build.jar build.jar/* + +make + +patch -p0 < %{PATCH1} +sed -i -e s:"^#jdkhome=.*":jdkhome="/usr/lib/jvm/java":g \ + visualvm/launcher/visualvm.conf + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share + +desktop-file-install --vendor ''\ + --dir $RPM_BUILD_ROOT%{_datadir}/applications visualvm.desktop + +#silence rpmlint for necessary empty files +find $RPM_BUILD_ROOT/%{_libdir}/visualvm/visualvm/config/Modules/ -type f -empty | while read FILE; do echo " +" > $FILE;done + +echo " +" > $RPM_BUILD_ROOT/%{_libdir}/visualvm/profiler/.lastModified + + +# little hell is comming - make istall is generating totaly weird and useless directory structure, so we need to link it from right place to right place an more +mkdir $RPM_BUILD_ROOT/etc +mv $RPM_BUILD_ROOT/%{_libdir}/visualvm/etc/visualvm.conf $RPM_BUILD_ROOT/etc/jvisualvm.conf +mv $RPM_BUILD_ROOT/%{_libdir}/visualvm/etc/visualvm.clusters $RPM_BUILD_ROOT/etc/jvisualvm.clusters +rm -rf $RPM_BUILD_ROOT/%{_libdir}/visualvm/etc/ +#I did not found where this substitution is done. reverting it back. +sed 's/APPNAME=visualvm/APPNAME=`basename "$0"`/g' < $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/jvisualvm > $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/visualvm +rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/jvisualvm + +#replace all / in prefix by \/ to be usable in sed +SEDPREFIX=%{_libdir}/%{name} +SEDPREFIX2=`echo $SEDPREFIX | sed 's/\//\\\\\//g'` +echo $SEDPREFIX2 + +#will write path where the file is installed to launcher. Needed for /etc hack +sed s/XprefixX/$SEDPREFIX2/g < $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/visualvm > $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/jvisualvm +#remove source binary +rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/visualvm + +#move launcher from libdir tu /usr/bin +mkdir $RPM_BUILD_ROOT/%{_bindir}/ +mv $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/jvisualvm $RPM_BUILD_ROOT/%{_bindir}/ +rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%attr(0755,root,root) %{_bindir}/jvisualvm +%{_libdir}/visualvm/ +%config(noreplace) /etc/jvisualvm.conf +%config(noreplace) /etc/jvisualvm.clusters +%{_datadir}/applications/visualvm.desktop +%doc README +%doc INSTALL +%doc COPYING + + +%changelog +* Wed Nov 24 2010 Jiri Vanek - 1.3-9 +- updated license + +* Tue Nov 23 2010 Jiri Vanek - 1.3-8 +- application moved from prefix to libdir/name +- removed fc15 from conficts, and increased release number of conflicted openjdk. + +* Thu Nov 22 2010 Jiri Vanek - 1.3-7 +- removed /etc symlink +- patched jvisualvm luncher to follow to /etc instead of prefix/etc + +* Thu Nov 16 2010 Jiri Vanek - 1.3-6 +- all simlinks and last modified moved from to install + + +* Thu Nov 16 2010 Jiri Vanek - 1.3-5 +- repaired missing slash at platform + +* Thu Nov 15 2010 Jiri Vanek - 1.3-4 +- added symlinks for: etc, profiler, platform, visualvm +- sed and renaming of visualvm script + +* Thu Oct 6 2010 Jiri Vanek - 1.3-3 +- fixed license file +- hacked empty files +- repaired .lastModified file to be tuched in post +- (rev 6)remove ./lastModified in postun +- (rev 5)removed and rebuilded build.jar from nb (proof of rebuilding) +- noarch added, and removed -caused error "arch dependent binaries in noarch package" +- (rev 4)fixed define->global macro +- (rev1 )added --sysconfdir=/etc to .configure +- (rev1 ) --sysconfdir=/etc is not working, _libdir/visualvm/etc/visualvm.conf and _libdir/visualvm/etc/visualvm.clusters moved to /etc, visualvm/etc/ removed +- (rev 2) added owenership for lib[64]/visualvm/ +- (rev 7) sed moved from install to build. Seams to have no evil efect to functionality +- (rev 3) removed _prefix/jvm/java-openjdk-jvisualvm/bin/jvisualvm and _prefix/jvm/java-openjdk-jvisualvm/share/visualvm.desktop (then jvm dir becomes empty - delete also. Both script and desktop file are before placed to right places. +- {_prefix}/jvm/java-openjdk-jvisualvm changed to {_prefix} + + +* Thu Oct 6 2010 Jiri Vanek - 1.3-2 +- fixed noreplace config files +- applied patch visualvm-debuginfo + + +* Thu Sep 30 2010 Jiri Vanek - 1.3-1 +- fixed installpath out of poor /user +- fixed missing requirments + + +* Thu Sep 16 2010 Deepak Bhole - 1.3-0 +- Initial build. From 1b85550b24971347c48622f767fc10808a08856a Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 5 Jan 2011 10:47:18 +0100 Subject: [PATCH 02/12] repaired spalsh screen and title, repaired desktop file, repaired dependencies --- visualvm.spec | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/visualvm.spec b/visualvm.spec index 74bab9e..741adf9 100644 --- a/visualvm.spec +++ b/visualvm.spec @@ -4,7 +4,7 @@ Name: visualvm Version: 1.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Lightweight profiler that integrates many command-line JDK tools Group: Development/Tools @@ -20,14 +20,15 @@ Patch1: jvisualvm-luncher.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: netbeans >= 6.9 BuildRequires: wget BuildRequires: java >= 1.6.0 BuildRequires: java-devel >= 1.6.0 BuildRequires: jakarta-commons-logging BuildRequires: desktop-file-utils +BuildRequires: netbeans-platform >= 6.9 +BuildRequires: netbeans-platform-harness +BuildRequires: netbeans-apisupport -Requires: netbeans >= 6.9 Requires: netbeans-platform >= 6.9 Requires: java >= 1.6.0 @@ -78,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share desktop-file-install --vendor ''\ --dir $RPM_BUILD_ROOT%{_datadir}/applications visualvm.desktop +sed 's/Exec.*/Exec=jvisualvm/g' < $RPM_BUILD_ROOT%{_datadir}/applications/visualvm.desktop > $RPM_BUILD_ROOT%{_datadir}/applications/visualvm.desktop2 +rm $RPM_BUILD_ROOT%{_datadir}/applications/visualvm.desktop +mv $RPM_BUILD_ROOT%{_datadir}/applications/visualvm.desktop2 $RPM_BUILD_ROOT%{_datadir}/applications/visualvm.desktop + #silence rpmlint for necessary empty files find $RPM_BUILD_ROOT/%{_libdir}/visualvm/visualvm/config/Modules/ -type f -empty | while read FILE; do echo " " > $FILE;done @@ -88,12 +93,10 @@ echo " # little hell is comming - make istall is generating totaly weird and useless directory structure, so we need to link it from right place to right place an more mkdir $RPM_BUILD_ROOT/etc -mv $RPM_BUILD_ROOT/%{_libdir}/visualvm/etc/visualvm.conf $RPM_BUILD_ROOT/etc/jvisualvm.conf -mv $RPM_BUILD_ROOT/%{_libdir}/visualvm/etc/visualvm.clusters $RPM_BUILD_ROOT/etc/jvisualvm.clusters +mv $RPM_BUILD_ROOT/%{_libdir}/visualvm/etc/visualvm.conf $RPM_BUILD_ROOT/etc/visualvm.conf +mv $RPM_BUILD_ROOT/%{_libdir}/visualvm/etc/visualvm.clusters $RPM_BUILD_ROOT/etc/visualvm.clusters rm -rf $RPM_BUILD_ROOT/%{_libdir}/visualvm/etc/ -#I did not found where this substitution is done. reverting it back. -sed 's/APPNAME=visualvm/APPNAME=`basename "$0"`/g' < $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/jvisualvm > $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/visualvm -rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/jvisualvm +mv $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/jvisualvm $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/visualvm #replace all / in prefix by \/ to be usable in sed SEDPREFIX=%{_libdir}/%{name} @@ -119,8 +122,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %attr(0755,root,root) %{_bindir}/jvisualvm %{_libdir}/visualvm/ -%config(noreplace) /etc/jvisualvm.conf -%config(noreplace) /etc/jvisualvm.clusters +%config(noreplace) /etc/visualvm.conf +%config(noreplace) /etc/visualvm.clusters %{_datadir}/applications/visualvm.desktop %doc README %doc INSTALL @@ -128,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 24 2010 Jiri Vanek - 1.3-10 +- resolves 667314 + * Wed Nov 24 2010 Jiri Vanek - 1.3-9 - updated license From 8c868823d129e37f90a387c043dd904abd1bca7e Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 6 Jan 2011 14:37:48 +0100 Subject: [PATCH 03/12] updated to visualvm 1.3.1 --- .gitignore | 3 +++ sources | 7 +++---- visualvm.spec | 32 ++++++++++++++------------------ 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 60fd89e..8aab1d5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ /netbeans-profiler-visualvm_release69.tar.gz /visualvm_13-src.tar.gz /visualvm_harness-1.0.tar.gz +/netbeans-profiler-visualvm_release691.tar.gz +/visualvm_131-src.tar.gz +/visualvm_harness-1.1.tar.gz diff --git a/sources b/sources index 5d297a0..6b58e42 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -44f6465fc9a7ae73f7f2c21291cdd22a build.jar.tar.gz -aeca7cbd0f1dfb30858d80fa1e150820 netbeans-profiler-visualvm_release69.tar.gz -f1a28e24451982114be6590ceddeae12 visualvm_13-src.tar.gz -3dac8c562bc847d2782bdc192826271f visualvm_harness-1.0.tar.gz +e910520f2e986ae6bd161e8cc385ab86 netbeans-profiler-visualvm_release691.tar.gz +4b8468d7ba809d57597cc6983a33842c visualvm_131-src.tar.gz +529912fdc16fd420632045a37ae19d85 visualvm_harness-1.1.tar.gz diff --git a/visualvm.spec b/visualvm.spec index 741adf9..1052dbf 100644 --- a/visualvm.spec +++ b/visualvm.spec @@ -1,19 +1,18 @@ -%global nbprofilerurl https://visualvm.dev.java.net/files/documents/7163/152022/ -%global visualvmurl https://visualvm.dev.java.net/files/documents/7163/151835/ -%global visualvmharnessver 1.0 +%global nbprofilerurl https://visualvm.dev.java.net/files/documents/7163/153051/ +%global visualvmurl https://visualvm.dev.java.net/files/documents/7163/153046/ +%global visualvmharnessver 1.1 Name: visualvm -Version: 1.3 -Release: 10%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: Lightweight profiler that integrates many command-line JDK tools Group: Development/Tools License: GPLv2 and GPLv2+ and (GPLv2 with exceptions or CDDL) URL: http://visualvm.dev.java.net/ Source0: http://icedtea.classpath.org/download/source/visualvm_harness-%{visualvmharnessver}.tar.gz -Source1: %{visualvmurl}/visualvm_13-src.tar.gz -Source2: %{nbprofilerurl}/netbeans-profiler-visualvm_release69.tar.gz -Source3: build.jar.tar.gz +Source1: %{visualvmurl}/visualvm_131-src.tar.gz +Source2: %{nbprofilerurl}/netbeans-profiler-visualvm_release691.tar.gz Patch0: visualvm-debuginfo.patch Patch1: jvisualvm-luncher.patch @@ -25,11 +24,11 @@ BuildRequires: java >= 1.6.0 BuildRequires: java-devel >= 1.6.0 BuildRequires: jakarta-commons-logging BuildRequires: desktop-file-utils -BuildRequires: netbeans-platform >= 6.9 +BuildRequires: netbeans-platform >= 6.9-1 BuildRequires: netbeans-platform-harness BuildRequires: netbeans-apisupport -Requires: netbeans-platform >= 6.9 +Requires: netbeans-platform >= 6.9-1 Requires: java >= 1.6.0 Conflicts: java-1.6.0-openjdk <= 1:1.6.0.0-43 @@ -44,26 +43,19 @@ performance analysis for the Java SE platform. %prep %setup -q -n visualvm_harness-%{visualvmharnessver} -#untar sources of bundled jar, because all other sources are unntared by make -tar -zxvf %{SOURCE3} -C . %build ./configure --libdir=%{_libdir} \ --prefix=%{_libdir}/%{name} \ --with-visualvm-zip=%{SOURCE1} \ --with-netbeans-profiler-zip=%{SOURCE2} \ - --with-visualvm-version=1.3 + --with-visualvm-version=1.3.1 # --sysconfdir=/etc - is ignored! #applying patch - not standard. But patch is applied to script called by make. Thats why it's here. make extract-netbeans-profiler patch -p0 < %{PATCH0} -#build bundled jar -rm netbeans/nbbuild/sierra/build.jar -javac build.jar/build/build.java -jar cvf netbeans/nbbuild/sierra/build.jar build.jar/* - make patch -p0 < %{PATCH1} @@ -131,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 24 2010 Jiri Vanek - 1.3.1-1 +- updated to harens 1.1, profiler 6.9.1 and visualvm 1.3.1 +- removed build of bundled jar - already fixed upstream + * Wed Nov 24 2010 Jiri Vanek - 1.3-10 - resolves 667314 From ad6345ed339bb5670b728603255ecb5576a2c4d9 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Sun, 9 Jan 2011 21:18:05 +0100 Subject: [PATCH 04/12] updated to harness 1.1pre --- .gitignore | 1 + jvisualvm-luncher.patch | 22 --------------- sources | 2 +- visualvm-debuginfo.patch | 24 ---------------- visualvm.spec | 61 ++++++++-------------------------------- 5 files changed, 13 insertions(+), 97 deletions(-) delete mode 100644 jvisualvm-luncher.patch delete mode 100644 visualvm-debuginfo.patch diff --git a/.gitignore b/.gitignore index 8aab1d5..9910377 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /netbeans-profiler-visualvm_release691.tar.gz /visualvm_131-src.tar.gz /visualvm_harness-1.1.tar.gz +/visualvm_harness-1.1pre.tar.gz diff --git a/jvisualvm-luncher.patch b/jvisualvm-luncher.patch deleted file mode 100644 index bfc328c..0000000 --- a/jvisualvm-luncher.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- visualvm/launcher/visualvm 2010-11-22 09:22:54.055717346 +0100 -+++ visualvm/launcher/visualvm 2010-11-22 09:28:49.441713784 +0100 -@@ -25,8 +25,9 @@ - elif [ -f "$progdir/../etc/$APPNAME".conf ] ; then - BASEDIR="$progdir/../" - fi -+BASEDIR="/XprefixX/" - --. "$BASEDIR/etc/$APPNAME".conf -+. "/etc/$APPNAME".conf - - # XXX does not correctly deal with spaces in non-userdir params - args="" -@@ -74,7 +75,7 @@ - done - } - --clusters=`(cat "$BASEDIR/etc/$APPNAME".clusters; echo) | readClusters | tr '\012' ':'` -+clusters=`(cat "/etc/$APPNAME".clusters; echo) | readClusters | tr '\012' ':'` - - if [ ! -z "$extra_clusters" ] ; then - clusters="$clusters:$extra_clusters" diff --git a/sources b/sources index 6b58e42..1ec39f6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ e910520f2e986ae6bd161e8cc385ab86 netbeans-profiler-visualvm_release691.tar.gz 4b8468d7ba809d57597cc6983a33842c visualvm_131-src.tar.gz -529912fdc16fd420632045a37ae19d85 visualvm_harness-1.1.tar.gz +9ab53ec5e04ae7334f5a22654d754aa9 visualvm_harness-1.1pre.tar.gz diff --git a/visualvm-debuginfo.patch b/visualvm-debuginfo.patch deleted file mode 100644 index d3c5b41..0000000 --- a/visualvm-debuginfo.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up ./netbeans/lib.profiler/native/build/buildnative-linux.sh.sav ./netbeans/lib.profiler/native/build/buildnative-linux.sh ---- ./netbeans/lib.profiler/native/build/buildnative-linux.sh.sav 2010-10-06 18:13:51.305833833 -0700 -+++ ./netbeans/lib.profiler/native/build/buildnative-linux.sh 2010-10-06 18:14:00.653893178 -0700 -@@ -5,7 +5,7 @@ BuildForJDK() - JAVA_HOME=$1 - JDK_ID=$2 - echo $JAVA_HOME $JDK_ID -- gcc -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -DLINUX -pthread -fPIC -shared -O3 -Wall \ -+ gcc -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -DLINUX -pthread -fPIC -shared -O3 -Wall -g \ - -o ../../release/lib/deployed/$JDK_ID/linux/libprofilerinterface.so \ - ../src-jdk15/class_file_cache.c \ - ../src-jdk15/attach.c \ -diff -up ./netbeans/lib.profiler/native/build/buildnative-linux64.sh.sav ./netbeans/lib.profiler/native/build/buildnative-linux64.sh ---- ./netbeans/lib.profiler/native/build/buildnative-linux64.sh.sav 2010-10-06 18:14:05.855642743 -0700 -+++ ./netbeans/lib.profiler/native/build/buildnative-linux64.sh 2010-10-06 18:29:26.111892884 -0700 -@@ -5,7 +5,7 @@ BuildForJDK() - JAVA_HOME=$1 - JDK_ID=$2 - echo $JAVA_HOME $JDK_ID -- gcc32 -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -DLINUX -pthread -fPIC -shared -O3 -Wall -m64 \ -+ gcc32 -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -DLINUX -pthread -fPIC -shared -O3 -Wall -m64 -g \ - -o ../../release/lib/deployed/$JDK_ID/linux-amd64/libprofilerinterface.so \ - ../src-jdk15/class_file_cache.c \ - ../src-jdk15/attach.c \ diff --git a/visualvm.spec b/visualvm.spec index 1052dbf..66accbb 100644 --- a/visualvm.spec +++ b/visualvm.spec @@ -1,10 +1,10 @@ %global nbprofilerurl https://visualvm.dev.java.net/files/documents/7163/153051/ %global visualvmurl https://visualvm.dev.java.net/files/documents/7163/153046/ -%global visualvmharnessver 1.1 +%global visualvmharnessver 1.1pre Name: visualvm Version: 1.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight profiler that integrates many command-line JDK tools Group: Development/Tools @@ -14,9 +14,6 @@ Source0: http://icedtea.classpath.org/download/source/visualvm_harness-%{visu Source1: %{visualvmurl}/visualvm_131-src.tar.gz Source2: %{nbprofilerurl}/netbeans-profiler-visualvm_release691.tar.gz -Patch0: visualvm-debuginfo.patch -Patch1: jvisualvm-luncher.patch - BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: wget @@ -45,36 +42,20 @@ performance analysis for the Java SE platform. %setup -q -n visualvm_harness-%{visualvmharnessver} %build -./configure --libdir=%{_libdir} \ - --prefix=%{_libdir}/%{name} \ +./configure --prefix=/usr \ --with-visualvm-zip=%{SOURCE1} \ --with-netbeans-profiler-zip=%{SOURCE2} \ - --with-visualvm-version=1.3.1 -# --sysconfdir=/etc - is ignored! - -#applying patch - not standard. But patch is applied to script called by make. Thats why it's here. -make extract-netbeans-profiler -patch -p0 < %{PATCH0} + --with-visualvm-version=1.3.1 \ + --sysconfdir=/etc \ + --libdir=%{_libdir} \ + --datadir=%{_datadir} make -patch -p0 < %{PATCH1} -sed -i -e s:"^#jdkhome=.*":jdkhome="/usr/lib/jvm/java":g \ - visualvm/launcher/visualvm.conf - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share - -desktop-file-install --vendor ''\ - --dir $RPM_BUILD_ROOT%{_datadir}/applications visualvm.desktop - -sed 's/Exec.*/Exec=jvisualvm/g' < $RPM_BUILD_ROOT%{_datadir}/applications/visualvm.desktop > $RPM_BUILD_ROOT%{_datadir}/applications/visualvm.desktop2 -rm $RPM_BUILD_ROOT%{_datadir}/applications/visualvm.desktop -mv $RPM_BUILD_ROOT%{_datadir}/applications/visualvm.desktop2 $RPM_BUILD_ROOT%{_datadir}/applications/visualvm.desktop - #silence rpmlint for necessary empty files find $RPM_BUILD_ROOT/%{_libdir}/visualvm/visualvm/config/Modules/ -type f -empty | while read FILE; do echo " " > $FILE;done @@ -82,30 +63,6 @@ find $RPM_BUILD_ROOT/%{_libdir}/visualvm/visualvm/config/Modules/ -type f -empt echo " " > $RPM_BUILD_ROOT/%{_libdir}/visualvm/profiler/.lastModified - -# little hell is comming - make istall is generating totaly weird and useless directory structure, so we need to link it from right place to right place an more -mkdir $RPM_BUILD_ROOT/etc -mv $RPM_BUILD_ROOT/%{_libdir}/visualvm/etc/visualvm.conf $RPM_BUILD_ROOT/etc/visualvm.conf -mv $RPM_BUILD_ROOT/%{_libdir}/visualvm/etc/visualvm.clusters $RPM_BUILD_ROOT/etc/visualvm.clusters -rm -rf $RPM_BUILD_ROOT/%{_libdir}/visualvm/etc/ -mv $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/jvisualvm $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/visualvm - -#replace all / in prefix by \/ to be usable in sed -SEDPREFIX=%{_libdir}/%{name} -SEDPREFIX2=`echo $SEDPREFIX | sed 's/\//\\\\\//g'` -echo $SEDPREFIX2 - -#will write path where the file is installed to launcher. Needed for /etc hack -sed s/XprefixX/$SEDPREFIX2/g < $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/visualvm > $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/jvisualvm -#remove source binary -rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/visualvm - -#move launcher from libdir tu /usr/bin -mkdir $RPM_BUILD_ROOT/%{_bindir}/ -mv $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/jvisualvm $RPM_BUILD_ROOT/%{_bindir}/ -rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin - - %clean rm -rf $RPM_BUILD_ROOT @@ -123,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 24 2010 Jiri Vanek - 1.3.1-2 +- updated to harens 1.1pre +- removed file-changes fixed by upstream. + * Wed Nov 24 2010 Jiri Vanek - 1.3.1-1 - updated to harens 1.1, profiler 6.9.1 and visualvm 1.3.1 - removed build of bundled jar - already fixed upstream From ecb1511c267f22173f216f2260a182076ef466af Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 12 Jan 2011 23:22:24 +0100 Subject: [PATCH 05/12] * Wed Jan 12 2011 Jiri Vanek - 1.3.1-3 - updated to harens 1.1 --- sources | 4 ++-- visualvm.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 1ec39f6..1445d67 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -e910520f2e986ae6bd161e8cc385ab86 netbeans-profiler-visualvm_release691.tar.gz 4b8468d7ba809d57597cc6983a33842c visualvm_131-src.tar.gz -9ab53ec5e04ae7334f5a22654d754aa9 visualvm_harness-1.1pre.tar.gz +c396f2bd95b96a16755b95bfedb2043f visualvm_harness-1.1.tar.gz +e910520f2e986ae6bd161e8cc385ab86 netbeans-profiler-visualvm_release691.tar.gz diff --git a/visualvm.spec b/visualvm.spec index 66accbb..3c3aa48 100644 --- a/visualvm.spec +++ b/visualvm.spec @@ -1,10 +1,10 @@ %global nbprofilerurl https://visualvm.dev.java.net/files/documents/7163/153051/ %global visualvmurl https://visualvm.dev.java.net/files/documents/7163/153046/ -%global visualvmharnessver 1.1pre +%global visualvmharnessver 1.1 Name: visualvm Version: 1.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Lightweight profiler that integrates many command-line JDK tools Group: Development/Tools @@ -80,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 12 2011 Jiri Vanek - 1.3.1-3 +- updated to harens 1.1 + + * Wed Nov 24 2010 Jiri Vanek - 1.3.1-2 - updated to harens 1.1pre - removed file-changes fixed by upstream. From 60cf369b95e92b413b6d6bd3a34e3c99b9f65630 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 18 Jan 2011 10:44:43 +0100 Subject: [PATCH 06/12] package name releas tag i extended for harness version --- visualvm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/visualvm.spec b/visualvm.spec index 3c3aa48..6e2a7d3 100644 --- a/visualvm.spec +++ b/visualvm.spec @@ -4,7 +4,7 @@ Name: visualvm Version: 1.3.1 -Release: 3%{?dist} +Release: %{visualvmharnessver}.4%{?dist} Summary: Lightweight profiler that integrates many command-line JDK tools Group: Development/Tools @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 12 2011 Jiri Vanek - 1.3.1-1.1.4 +- release extended for harness version + * Wed Jan 12 2011 Jiri Vanek - 1.3.1-3 - updated to harens 1.1 From 76b7a92030744efaacfd76669b6de453a340193e Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 1 Feb 2011 10:59:37 +0100 Subject: [PATCH 07/12] added dependece for java-devel, fixed conficts version --- visualvm.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/visualvm.spec b/visualvm.spec index 6e2a7d3..d72a8e4 100644 --- a/visualvm.spec +++ b/visualvm.spec @@ -4,7 +4,7 @@ Name: visualvm Version: 1.3.1 -Release: %{visualvmharnessver}.4%{?dist} +Release: %{visualvmharnessver}.5%{?dist} Summary: Lightweight profiler that integrates many command-line JDK tools Group: Development/Tools @@ -27,8 +27,9 @@ BuildRequires: netbeans-apisupport Requires: netbeans-platform >= 6.9-1 Requires: java >= 1.6.0 +BuildRequires: java-devel >= 1.6.0 -Conflicts: java-1.6.0-openjdk <= 1:1.6.0.0-43 +Conflicts: java-1.6.0-openjdk <= 1:1.6.0.0-47 %description @@ -80,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 1 2011 Jiri Vanek - 1.3.1-1.1.5 +- fixed requires for java-devel, fixed conflicts version + * Wed Jan 12 2011 Jiri Vanek - 1.3.1-1.1.4 - release extended for harness version From 408c181b7f5f46592e8fed0a3e8c6e0fb362f21e Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 2 Feb 2011 17:37:30 +0100 Subject: [PATCH 08/12] added dependece for java-devel, fixed conficts version --- visualvm.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/visualvm.spec b/visualvm.spec index d72a8e4..f16d992 100644 --- a/visualvm.spec +++ b/visualvm.spec @@ -4,7 +4,7 @@ Name: visualvm Version: 1.3.1 -Release: %{visualvmharnessver}.5%{?dist} +Release: %{visualvmharnessver}.6%{?dist} Summary: Lightweight profiler that integrates many command-line JDK tools Group: Development/Tools @@ -25,9 +25,9 @@ BuildRequires: netbeans-platform >= 6.9-1 BuildRequires: netbeans-platform-harness BuildRequires: netbeans-apisupport -Requires: netbeans-platform >= 6.9-1 -Requires: java >= 1.6.0 -BuildRequires: java-devel >= 1.6.0 +Requires: netbeans-platform >= 6.9-1 +Requires: java >= 1.6.0 +Requires: java-devel >= 1.6.0 Conflicts: java-1.6.0-openjdk <= 1:1.6.0.0-47 @@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 2 2011 Jiri Vanek - 1.3.1-1.1.6 +- fixed requires for java-devel, fixed conflicts version + * Wed Feb 1 2011 Jiri Vanek - 1.3.1-1.1.5 - fixed requires for java-devel, fixed conflicts version From 2d41b2d867a77428a78c589b5e9a2dd19a2cfbfb Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 14 Mar 2011 11:20:39 +0100 Subject: [PATCH 09/12] updated to visualvm 1.3.2, harness 1.2, sources locations are on classpath server now. --- .gitignore | 2 ++ sources | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9910377..387a13b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /visualvm_131-src.tar.gz /visualvm_harness-1.1.tar.gz /visualvm_harness-1.1pre.tar.gz +/visualvm_132-src.tar.gz +/visualvm_harness-1.2.tar.gz diff --git a/sources b/sources index 1445d67..c4ad47e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -4b8468d7ba809d57597cc6983a33842c visualvm_131-src.tar.gz -c396f2bd95b96a16755b95bfedb2043f visualvm_harness-1.1.tar.gz -e910520f2e986ae6bd161e8cc385ab86 netbeans-profiler-visualvm_release691.tar.gz +5d730e982c47e3d3dc59b2bd8d1b62af netbeans-profiler-visualvm_release691.tar.gz +207bd175a87b9e8f12e992c0f70561a8 visualvm_132-src.tar.gz +77ff0529bda902b1881cd792afc521d5 visualvm_harness-1.2.tar.gz From 151fba4797659dbcd75864a220546167e78f105d Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 14 Mar 2011 12:08:39 +0100 Subject: [PATCH 10/12] updated for visualvm 1.3.2 --- visualvm.spec | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/visualvm.spec b/visualvm.spec index f16d992..330bd29 100644 --- a/visualvm.spec +++ b/visualvm.spec @@ -1,18 +1,17 @@ -%global nbprofilerurl https://visualvm.dev.java.net/files/documents/7163/153051/ -%global visualvmurl https://visualvm.dev.java.net/files/documents/7163/153046/ -%global visualvmharnessver 1.1 +%global dwnldurl http://icedtea.classpath.org/download/visualvm/ +%global visualvmharnessver 1.2 Name: visualvm -Version: 1.3.1 -Release: %{visualvmharnessver}.6%{?dist} +Version: 1.3.2 +Release: %{visualvmharnessver}.7%{?dist} Summary: Lightweight profiler that integrates many command-line JDK tools Group: Development/Tools License: GPLv2 and GPLv2+ and (GPLv2 with exceptions or CDDL) URL: http://visualvm.dev.java.net/ -Source0: http://icedtea.classpath.org/download/source/visualvm_harness-%{visualvmharnessver}.tar.gz -Source1: %{visualvmurl}/visualvm_131-src.tar.gz -Source2: %{nbprofilerurl}/netbeans-profiler-visualvm_release691.tar.gz +Source0: %{dwnldurl}/visualvm_harness-%{visualvmharnessver}.tar.gz +Source1: %{dwnldurl}/visualvm_132-src.tar.gz +Source2: %{dwnldurl}/netbeans-profiler-visualvm_release691.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -46,7 +45,7 @@ performance analysis for the Java SE platform. ./configure --prefix=/usr \ --with-visualvm-zip=%{SOURCE1} \ --with-netbeans-profiler-zip=%{SOURCE2} \ - --with-visualvm-version=1.3.1 \ + --with-visualvm-version=1.3.2 \ --sysconfdir=/etc \ --libdir=%{_libdir} \ --datadir=%{_datadir} @@ -81,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 8 2011 Jiri Vanek - 1.3.2-1.2.7 +- updated for vm 1.3.2 + * Fri Feb 2 2011 Jiri Vanek - 1.3.1-1.1.6 - fixed requires for java-devel, fixed conflicts version From 83c69c286d14327bcb1924cbc13c6cfe69c91bb0 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 22 Mar 2011 14:42:42 +0100 Subject: [PATCH 11/12] updated to offical harness 1.2 --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c4ad47e..ee4d2e4 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -5d730e982c47e3d3dc59b2bd8d1b62af netbeans-profiler-visualvm_release691.tar.gz +f1bd185f7a7758ea6c9c71acf174f0a8 visualvm_harness-1.2.tar.gz 207bd175a87b9e8f12e992c0f70561a8 visualvm_132-src.tar.gz -77ff0529bda902b1881cd792afc521d5 visualvm_harness-1.2.tar.gz +5d730e982c47e3d3dc59b2bd8d1b62af netbeans-profiler-visualvm_release691.tar.gz From c56eedfe377f506c662535efd244322347d4f43e Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 22 Mar 2011 15:21:41 +0100 Subject: [PATCH 12/12] updated to offical harness 1.2 --- visualvm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/visualvm.spec b/visualvm.spec index 330bd29..5ec4f98 100644 --- a/visualvm.spec +++ b/visualvm.spec @@ -3,7 +3,7 @@ Name: visualvm Version: 1.3.2 -Release: %{visualvmharnessver}.7%{?dist} +Release: %{visualvmharnessver}.8%{?dist} Summary: Lightweight profiler that integrates many command-line JDK tools Group: Development/Tools @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 21 2011 Jiri Vanek - 1.3.2-1.2.8 +- updated for hearness 1.2 + * Fri Mar 8 2011 Jiri Vanek - 1.3.2-1.2.7 - updated for vm 1.3.2