[netbeans-platform] initial netbeans-platform 7.0 import
Omair Majid
omajid at fedoraproject.org
Mon Jun 6 16:32:00 UTC 2011
commit 680f463ed4bd67721dbe3a8239b136e41609e4e8
Author: Omair Majid <omajid at redhat.com>
Date: Mon Jun 6 12:30:02 2011 -0400
initial netbeans-platform 7.0 import
.gitignore | 1 +
build-native-code.patch | 10 ++
do-not-name-sos-based-on-arch.patch | 26 +++
fix-native-dir-paths.patch | 50 ++++++
jnilib-build-uniformly-across-archs.patch | 67 ++++++++
netbeans-platform-6.9~launcher.patch | 12 --
netbeans-platform-6.9~nbi.patch | 39 -----
netbeans-platform-6.9~properties.patch | 12 --
netbeans-platform.spec | 162 +++++++++++---------
no-windows-cleaners.patch | 14 ++
...nal.patch => remove-binaries-from-release.patch | 0
remove-non-linux-jna-bits.patch | 15 ++
remove-non-linux-jni-libs.patch | 40 +++++
remove-swing-layout-src.patch | 9 +
sources | 2 +-
15 files changed, 324 insertions(+), 135 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e41391a..a881ced 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
netbeans-6.9-201006101454-platform-src.zip
/netbeans-6.9.1-201007282301-platform-src.zip
+/netbeans-7.0-201104080000-platform-src.zip
diff --git a/build-native-code.patch b/build-native-code.patch
new file mode 100644
index 0000000..29ea52a
--- /dev/null
+++ b/build-native-code.patch
@@ -0,0 +1,10 @@
+--- netbeans-platform.orig/nbi/engine/build.properties 2011-06-03 12:06:03.944704192 -0400
++++ netbeans-platform/nbi/engine/build.properties 2011-06-03 17:59:49.976455373 -0400
+@@ -37,7 +37,6 @@
+ # holder.
+ #
+
+-ignore.native=false
+ native.dirname=native
+ jar.contents.list=data/engine.list
+ jar.contents.includes=native/** org/** com/apple/** data/clioptions.list data/engine*.properties
diff --git a/do-not-name-sos-based-on-arch.patch b/do-not-name-sos-based-on-arch.patch
new file mode 100644
index 0000000..fd4b6d1
--- /dev/null
+++ b/do-not-name-sos-based-on-arch.patch
@@ -0,0 +1,26 @@
+--- netbeans-platform.orig/nbi/engine/src/org/netbeans/installer/utils/system/LinuxNativeUtils.java 2011-06-03 12:06:04.043705023 -0400
++++ netbeans-platform/nbi/engine/src/org/netbeans/installer/utils/system/LinuxNativeUtils.java 2011-06-06 10:22:19.646370050 -0400
+@@ -57,10 +57,8 @@
+ NATIVE_JNILIB_RESOURCE_SUFFIX +
+ "linux/" ; //NOI18N
+
+- public static final String LIBRARY_I386 =
++ public static final String LIBRARY =
+ "linux.so"; //NO18N
+- public static final String LIBRARY_AMD64 =
+- "linux-amd64.so"; //NO18N
+
+ private static final String PROC_MOUNTS_FILE = "/proc/mounts";
+
+@@ -78,10 +76,7 @@
+
+ LinuxNativeUtils() {
+ final String arch = System.getProperty("os.arch");
+- String library = arch.equals("amd64") ?
+- LIBRARY_AMD64 :
+- arch.equals("i386") || arch.equals("x86") ?
+- LIBRARY_I386 : null;
++ String library = LIBRARY;
+
+ if(library!=null) {
+ loadLibrary(LIBRARY_PREFIX_LINUX + library);
diff --git a/fix-native-dir-paths.patch b/fix-native-dir-paths.patch
new file mode 100644
index 0000000..416fd4e
--- /dev/null
+++ b/fix-native-dir-paths.patch
@@ -0,0 +1,50 @@
+--- netbeans-platform.orig/nbi/engine/native/build.xml 2011-06-03 12:06:03.972830033 -0400
++++ netbeans-platform/nbi/engine/native/build.xml 2011-06-06 09:50:04.779114081 -0400
+@@ -50,13 +50,13 @@
+ ======================================================================== -->
+ <target name="jnilib-init" depends="define-platform,init-platform"/>
+ <target name="jnilib-clean" depends="jnilib-init" unless="ignore.native">
+- <exec executable="make" dir="${jnilib.dir}">
++ <exec executable="make" dir="${native.dirname}/${jnilib.dir}">
+ <arg value="clean"/>
+ </exec>
+ </target>
+
+ <target name="jnilib-compile" depends="jnilib-init,jnilib-clean" unless="ignore.native">
+- <exec executable="make" dir="${jnilib.dir}">
++ <exec executable="make" dir="${native.dirname}/${jnilib.dir}">
+ <arg value="build"/>
+ </exec>
+ </target>
+@@ -67,13 +67,13 @@
+ ======================================================================== -->
+ <target name="launcher-init" depends="define-platform,init-platform"/>
+ <target name="launcher-clean" depends="launcher-init" unless="ignore.native">
+- <exec executable="make" dir="${launcher.dir}">
++ <exec executable="make" dir="${native.dirname}/${launcher.dir}">
+ <arg value="clean"/>
+ </exec>
+ </target>
+
+ <target name="launcher-compile" depends="launcher-init,launcher-clean" if="is.windows" unless="ignore.native">
+- <exec executable="make" dir="${launcher.dir}">
++ <exec executable="make" dir="${native.dirname}/${launcher.dir}">
+ <arg value="build"/>
+ </exec>
+ </target>
+@@ -86,13 +86,13 @@
+ ======================================================================== -->
+ <target name="cleaner-init" depends="define-platform,init-platform"/>
+ <target name="cleaner-clean" depends="cleaner-init" unless="ignore.native">
+- <exec executable="make" dir="${cleaner.dir}">
++ <exec executable="make" dir="${native.dirname}/${cleaner.dir}">
+ <arg value="clean"/>
+ </exec>
+ </target>
+
+ <target name="cleaner-compile" depends="cleaner-init,cleaner-clean" if="is.windows" unless="ignore.native">
+- <exec executable="make" dir="${cleaner.dir}">
++ <exec executable="make" dir="${native.dirname}/${cleaner.dir}">
+ <arg value="build"/>
+ </exec>
+ </target>
diff --git a/jnilib-build-uniformly-across-archs.patch b/jnilib-build-uniformly-across-archs.patch
new file mode 100644
index 0000000..4bf4ac1
--- /dev/null
+++ b/jnilib-build-uniformly-across-archs.patch
@@ -0,0 +1,67 @@
+diff -ruN netbeans-platform.orig/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug_amd64.mk netbeans-platform/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug_amd64.mk
+--- netbeans-platform.orig/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug_amd64.mk 2011-06-03 12:06:03.993675429 -0400
++++ netbeans-platform/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug_amd64.mk 2011-06-03 18:54:48.073675374 -0400
+@@ -80,11 +80,11 @@
+
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src
+- $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
++ $(COMPILE.c) -s -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src
+- $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
++ $(COMPILE.c) -s -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+ # Subprojects
+ .build-subprojects:
+diff -ruN netbeans-platform.orig/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug.mk netbeans-platform/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug.mk
+--- netbeans-platform.orig/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug.mk 2011-06-03 12:06:03.993675429 -0400
++++ netbeans-platform/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug.mk 2011-06-03 19:25:53.595454815 -0400
+@@ -29,11 +29,11 @@
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o
+
+ # C Compiler Flags
+-CFLAGS=-shared -m32 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++CFLAGS=-shared -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+ # CC Compiler Flags
+-CCFLAGS=-shared -m32 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+-CXXFLAGS=-shared -m32 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++CCFLAGS=-shared -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++CXXFLAGS=-shared -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+ # Fortran Compiler Flags
+ FFLAGS=
+@@ -50,11 +50,11 @@
+
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src
+- $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
++ $(COMPILE.c) -s -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src
+- $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
++ $(COMPILE.c) -s -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+ # Subprojects
+ .build-subprojects:
+diff -ruN netbeans-platform.orig/nbi/engine/native/jnilib/linux/nbproject/Makefile-Release.mk netbeans-platform/nbi/engine/native/jnilib/linux/nbproject/Makefile-Release.mk
+--- netbeans-platform.orig/nbi/engine/native/jnilib/linux/nbproject/Makefile-Release.mk 2011-06-03 12:06:03.993675429 -0400
++++ netbeans-platform/nbi/engine/native/jnilib/linux/nbproject/Makefile-Release.mk 2011-06-03 19:28:00.716455062 -0400
+@@ -29,11 +29,11 @@
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o
+
+ # C Compiler Flags
+-CFLAGS=
++CFLAGS=-fPIC
+
+ # CC Compiler Flags
+-CCFLAGS=
+-CXXFLAGS=
++CCFLAGS=-fPIC
++CXXFLAGS=-fPIC
+
+ # Fortran Compiler Flags
+ FFLAGS=
diff --git a/netbeans-platform.spec b/netbeans-platform.spec
index ed294bf..83f06e1 100644
--- a/netbeans-platform.spec
+++ b/netbeans-platform.spec
@@ -2,18 +2,16 @@
%define __jar_repack %{nil}
%define nb_ netbeans
-%define nb_major_ver 6.9
-%define nb_bugfix_ver 1
-%define nb_ver %{nb_major_ver}.%{nb_bugfix_ver}
+%define nb_major_ver 7.0
+%define nb_ver %{nb_major_ver}
-%define nb_release_time 201007282301
+%define nb_release_time 201104080000
%define nb_home %{_datadir}/%{nb_}
%define nb_dir %{nb_home}/%{nb_major_ver}
-%define nb_platform_ver 12
%define nb_platform platform
-%define nb_platform_dir %{nb_home}/%{nb_platform}%{nb_platform_ver}
-%define nb_platform_vpkg %{nb_}-%{nb_platform}%{nb_platform_ver}
+%define nb_platform_dir %{nb_home}/%{nb_platform}
+%define nb_platform_pkg %{nb_}-%{nb_platform}
%define nb_harness harness
%define nb_harness_dir %{nb_home}/%{nb_harness}
@@ -48,9 +46,9 @@
# Links the system JAR.
# %%{1} - the sys jar
# %%{2} - the symlink name/path (optional)
-%global lnSysJAR() \
- if [ -f %{_javadir}/%{1} ] ; then \
- %__ln_s -f %{_javadir}/%{*} ; \
+%global lnSys() \
+ if [ -f %{1} ] ; then \
+ %__ln_s -f %{*} ; \
else \
echo "%{1} doesn't exist." ; exit 1 ; \
fi ;
@@ -72,38 +70,54 @@ Source0: http://download.netbeans.org/%{nb_}/%{version}/final/zip/%{nb_}-%{versi
# Avoids copying the external binaries
# (*.exe *.dll) from the o.n.bootstrup/build.xml
-Patch0: %{name}-6.9~release_external.patch
+Patch0: remove-binaries-from-release.patch
+# Avoid looking for non-linux jna bits
+Patch1: remove-non-linux-jna-bits.patch
# Prevents from releasing zip files (swing-layout-1.0.4-doc.zip,
# swing-layout-1.0.4-src.zip) in the o.jdesktop.layout module
-Patch1: %{name}-6.9~properties.patch
+Patch2: remove-swing-layout-src.patch
+# Do not copy non-linux jni libaries
+Patch3: remove-non-linux-jni-libs.patch
+# Build native libraries
+Patch4: build-native-code.patch
+# Fix path to native build dir
+#Patch5: native-build-properties.patch
+Patch5: fix-native-dir-paths.patch
+# Fix paths and flags in jnilib native build
+Patch6: jnilib-build-uniformly-across-archs.patch
+# Do not special case so names
+Patch7: do-not-name-sos-based-on-arch.patch
+# Do not build windows cleaners
+Patch8: no-windows-cleaners.patch
+
# Avoids copying the external binaries in nbi module
-Patch2: %{name}-6.9~nbi.patch
+#Patch2: %{name}6.9~nbi.patch
# Avoids spam in the log if the -XX:+HeapDumpOnOutOfMemoryError option is not supported by the JVM
# http://netbeans.org/bugzilla/show_bug.cgi?id=188283
-Patch3: %{name}-6.9~launcher.patch
-
-BuildArch: noarch
+#Patch3: %{name}-6.9~launcher.patch
BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1:1.6.0
+
BuildRequires: ant >= 1.7.0
BuildRequires: ant-junit >= 1.7.0
-BuildRequires: ant-nodeps >= 1.7.0
BuildRequires: ant-trax >= 1.7.0
-BuildRequires: junit4 >= 4.5
-BuildRequires: swing-layout >= 1.0
-BuildRequires: javahelp2 >= 2.0.05
-BuildRequires: jna >= 3.0.9
-BuildRequires: cobertura >= 1.9.3
-BuildRequires: objectweb-asm >= 3.0
-BuildRequires: log4j >= 1.2.9
-BuildRequires: jakarta-oro >= 2.0.8
-BuildRequires: jemmy >= 2.3.0.0
+BuildRequires: antlr3-java
+BuildRequires: bindex >= 2.2
BuildRequires: felix-osgi-core >= 1.4.0
BuildRequires: felix-osgi-compendium >= 1.4.0
BuildRequires: felix-main >= 2.0.5
BuildRequires: felix-framework >= 2.0.5
-BuildRequires: bindex >= 2.2
+BuildRequires: javahelp2 >= 2.0.05
+BuildRequires: jna >= 3.0.9
+BuildRequires: jna-contrib
+BuildRequires: junit4 >= 4.5
+BuildRequires: jakarta-oro >= 2.0.8
+BuildRequires: jemmy >= 2.3.0.0
+BuildRequires: log4j >= 1.2.9
+BuildRequires: objectweb-asm >= 3.0
+BuildRequires: swing-layout >= 1.0
+BuildRequires: stringtemplate
Requires: jpackage-utils
Requires: java >= 1:1.6.0
@@ -116,7 +130,7 @@ Requires: felix-osgi-compendium >= 1.4.0
Requires: felix-main >= 2.0.5
Requires: felix-framework >= 2.0.5
-Provides: %{nb_platform_vpkg} = %{version}-%{release}
+Provides: %{nb_platform_pkg} = %{version}-%{release}
%description
The NetBeans Platform, version %{nb_platform_ver}, is a generic framework
@@ -136,17 +150,20 @@ javadoc to all of them.
%package %{nb_harness}
Summary: Build harness for NetBeans Platform %{nb_platform_ver}
Group: Development/Libraries
+
+Requires: %{name} = %{version}-%{release}
+
Requires: jpackage-utils
Requires: java >= 1:1.6.0
+
Requires: ant >= 1.7.0
-Requires: %{name} = %{version}-%{release}
-Requires: javahelp2 >= 2.0.05
+Requires: bindex >= 2.2
Requires: cobertura >= 1.9.3
-Requires: objectweb-asm >= 3.0
-Requires: log4j >= 1.2.9
Requires: jakarta-oro >= 2.0.8
+Requires: javahelp2 >= 2.0.05
Requires: jemmy >= 2.3.0.0
-Requires: bindex >= 2.2
+Requires: log4j >= 1.2.9
+Requires: objectweb-asm >= 3.0
%description %{nb_harness}
Harness with build scripts and ant tasks for everyone who
build an application on top of NetBeans Platform
@@ -158,39 +175,51 @@ build an application on top of NetBeans Platform
%rmFiles "*.zip"
%rmFiles "*.exe"
%rmFiles "*.dll"
+%rmFiles "*.so"
%rmFiles "binaries-list"
# To build the netbeans modules the system JARs will be used instead of pre-packaged ones
-%lnSysJAR javahelp2.jar javahelp/external/jh-2.0_05.jar
-%lnSysJAR jemmy.jar jemmy/external/jemmy-2.3.0.0.jar
-%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.4.jar
+%lnSys %{_javadir}/javahelp2.jar javahelp/external/jhall-2.0_05.jar
+%lnSys %{_javadir}/jemmy.jar jemmy/external/jemmy-2.3.0.0.jar
+%lnSys %{_javadir}/jna.jar libs.jna/external/jna-3.2.7.jar
+mkdir -p libs.jna/external/linux-amd64
+mkdir -p libs.jna/external/linux-i386
+%lnSys %{_libdir}/jna/libjnidispatch.so libs.jna/external/linux-amd64/libjnidispatch.so
+%lnSys %{_libdir}/jna/libjnidispatch.so libs.jna/external/linux-i386/libjnidispatch.so
+
+%lnSys %{_javadir}/junit4.jar libs.junit4/external/junit-4.8.2.jar
+%lnSys %{_javadir}/swing-layout.jar o.jdesktop.layout/external/swing-layout-1.0.4.jar
pushd apisupport.harness/external
- %lnSysJAR javahelp2.jar jsearch-2.0_05.jar
- %lnSysJAR bindex.jar bindex-2.2.jar
+ %lnSys %{_javadir}/javahelp2.jar jsearch-2.0_05.jar
+ %lnSys %{_javadir}/bindex.jar bindex-2.2.jar
popd
-pushd apisupport.tc.cobertura/external
- %lnSysJAR objectweb-asm/asm-all.jar asm-3.0.jar
- %lnSysJAR objectweb-asm/asm-all.jar asm-tree-3.0.jar
- %lnSysJAR cobertura.jar cobertura-1.9.3.jar
- %lnSysJAR oro.jar jakarta-oro-2.0.8.jar
- %lnSysJAR log4j.jar log4j-1.2.9.jar
+pushd core.nativeaccess/external
+ #%lnSys %{_javadir}/jna.jar platform-3.2.7.jar
+ %lnSys %{_javadir}/jna/platform.jar platform-3.2.7.jar
+popd
+pushd libs.antlr3.devel/external
+ %lnSys %{_javadir}/antlr3-runtime.jar antlr-3.1.3.jar
+ %lnSys %{_javadir}/stringtemplate.jar stringtemplate-3.2.jar
popd
pushd libs.felix/external
- %lnSysJAR felix/org.apache.felix.framework.jar felix-2.0.3.jar
- %lnSysJAR felix/org.apache.felix.main.jar felix-main-2.0.2.jar
+ %lnSys %{_javadir}/felix/org.apache.felix.framework.jar felix-2.0.3.jar
+ %lnSys %{_javadir}/felix/org.apache.felix.main.jar felix-main-2.0.2.jar
popd
pushd libs.osgi/external
- %lnSysJAR felix/org.osgi.core.jar osgi.core-4.2.jar
- %lnSysJAR felix/org.osgi.compendium.jar osgi.cmpn-4.2.jar
+ %lnSys %{_javadir}/felix/org.osgi.core.jar osgi.core-4.2.jar
+ %lnSys %{_javadir}/felix/org.osgi.compendium.jar osgi.cmpn-4.2.jar
popd
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
%build
@@ -224,14 +253,14 @@ sendopts,options.api,editor.mimelookup \
# linking the platform to the system JARs
pushd %{buildroot}%{nb_platform_dir}/modules/ext
- %lnSysJAR felix/org.apache.felix.framework.jar felix-2.0.3.jar
- %lnSysJAR felix/org.apache.felix.main.jar felix-main-2.0.2.jar
- %lnSysJAR javahelp2.jar jh-2.0_05.jar
- %lnSysJAR jna.jar jna-3.0.9.jar
- %lnSysJAR junit4.jar junit-4.5.jar
- %lnSysJAR felix/org.osgi.compendium.jar osgi.cmpn-4.2.jar
- %lnSysJAR felix/org.osgi.core.jar osgi.core-4.2.jar
- %lnSysJAR swing-layout.jar swing-layout-1.0.4.jar
+ %lnSys %{_javadir}/felix/org.apache.felix.framework.jar felix-2.0.3.jar
+ %lnSys %{_javadir}/felix/org.apache.felix.main.jar felix-main-2.0.2.jar
+ %lnSys %{_javadir}/javahelp2.jar jh-2.0_05.jar
+ %lnSys %{_javadir}/jna.jar jna-3.0.9.jar
+ %lnSys %{_javadir}/junit4.jar junit-4.5.jar
+ %lnSys %{_javadir}/felix/org.osgi.compendium.jar osgi.cmpn-4.2.jar
+ %lnSys %{_javadir}/felix/org.osgi.core.jar osgi.core-4.2.jar
+ %lnSys %{_javadir}/swing-layout.jar swing-layout-1.0.4.jar
popd
# install harness
@@ -242,19 +271,10 @@ popd
# linking the harness to the system JARs
pushd %{buildroot}%{nb_harness_dir}
pushd antlib
- %lnSysJAR bindex.jar bindex-2.2.jar
- %lnSysJAR javahelp2.jar jsearch-2.0_05.jar
- popd
- %lnSysJAR jemmy.jar modules/ext/jemmy-2.3.0.0.jar
- pushd testcoverage/cobertura
- %lnSysJAR cobertura.jar cobertura-1.9.3.jar
- pushd lib
- %lnSysJAR objectweb-asm/asm-all.jar asm-3.0.jar
- %lnSysJAR objectweb-asm/asm-all.jar asm-tree-3.0.jar
- %lnSysJAR oro.jar jakarta-oro-2.0.8.jar
- %lnSysJAR log4j.jar log4j-1.2.9.jar
- popd
+ %lnSys %{_javadir}/bindex.jar bindex-2.2.jar
+ %lnSys %{_javadir}/javahelp2.jar jsearch-2.0_05.jar
popd
+ %lnSys %{_javadir}/jemmy.jar modules/ext/jemmy-2.3.0.0.jar
popd
# install javadoc
@@ -293,7 +313,7 @@ popd
%attr(755, root, root) %{nb_harness_dir}/launchers/app.sh
%{nb_harness_dir}/modules
%{nb_harness_dir}/nbi
-%{nb_harness_dir}/testcoverage
+#%{nb_harness_dir}/testcoverage
%{nb_harness_dir}/update_tracking
%doc %{nb_harness_dir}/README
%{nb_harness_dir}/build.xml
diff --git a/no-windows-cleaners.patch b/no-windows-cleaners.patch
new file mode 100644
index 0000000..40dbe86
--- /dev/null
+++ b/no-windows-cleaners.patch
@@ -0,0 +1,14 @@
+--- netbeans-platform/nbi/engine/build.xml 2011-06-06 09:57:10.975988780 -0400
++++ netbeans-platform/nbi/engine/build.xml 2011-06-06 10:09:59.084882230 -0400
+@@ -126,11 +124,8 @@
+
+ <target name="copy-cleaners">
+ <mkdir dir="${build.classes.dir}/${native.dirname}/${native.cleaner.dir}"/>
+- <mkdir dir="${build.classes.dir}/${native.dirname}/${native.cleaner.windows.dir}"/>
+ <mkdir dir="${build.classes.dir}/${native.dirname}/${native.cleaner.unix.dir}"/>
+
+- <copy file="${native.dirname}/${native.cleaner.windows.srcdir}/${native.cleaner.windows.file}"
+- todir="${build.classes.dir}/${native.dirname}/${native.cleaner.windows.dir}"/>
+ <copy file="${native.dirname}/${native.cleaner.unix.srcdir}/${native.cleaner.unix.file}"
+ todir="${build.classes.dir}/${native.dirname}/${native.cleaner.unix.dir}"/>
+
diff --git a/netbeans-platform-6.9~release_external.patch b/remove-binaries-from-release.patch
similarity index 100%
rename from netbeans-platform-6.9~release_external.patch
rename to remove-binaries-from-release.patch
diff --git a/remove-non-linux-jna-bits.patch b/remove-non-linux-jna-bits.patch
new file mode 100644
index 0000000..5284172
--- /dev/null
+++ b/remove-non-linux-jna-bits.patch
@@ -0,0 +1,15 @@
+diff -ruN netbeans-platform.orig/libs.jna/nbproject/project.properties netbeans-platform/libs.jna/nbproject/project.properties
+--- netbeans-platform.orig/libs.jna/nbproject/project.properties 2011-06-03 12:06:03.487829001 -0400
++++ netbeans-platform/libs.jna/nbproject/project.properties 2011-06-03 15:39:36.452580379 -0400
+@@ -41,9 +41,6 @@
+ # made subject to such option by the copyright holder.
+
+ release.external/jna-3.2.7.jar=modules/ext/jna-3.2.7.jar
+-release.external/jna-3.2.7.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch.jnilib
+-release.external/jna-3.2.7.jar!/com/sun/jna/linux-amd64/libjnidispatch.so=modules/lib/amd64/Linux/libjnidispatch.so
+-release.external/jna-3.2.7.jar!/com/sun/jna/linux-i386/libjnidispatch.so=modules/lib/i386/Linux/libjnidispatch.so
+-release.external/jna-3.2.7.jar!/com/sun/jna/win32-amd64/jnidispatch.dll=modules/lib/amd64/jnidispatch.dll
+-release.external/jna-3.2.7.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch.dll
++release.external/linux-amd64/libjnidispatch.so=modules/lib/amd64/Linux/libjnidispatch.so
++release.external/linux-i386/libjnidispatch.so=modules/lib/i386/Linux/libjnidispatch.so
+ jnlp.indirect.files=modules/lib/**/*jnidispatch*
diff --git a/remove-non-linux-jni-libs.patch b/remove-non-linux-jni-libs.patch
new file mode 100644
index 0000000..6362255
--- /dev/null
+++ b/remove-non-linux-jni-libs.patch
@@ -0,0 +1,40 @@
+--- netbeans-platform.orig/nbi/engine/build.xml 2011-06-03 12:06:03.944704192 -0400
++++ netbeans-platform/nbi/engine/build.xml 2011-06-06 10:41:13.523881745 -0400
+@@ -111,37 +111,13 @@
+
+ <target name="copy-jnilibs">
+ <mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir}"/>
+- <mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.windows}"/>
+ <mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.linux}"/>
+- <mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-sparc}"/>
+- <mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-x86}"/>
+- <mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.macosx}"/>
+-
+- <copy file="${native.dirname}/${native.jnilib.dir.windows}/${native.dist.dir}/${native.jnilib.file.windows.i386}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.windows}"/>
+- <copy file="${native.dirname}/${native.jnilib.dir.windows}/${native.dist.dir}/${native.jnilib.file.windows.amd64}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.windows}"/>
+- <copy file="${native.dirname}/${native.jnilib.dir.windows}/${native.dist.dir}/${native.jnilib.file.windows.ia64}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.windows}"/>
+ <copy file="${native.dirname}/${native.jnilib.dir.linux}/${native.dist.dir}/${native.jnilib.file.linux.i386}"
+ todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.linux}"/>
+- <copy file="${native.dirname}/${native.jnilib.dir.linux}/${native.dist.dir}/${native.jnilib.file.linux.amd64}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.linux}"/>
+- <copy file="${native.dirname}/${native.jnilib.dir.solaris-x86}/${native.dist.dir}/${native.jnilib.file.solaris-x86}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-x86}"/>
+- <copy file="${native.dirname}/${native.jnilib.dir.solaris-x86}/${native.dist.dir}/${native.jnilib.file.solaris-amd64}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-x86}"/>
+- <copy file="${native.dirname}/${native.jnilib.dir.solaris-sparc}/${native.dist.dir}/${native.jnilib.file.solaris-sparc}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-sparc}"/>
+- <copy file="${native.dirname}/${native.jnilib.dir.solaris-sparc}/${native.dist.dir}/${native.jnilib.file.solaris-sparcv9}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-sparc}"/>
+- <copy file="${native.dirname}/${native.jnilib.dir.macosx}/${native.dist.dir}/${native.jnilib.file.macosx}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.macosx}"/>
+ </target>
+
+ <target name="copy-launchers">
+
+- <antcall target="copy-windows-launcher"/>
+ <antcall target="copy-unix-launcher"/>
+
+ </target>
diff --git a/remove-swing-layout-src.patch b/remove-swing-layout-src.patch
new file mode 100644
index 0000000..5dd3433
--- /dev/null
+++ b/remove-swing-layout-src.patch
@@ -0,0 +1,9 @@
+--- netbeans-platform.orig/o.jdesktop.layout/nbproject/project.properties 2011-06-03 12:06:04.348829983 -0400
++++ netbeans-platform/o.jdesktop.layout/nbproject/project.properties 2011-06-03 17:03:14.240463961 -0400
+@@ -42,6 +42,4 @@
+
+ is.autoload=true
+ release.external/swing-layout-1.0.4.jar=modules/ext/swing-layout-1.0.4.jar
+-release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip
+-release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip
+ jnlp.indirect.jars=docs/swing-layout-1.0.4-doc.zip, docs/swing-layout-1.0.4-src.zip
diff --git a/sources b/sources
index 0dbceb3..1b68a78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8fdbe26d0a51bcd54e8ffde363141e7 netbeans-6.9.1-201007282301-platform-src.zip
+cca460a51a53444c12fcec1397f85547 netbeans-7.0-201104080000-platform-src.zip
More information about the scm-commits
mailing list