rpms/netbeans-platform/devel netbeans-platform-6.7.1-launcher.patch, NONE, 1.1 import.log, 1.2, 1.3 netbeans-platform.spec, 1.5, 1.6

Victor G. Vasilyev victorv at fedoraproject.org
Wed Sep 9 20:22:35 UTC 2009 

Author: victorv

Update of /cvs/pkgs/rpms/netbeans-platform/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7033/devel

Modified Files:
	import.log netbeans-platform.spec 
Added Files:
	netbeans-platform-6.7.1-launcher.patch 
Log Message:
* The Patch3 for the platform launcher is added.
* Remove javadoc zip archives from the package.
* Cosmetics in the spec file.


netbeans-platform-6.7.1-launcher.patch:
 nbexec |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netbeans-platform-6.7.1-launcher.patch ---
diff -Nur netbeans-platform-6.7.1/o.n.bootstrap/launcher/unix/nbexec netbeans-platform-6.7.1.new/o.n.bootstrap/launcher/unix/nbexec
--- netbeans-platform-6.7.1/o.n.bootstrap/launcher/unix/nbexec	2009-07-23 02:39:10.000000000 +0400
+++ netbeans-platform-6.7.1.new/o.n.bootstrap/launcher/unix/nbexec	2009-08-19 04:39:38.000000000 +0400
@@ -189,7 +189,7 @@
 fi
 
 # if heap dump on OOME is supported enable it
-if "${jdkhome}/bin/java" -XX:+HeapDumpOnOutOfMemoryError > /dev/null ; then
+if "${jdkhome}/bin/java" -XX:+HeapDumpOnOutOfMemoryError &> /dev/null ; then
    jargs="$jargs -XX:+HeapDumpOnOutOfMemoryError"
    if ! echo $jargs | grep -- "-XX:HeapDumpPath=" > /dev/null ; then
       jargs="$jargs -XX:HeapDumpPath=\"${userdir}/var/log/heapdump.hprof\""


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	13 Aug 2009 02:29:07 -0000	1.2
+++ import.log	9 Sep 2009 20:22:35 -0000	1.3
@@ -1,2 +1,3 @@
 netbeans-platform-6_5-4_fc11:HEAD:netbeans-platform-6.5-4.fc11.src.rpm:1231938808
 netbeans-platform-6_7_1-1_fc12:HEAD:netbeans-platform-6.7.1-1.fc12.src.rpm:1250130860
+netbeans-platform-6_7_1-2_fc12:HEAD:netbeans-platform-6.7.1-2.fc12.src.rpm:1252527869


Index: netbeans-platform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/netbeans-platform.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- netbeans-platform.spec	13 Aug 2009 02:29:07 -0000	1.5
+++ netbeans-platform.spec	9 Sep 2009 20:22:35 -0000	1.6
@@ -32,13 +32,13 @@
 %define noautoupdate()    echo > %1/.noautoupdate
 
 # Links the system JAR
-# %1 - the sys jar name
-# %2 - the symlink
-%define lnSysJAR() %{__ln_s} -f %{_javadir}/%{1} %{2} ;
+# %1 - the sys jar
+# %2 - the symlink name/path (optional)
+%global lnSysJAR() %__ln_s -f %{_javadir}/%{*} ;
 
 Name:         netbeans-platform
 Version:      %{nb_ver}
-Release:      1%{?dist}
+Release:      2%{?dist}
 Summary:      NetBeans Platform %{nb_platform_ver}
 Group:        Development/Libraries
 License:      GPLv2 with exceptions or CDDL
@@ -54,6 +54,8 @@ Patch0: %{name}-%{version}-build_bootstr
 Patch1: %{name}-%{version}-properties.patch
 # openjdk-javac-6-b12.jar is needed only if JDK 1.5 is used, but we use JDK 1.6
 Patch2: %{name}-%{version}-javac.patch
+# Avoids spam in the log if the -XX:+HeapDumpOnOutOfMemoryError option is not supported by the JVM
+Patch3: %{name}-%{version}-launcher.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -118,15 +120,15 @@ build an application on top of NetBeans 
 %prep
 %setup -q -c
 
-find . -type f \( -iname "*.jar" -o -iname "*.zip" \) | xargs -t %{__rm} -f
-find . -type f \( -iname "*.exe" \) | xargs -t %{__rm} -f
-find . -type f \( -iname "binaries-list" \) | xargs -t %{__rm} -f
+find . -type f \( -iname "*.jar" -o -iname "*.zip" \) | xargs -t %__rm -f
+find . -type f \( -iname "*.exe" \) | xargs -t %__rm -f
+find . -type f \( -iname "binaries-list" \) | xargs -t %__rm -f
 
 # As of Java 6, JSR 223 is included in the JRE.
 # Generate the stub jar file, so there is something in jsr223 API module
-%{__mkdir_p} libs.jsr223/src/javax/script
+%__mkdir_p libs.jsr223/src/javax/script
 echo "package javax.script; class empty { }" > libs.jsr223/src/javax/script/empty.java
-%{__mkdir_p} libs.jsr223/external
+%__mkdir_p libs.jsr223/external
 jar cf libs.jsr223/external/jsr223-api.jar libs.jsr223/src/javax/script/empty.java
 
 # To build the netbeans modules the installed jars will be used instead of pre-packaged ones
@@ -135,24 +137,27 @@ jar cf libs.jsr223/external/jsr223-api.j
 %lnSysJAR jna.jar           libs.jna/external/jna-3.0.9.jar
 %lnSysJAR junit4.jar        libs.junit4/external/junit-4.5.jar
 %lnSysJAR swing-layout.jar  o.jdesktop.layout/external/swing-layout-1.0.3.jar
-%lnSysJAR javahelp2.jar apisupport.harness/external/jsearch-2.0_05.jar
-%lnSysJAR cobertura.jar apisupport.harness/external/cobertura-1.9.jar
-%lnSysJAR asm2-all.jar  apisupport.harness/external/asm-2.2.1.jar
-%lnSysJAR asm2-all.jar  apisupport.harness/external/asm-tree-2.2.1.jar
-%lnSysJAR log4j.jar     apisupport.harness/external/log4j-1.2.9.jar
-%lnSysJAR oro.jar       apisupport.harness/external/jakarta-oro-2.0.8.jar
+pushd apisupport.harness/external
+  %lnSysJAR javahelp2.jar jsearch-2.0_05.jar
+  %lnSysJAR cobertura.jar cobertura-1.9.jar
+  %lnSysJAR asm2-all.jar  asm-2.2.1.jar
+  %lnSysJAR asm2-all.jar  asm-tree-2.2.1.jar
+  %lnSysJAR log4j.jar     log4j-1.2.9.jar
+  %lnSysJAR oro.jar       jakarta-oro-2.0.8.jar
+popd
 
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 
 # build platform & harness
-%{ant_nb_opt} -f nbbuild/build.xml build-platform
+%ant_nb_opt -f nbbuild/build.xml build-platform
 
 # build platform javadoc
-%{ant_nb_opt} \
+%ant_nb_opt \
    -Dallmodules= \
    -Dcluster.config=platform \
    -Dconfig.javadoc.cluster=%{nb_platform} \
@@ -168,45 +173,51 @@ sendopts,options.api,editor.mimelookup \
    -f nbbuild/build.xml build-javadoc
 
 # clean up stub jars
-%{__rm} -f %{nbbuild_platform_dir}/modules/ext/script-api.jar
+%__rm -f %{nbbuild_platform_dir}/modules/ext/script-api.jar
 
 %install
-
-%{__rm} -rf %{buildroot}
+%__rm -rf %{buildroot}
 
 # install platform
-%{__mkdir_p} %{buildroot}%{nb_platform_dir}
-%{__cp} -pr nbbuild/netbeans/%{nb_platform}/* %{buildroot}%{nb_platform_dir}
+%__mkdir_p %{buildroot}%{nb_platform_dir}
+%__cp -pr nbbuild/netbeans/%{nb_platform}/* %{buildroot}%{nb_platform_dir}
 %noautoupdate %{buildroot}%{nb_platform_dir}
 
-# linking the platform to the external JARs
-BR_PLATFORM_EXT=%{buildroot}%{nb_platform_dir}/modules/ext
-%lnSysJAR javahelp2.jar    ${BR_PLATFORM_EXT}/jh-2.0_05.jar
-%lnSysJAR jna.jar          ${BR_PLATFORM_EXT}/jna-3.0.9.jar
-%lnSysJAR junit4.jar       ${BR_PLATFORM_EXT}/junit-4.5.jar
-%lnSysJAR swing-layout.jar ${BR_PLATFORM_EXT}/swing-layout-1.0.3.jar
+# linking the platform to the system JARs
+pushd %{buildroot}%{nb_platform_dir}/modules/ext
+  %lnSysJAR javahelp2.jar    jh-2.0_05.jar
+  %lnSysJAR jna.jar          jna-3.0.9.jar
+  %lnSysJAR junit4.jar       junit-4.5.jar
+  %lnSysJAR swing-layout.jar swing-layout-1.0.3.jar
+popd
 
 # install harness
-%{__mkdir_p} %{buildroot}%{nb_harness_dir}
-%{__cp} -pr nbbuild/netbeans/%{nb_harness}/* %{buildroot}%{nb_harness_dir}
+%__mkdir_p %{buildroot}%{nb_harness_dir}
+%__cp -pr nbbuild/netbeans/%{nb_harness}/* %{buildroot}%{nb_harness_dir}
 %noautoupdate %{buildroot}%{nb_harness_dir}
 
-# linking the harness to the external JARs
-BR_HARNESS=%{buildroot}%{nb_harness_dir}
-%lnSysJAR javahelp2.jar ${BR_HARNESS}/antlib/jsearch-2.0_05.jar
-%lnSysJAR jemmy.jar ${BR_HARNESS}/modules/ext/jemmy-2.3.0.0.jar
-%lnSysJAR cobertura.jar ${BR_HARNESS}/testcoverage/cobertura/cobertura-1.9.jar
-%lnSysJAR asm2-all.jar  ${BR_HARNESS}/testcoverage/cobertura/lib/asm-2.2.1.jar
-%lnSysJAR asm2-all.jar  ${BR_HARNESS}/testcoverage/cobertura/lib/asm-tree-2.2.1.jar
-%lnSysJAR oro.jar       ${BR_HARNESS}/testcoverage/cobertura/lib/jakarta-oro-2.0.8.jar
-%lnSysJAR log4j.jar     ${BR_HARNESS}/testcoverage/cobertura/lib/log4j-1.2.9.jar
+# linking the harness to the system JARs
+pushd %{buildroot}%{nb_harness_dir}
+  %lnSysJAR javahelp2.jar antlib/jsearch-2.0_05.jar
+  %lnSysJAR jemmy.jar     modules/ext/jemmy-2.3.0.0.jar
+  pushd testcoverage/cobertura
+    %lnSysJAR cobertura.jar cobertura-1.9.jar
+    pushd lib
+      %lnSysJAR asm2-all.jar  asm-2.2.1.jar
+      %lnSysJAR asm2-all.jar  asm-tree-2.2.1.jar
+      %lnSysJAR oro.jar       jakarta-oro-2.0.8.jar
+      %lnSysJAR log4j.jar     log4j-1.2.9.jar
+    popd
+  popd
+popd
 
 # install javadoc
-%{__mkdir_p} %{buildroot}%{nb_javadoc_dir}
-%{__cp} -pr nbbuild/build/javadoc/* %{buildroot}%{nb_javadoc_dir}
+%__rm -rf  nbbuild/build/javadoc/*.zip
+%__mkdir_p %{buildroot}%{nb_javadoc_dir}
+%__cp -pr nbbuild/build/javadoc/* %{buildroot}%{nb_javadoc_dir}
 
 %clean
-%{__rm} -rf %{buildroot}
+%__rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -254,6 +265,9 @@ BR_HARNESS=%{buildroot}%{nb_harness_dir}
 %doc %{nb_javadoc_dir}/
 
 %changelog
+* Wed Aug 19 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.7.1-2
+- The Patch3 for the platform launcher
+- Remove javadoc zip archives
 * Thu May 21 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.7.1-1
 - Bootstrapping of the spec 6.5 for platform of the NetBeans 6.7.1
 - jna-3.0.2.jar -> jna-3.0.9.jar

More information about the fedora-extras-commits mailing list