[SCM] libnb-platform-java packaging branch, master, updated. debian/6.9-1-16-gd3b1b03
Andrew Ross
rockclimb-guest at alioth.debian.org
Sun Jun 19 22:48:10 UTC 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libnb-platform-java packaging".
The branch, master has been updated
via d3b1b03b115dcee2b76e68cfa23bfb74cd33ce0f (commit)
via ab5a6fd3443f03c787c219217b23f7566ed1bb35 (commit)
via 3ab009d95a1f08f2ccf6667b993814578622f04b (commit)
via c48ee352ceb8299663db0930568c77605915e7b9 (commit)
via 0c55e9f32175a3d747c7edf0258bcb40c49de113 (commit)
via ab73ccbb0a4a80bdd326bebc4efa5596855ffe0a (commit)
via 16892ebdf6581d08a072b220ea5cad0f9d342e47 (commit)
via 28dab5a1ea5e4bd4ac84915ee5043b6acc9ec4fa (commit)
via 85f464b18551e3f9c915042b0fedc7af38d57a5e (commit)
via 48c99e5243f158d8102abdb9bd274fb93e354b53 (commit)
via 961bf2f2cbaa08341bda81450fad28a1d3876c86 (commit)
via 82dcf8b229dbc4251a746ddffe92d91248958dac (commit)
via e6cbe0cc6479548236359c61fdebef58e27e69ae (commit)
via 39c91c3ed8f42a3c56b3437627e7842d8d2b5361 (commit)
from cddf957a4fe420f1ba4477188cd9c7cae2a6961f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d3b1b03b115dcee2b76e68cfa23bfb74cd33ce0f
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Sun Jun 19 23:47:19 2011 +0100
Update changelog.
commit ab5a6fd3443f03c787c219217b23f7566ed1bb35
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Sun Jun 19 23:31:23 2011 +0100
Update override and set the classpath for the modules jar.
commit 3ab009d95a1f08f2ccf6667b993814578622f04b
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Sun Jun 19 23:12:58 2011 +0100
update lintian overrides.
commit c48ee352ceb8299663db0930568c77605915e7b9
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Sun Jun 19 20:12:17 2011 +0100
Run mh_clean when cleaning.
commit 0c55e9f32175a3d747c7edf0258bcb40c49de113
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Sun Jun 19 20:06:15 2011 +0100
Fixed rules.
commit ab73ccbb0a4a80bdd326bebc4efa5596855ffe0a
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Sun Jun 19 20:02:09 2011 +0100
Platform depends on new library packages.
commit 16892ebdf6581d08a072b220ea5cad0f9d342e47
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Sun Jun 19 20:00:08 2011 +0100
Install library jars as separate packages.
commit 28dab5a1ea5e4bd4ac84915ee5043b6acc9ec4fa
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Sat Jun 18 19:43:52 2011 +0100
Add a lintian-overrides file
commit 85f464b18551e3f9c915042b0fedc7af38d57a5e
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Sat Jun 18 19:26:30 2011 +0100
unset DISPLAY to avoid build failure.
commit 48c99e5243f158d8102abdb9bd274fb93e354b53
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Sat Jun 18 19:11:04 2011 +0100
Updated patches.
commit 961bf2f2cbaa08341bda81450fad28a1d3876c86
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Sat Jun 18 19:05:44 2011 +0100
Update rules.
commit 82dcf8b229dbc4251a746ddffe92d91248958dac
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Sat Jun 18 19:03:53 2011 +0100
Updated patches
commit e6cbe0cc6479548236359c61fdebef58e27e69ae
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Sat Jun 18 19:00:24 2011 +0100
Packaging for 7.0.
commit 39c91c3ed8f42a3c56b3437627e7842d8d2b5361
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Sat Jun 18 18:59:23 2011 +0100
Updated packageing to 7.0.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 17 ++
debian/control | 82 ++++++--
debian/libnb-org-openide-modules-java.manifest | 2 +
debian/libnb-platform-devel-java.lintian-overrides | 12 +
debian/libnb-platform12-java-doc.doc-base | 11 -
debian/libnb-platform13-java-doc.doc-base | 11 +
debian/libnb-platform13-java.lintian-overrides | 12 +
debian/orig-tar.sh | 82 ++++++++
.../patches/netbeans-platform-6.9~bootstrap.patch | 13 --
debian/patches/netbeans-platform-6.9~junit.patch | 41 ----
.../patches/netbeans-platform-6.9~launcher.patch | 20 --
debian/patches/netbeans-platform-6.9~nbi.patch | 11 -
.../patches/netbeans-platform-6.9~properties.patch | 11 -
.../patches/netbeans-platform-6.9~suite-xml.patch | 11 -
.../patches/netbeans-platform~include-extras.patch | 53 +++++
debian/patches/netbeans-platform~launcher.patch | 24 +++
debian/patches/netbeans-platform~nbi.patch | 16 ++
debian/patches/netbeans-platform~nodownloads.patch | 77 +++++++
.../patches/netbeans-platform~nojnabinaries.patch | 21 ++
debian/patches/netbeans-platform~properties.patch | 14 ++
.../netbeans-platform~windowslauncher.patch | 168 ++++++++++++++++
debian/patches/series | 13 +-
debian/pom/openide-modules.xml | 21 ++
debian/pom/openide-util-lookup.xml | 9 +
debian/pom/openide-util.xml | 16 ++
debian/rules | 211 ++++++++++----------
debian/watch | 4 +-
27 files changed, 732 insertions(+), 251 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 524cbfa..ee6c2e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+libnb-platform-java (7.0+dfsg1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated debian/patches.
+ * Bump standards version to 3.9.2.
+ * Added myself to Uploaders.
+ * Build Windows launcher using mingw.
+ * Move utilility libraries to their own packages. (Closes: #490433)
+ * Also close some bugs which were fixed in the 6.9 series which never
+ entered the Debian archives:
+ - Use packaged swinglayout.jar. (Closes #448922)
+ - Depend on generic Java. (Closes #499417)
+ - Package for Debian Main. (Closes #531952)
+ * Update Copyright file to cover all files correctly.
+
+ -- Andrew Ross <ubuntu at rossfamily.co.uk> Sun, 19 Jun 2011 19:48:54 +0100
+
libnb-platform-java (6.9-1) unstable; urgency=low
[ Andres Mejia ]
diff --git a/debian/control b/debian/control
index 0788cf2..e6e0e97 100644
--- a/debian/control
+++ b/debian/control
@@ -3,48 +3,86 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Yulia Novozhilova <Yulia.Novozhilova at sun.com>,
- Andres Mejia <mcitadel at gmail.com>
+ Andres Mejia <mcitadel at gmail.com>, Andrew Ross <ubuntu at rossfamily.co.uk>
Build-Depends: debhelper (>= 7.0.50~), javahelper, ant, ant-optional,
- default-jdk, javahelp2, libswing-layout-java (>= 1.0.3),
- libjna-java (>= 3.1.0), junit4 (>= 4.6), liboro-java (>= 2.0.8),
- liblog4j1.2-java (>= 1.2.9), libasm2-java (>= 2.2.1),
- libcobertura-java(>=1.9.3), w3c-dtd-xhtml, libequinox-osgi-java,
- libfelix-framework-java, libfelix-main-java, libbindex-java
-Standards-Version: 3.9.1
+ default-jdk, javahelp2, mingw32, libswing-layout-java (>= 1.0.3),
+ libjna-java (>= 3.2.7-2~), junit4 (>= 4.6), w3c-dtd-xhtml,
+ libequinox-osgi-java, libfelix-framework-java, libfelix-main-java,
+ libbindex-java, antlr3, libjemmy2-java, libstringtemplate-java,
+ maven-repo-helper
+Standards-Version: 3.9.2
Homepage: http://netbeans.org/
Vcs-Browser: http://git.debian.org/?p=pkg-java/libnb-platform-java.git
Vcs-Git: git://git.debian.org/git/pkg-java/libnb-platform-java.git
-Package: libnb-platform12-java
+Package: libnb-platform13-java
Architecture: all
-Depends: javahelp2,
- libswing-layout-java (>= 1.0.3), libjna-java (>= 3.1.0), junit4 (>= 4.6),
+Depends: ${misc:Depends}, ${java:Depends}, javahelp2,
+ libswing-layout-java (>= 1.0.3), libjna-java(>= 3.2.7-2~), junit4 (>= 4.6),
libequinox-osgi-java, libfelix-framework-java, libfelix-main-java,
- ${java:Depends}, ${misc:Depends}
-Suggests: libnb-platform12-java-doc
+ libnb-org-openide-util-java, libnb-org-openide-util-lookup-java,
+ libnb-org-openide-modules-java
+Suggests: libnb-platform13-java-doc
Description: NetBeans Platform for building rich desktop applications in Java
- NetBeans Platform is the framework for building rich desktop applications
- in Java. It is the core of the NetBeans IDE.
+ The NetBeans Platform is a framework for building rich desktop applications
+ in Java. It provides the code that is required to connect actions to menu
+ items, toolbar items, keyboard shortcuts and more. It is the core of the
+ NetBeans IDE.
+ .
+ This package provides the platform itself.
Package: libnb-platform-devel-java
Architecture: all
-Depends: javahelp2, libnb-platform12-java,
- liboro-java (>= 2.0.8), liblog4j1.2-java (>= 1.2.9), libasm2-java (>= 2.2.1),
- libcobertura-java (>=1.9.3), libbindex-java, ${java:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${java:Depends}, libnb-platform13-java,
+ javahelp2, libbindex-java, libjemmy2-java
Replaces: libnb-platform8-devel-java, libnb-platform7-devel-java
Conflicts: libnb-platform8-devel-java, libnb-platform7-devel-java
Description: Build harness for NetBeans Platform
- Harness with build scripts and ant tasks for everyone who builds
- an application on top of NetBeans Platform.
+ The NetBeans Platform is a framework for building rich desktop applications
+ in Java. It provides the code that is required to connect actions to menu
+ items, toolbar items, keyboard shortcuts and more. It is the core of the
+ NetBeans IDE.
+ .
+ This package contains the NetBeans Platform Harness containing the build
+ scripts and ant tasks required to build an application on top of NetBeans
+ Platform.
-Package: libnb-platform12-java-doc
+Package: libnb-platform13-java-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
Recommends: ${java:Recommends}
-Suggests: libnb-platform12-java
-Enhances: libnb-platform12-java
+Suggests: libnb-platform13-java
+Enhances: libnb-platform13-java
Description: NetBeans Platform javadoc
NetBeans Platform is a set of modules, each providing their own APIs
and working together or in a standalone mode. This package provides
one master javadoc to all of them.
+
+Package: libnb-org-openide-util-java
+Architecture: all
+Depends: ${misc:Depends}, ${java:Depends}, libnb-org-openide-util-lookup-java
+Replaces: libopenide-util-java
+Conflicts: libopenide-util-java
+Description: Utility classes from the NetBeans Platform
+ The NetBeans Platform is a set of modules, each providing their own
+ APIs and working together or in a standalone mode. This package provides
+ some utility functions used by the modules that make up the platform.
+
+Package: libnb-org-openide-util-lookup-java
+Architecture: all
+Depends: ${misc:Depends}, ${java:Depends}
+Description: Utility lookup classes from the NetBeans Platform
+ The NetBeans Platform is a set of modules, each providing their own
+ APIs and working together or in a standalone mode. This package provides
+ some utility functions for lookups and is used by the modules that make
+ up the platform.
+
+Package: libnb-org-openide-modules-java
+Architecture: all
+Depends: ${misc:Depends}, ${java:Depends}, libnb-org-openide-util-java,
+ libnb-org-openide-util-lookup-java
+Description: Utility classes for modules from the NetBeans Platform
+ The NetBeans Platform is a set of modules, each providing their own
+ APIs and working together or in a standalone mode. This package provides
+ some utility functions for managing NetBeans modules.
diff --git a/debian/libnb-org-openide-modules-java.manifest b/debian/libnb-org-openide-modules-java.manifest
new file mode 100644
index 0000000..64cad90
--- /dev/null
+++ b/debian/libnb-org-openide-modules-java.manifest
@@ -0,0 +1,2 @@
+usr/share/java/org-openide-modules.jar:
+ Class-Path: org-openide-util.jar org-openide-util-lookup.jar
diff --git a/debian/libnb-platform-devel-java.lintian-overrides b/debian/libnb-platform-devel-java.lintian-overrides
new file mode 100644
index 0000000..affa279
--- /dev/null
+++ b/debian/libnb-platform-devel-java.lintian-overrides
@@ -0,0 +1,12 @@
+# Netbeans builds lots of codeless jars on purpose, so don't warn us about them
+libnb-platform-devel-java: codeless-jar
+
+# Netbeans uses relative paths in its jar files. It would be too much work to
+# fix this so we instead put symlinks in the right place. This is useful when
+# you build a package to export too.
+libnb-platform-devel-java: classpath-contains-relative-path
+
+# This is a library package in the sense that it doesn't by itself provide an
+# application. But the jar files don't live in /usr/share/java since they are
+# specific to the NetBeans platform and need to live in a "cluster"
+libnb-platform-devel-java: javalib-but-no-public-jars
diff --git a/debian/libnb-platform12-java-doc.doc-base b/debian/libnb-platform12-java-doc.doc-base
deleted file mode 100644
index ca3cbd2..0000000
--- a/debian/libnb-platform12-java-doc.doc-base
+++ /dev/null
@@ -1,11 +0,0 @@
-Document: netbeans-platform12-api
-Title: NetBeans Platform API Javadoc
-Author: NetBeans
-Abstract: This document contains NetBeans Platform API Javadoc.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libnb-platform12-java-doc/api/index.html
-Files: /usr/share/doc/libnb-platform12-java-doc/api/*.html
-
-
diff --git a/debian/libnb-platform13-java-doc.doc-base b/debian/libnb-platform13-java-doc.doc-base
new file mode 100644
index 0000000..f100ce4
--- /dev/null
+++ b/debian/libnb-platform13-java-doc.doc-base
@@ -0,0 +1,11 @@
+Document: netbeans-platform13-api
+Title: NetBeans Platform API Javadoc
+Author: NetBeans
+Abstract: This document contains NetBeans Platform API Javadoc.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libnb-platform13-java-doc/api/index.html
+Files: /usr/share/doc/libnb-platform13-java-doc/api/*.html
+
+
diff --git a/debian/libnb-platform13-java.lintian-overrides b/debian/libnb-platform13-java.lintian-overrides
new file mode 100644
index 0000000..6699b0a
--- /dev/null
+++ b/debian/libnb-platform13-java.lintian-overrides
@@ -0,0 +1,12 @@
+# Netbeans builds lots of codeless jars on purpose, so don't warn us about them
+libnb-platform13-java: codeless-jar
+
+# Netbeans uses relative paths in its jar files. It would be too much work to
+# fix this so we instead put symlinks in the right place. This is useful when
+# you build a package to export too.
+libnb-platform13-java: classpath-contains-relative-path
+
+# This is a library package in the sense that it doesn't by itself provide an
+# application. But the jar files don't live in /usr/share/java since they are
+# specific to the NetBeans platform and need to live in a "cluster"
+libnb-platform13-java: javalib-but-no-public-jars
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..dd5176a
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,82 @@
+#!/bin/bash -e
+
+VERSION=$2
+FILE=$3
+
+# The file isn't the real file. And it's pretty much impossible to
+# figure out the actual download URL without using a browser with
+# javascript enabled. If we're asked for the current version then we
+# can go and download that, otherwise, unless we're given a zip file,
+# we'll tell the user they'll have to get it themselves.
+
+FILENAME=`basename $FILE`
+BASE=`basename $FILE .zip`
+DIR=`dirname $FILE`
+
+if [ "x$VERSION" = "x7.0" ] && [ "x$BASE.zip" != "x$FILENAME" ]
+then
+ # it's not a zip, but we know where to download this
+ echo "Downloading real release file..."
+ rm -f $FILE
+ wget -O "$DIR/libnb-platform-java_7.0.zip" "http://download.netbeans.org/netbeans/7.0/final/zip/netbeans-7.0-201104080000-platform-src.zip"
+ BASE="libnb-platform-java_7.0"
+ FILE="$DIR/$BASE.zip"
+elif [ "x$BASE.zip" != "x$FILENAME" ]
+then
+ # if not a zip file then we alert the user and quit
+ echo "This script can't download version $VERSION of netbeans automatically."
+ echo "Visit http://netbeans.org/downloads/ and retrieve the zip file, then "
+ echo "run orig-tar.sh --upstream-version $VERSION <path_to_zip_file>"
+ exit
+fi
+
+TAR=../libnb-platform-java_$VERSION+dfsg1.orig.tar.gz
+# Resolve symbolic links
+FILE=`readlink -f $FILE`
+
+mkdir $BASE
+
+unzip -d $BASE $FILE
+
+# Remove jar files - we'll use debian packaged jars from
+# /usr/share/java
+find $BASE/ -name "*.jar" -type f -execdir rm \{\} \;
+
+# Remove windows executables and libraries - we'll try and build those
+# which we need.
+find $BASE/ \( -name "*.exe" -o -name "*.dll" -o -name "*.res" \) -execdir rm \{\} \;
+
+# Remove Visual Studio files
+find $BASE/ \( -name "*.sln" -o -name "*.suo" -o -name "*.ncb" -o -name "*.idb" \) -execdir rm \{\} \;
+
+# Remove Mac specific files. We can't regenerate these.
+find $BASE/ \( -name "*.dylib" -o -name "*.dmg" -o -name "objects.nib" \) -execdir rm \{\} \;
+
+# Remove shared library (.so) files. Hopefully we don't need them
+find $BASE/ -name "*.so" -type f -execdir rm \{\} \;
+
+# remove unzipsfx binaries
+find $BASE/ -name "unzipsfx" -type f -execdir rm \{\} \;
+
+# Remove files containing serialized java objects (maybe we can
+# re-create these if we need)
+find $BASE/ -name "*.ser" -type f -execdir rm \{\} \;
+
+# Remove class files
+find $BASE/ -name "*.class" -type f -execdir rm \{\} \;
+
+# Remove some files where it's not clear how they were generated, and
+# which we (hopefully) don't need
+rm -f $BASE/jellytools.platform/test/qa-functional/data/SampleProject/src/sample1/unrecognized
+rm -f $BASE/jellytools.platform/test/qa-functional/data/SampleProject/src/sample1/url.url
+
+# Remove all the .nbm files. They are only used in unit testing, and
+# we'd ideally need to generate them as part of the build.
+find $BASE/ -name "*.class" -type f -execdir rm \{\} \;
+
+# Make our ".orig.tar.gz"
+tar -czf $TAR $BASE
+
+# Remove our unpack directory
+rm -rf $BASE
+
diff --git a/debian/patches/netbeans-platform-6.9~bootstrap.patch b/debian/patches/netbeans-platform-6.9~bootstrap.patch
deleted file mode 100644
index f439dd4..0000000
--- a/debian/patches/netbeans-platform-6.9~bootstrap.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/o.n.bootstrap/nbproject/project.properties
-+++ b/o.n.bootstrap/nbproject/project.properties
-@@ -45,8 +45,8 @@
- module.jar.dir=lib
- module.jar.basename=boot.jar
- release.launcher/unix/nbexec=lib/nbexec
--release.launcher/windows/nbexec.exe=lib/nbexec.exe
--release.launcher/windows/nbexec.dll=lib/nbexec.dll
-+# release.launcher/windows/nbexec.exe=lib/nbexec.exe
-+# release.launcher/windows/nbexec.dll=lib/nbexec.dll
- nbm.executable.files=lib/nbexec
-
- javadoc.arch=${basedir}/arch.xml
diff --git a/debian/patches/netbeans-platform-6.9~junit.patch b/debian/patches/netbeans-platform-6.9~junit.patch
deleted file mode 100644
index 530fc38..0000000
--- a/debian/patches/netbeans-platform-6.9~junit.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/libs.junit4/nbproject/project.xml
-+++ b/libs.junit4/nbproject/project.xml
-@@ -63,8 +63,12 @@
- <package>org.junit.runners</package>
- </public-packages>
- <class-path-extension>
-- <runtime-relative-path>ext/junit-4.5.jar</runtime-relative-path>
-- <binary-origin>external/junit-4.5.jar</binary-origin>
-+ <runtime-relative-path>ext/hamcrest-core.jar</runtime-relative-path>
-+ <binary-origin>external/hamcrest-core.jar</binary-origin>
-+ </class-path-extension>
-+ <class-path-extension>
-+ <runtime-relative-path>ext/junit-4.8.jar</runtime-relative-path>
-+ <binary-origin>external/junit-4.8.jar</binary-origin>
- </class-path-extension>
- </data>
- </configuration>
---- a/nbbuild/build.properties
-+++ b/nbbuild/build.properties
-@@ -79,7 +79,7 @@
- stop.when.clean.error=true
-
- test.unit.cp=\
-- ../libs.junit4/external/junit-4.5.jar:\
-+ ../libs.junit4/external/junit-4.8.jar:\
- netbeans/harness/modules/org-netbeans-modules-nbjunit.jar:\
- netbeans/harness/modules/org-netbeans-insane.jar:\
- ../o.apache.tools.ant.module/external/lib/ant-nodeps.jar:\
---- a/libs.junit4/nbproject/project.properties
-+++ b/libs.junit4/nbproject/project.properties
-@@ -41,8 +41,8 @@
- # made subject to such option by the copyright holder.
-
- is.autoload=true
--release.external/junit-4.5.jar=modules/ext/junit-4.5.jar
--
-+release.external/junit-4.8.jar=modules/ext/junit-4.8.jar
-+release.external/hamcrest-core.jar=modules/ext/hamcrest-core.jar
-
- sigtest.skip.check=true
-
diff --git a/debian/patches/netbeans-platform-6.9~launcher.patch b/debian/patches/netbeans-platform-6.9~launcher.patch
deleted file mode 100644
index 95b7587..0000000
--- a/debian/patches/netbeans-platform-6.9~launcher.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/o.n.bootstrap/launcher/unix/nbexec
-+++ b/o.n.bootstrap/launcher/unix/nbexec
-@@ -192,7 +192,7 @@
- fi
-
- # if heap dump on OOME is supported enable it
--if "${jdkhome}/bin/java" -XX:+HeapDumpOnOutOfMemoryError > /dev/null 2>&1 ; then
-+if "${jdkhome}/bin/java" -XX:+HeapDumpOnOutOfMemoryError &> /dev/null 2>&1 ; then
- jargs="$jargs -XX:+HeapDumpOnOutOfMemoryError"
- if echo $jargs | grep -v -- "-XX:HeapDumpPath=" > /dev/null ; then
- jargs="$jargs -XX:HeapDumpPath=\"${userdir}/var/log/heapdump.hprof\""
-@@ -532,7 +532,7 @@
- #
- delete_new_clusters_file
- rm -f "${restart_file}"
-- eval ${_NB_PROFILE_CMD} "\"${jdkhome}/bin/java\"" -Djdk.home="\"${jdkhome}\"" -classpath "\"$cp\"" \
-+ eval ${_NB_PROFILE_CMD} "\"${jdkhome}/bin/java\"" -Djdk.home="\"${jdkhome}\"" -Djava.library.path="/usr/lib/jni" -classpath "\"$cp\"" \
- "$jargs" org.netbeans.Main "$args" '<&0' '&'
- PID=$!
- trap "kill $PID" EXIT
diff --git a/debian/patches/netbeans-platform-6.9~nbi.patch b/debian/patches/netbeans-platform-6.9~nbi.patch
deleted file mode 100644
index 85e7c98..0000000
--- a/debian/patches/netbeans-platform-6.9~nbi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/nbbuild/cluster.properties
-+++ b/nbbuild/cluster.properties
-@@ -829,8 +829,6 @@
- apisupport.tc.cobertura,\
- jellytools.platform,\
- jemmy,\
-- libs.nbi.ant,\
-- libs.nbi.engine,\
- nbjunit,\
- o.n.insane
-
diff --git a/debian/patches/netbeans-platform-6.9~properties.patch b/debian/patches/netbeans-platform-6.9~properties.patch
deleted file mode 100644
index e517274..0000000
--- a/debian/patches/netbeans-platform-6.9~properties.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/o.jdesktop.layout/nbproject/project.properties
-+++ b/o.jdesktop.layout/nbproject/project.properties
-@@ -42,6 +42,6 @@
-
- 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
-+#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/debian/patches/netbeans-platform-6.9~suite-xml.patch b/debian/patches/netbeans-platform-6.9~suite-xml.patch
deleted file mode 100644
index 3b187f3..0000000
--- a/debian/patches/netbeans-platform-6.9~suite-xml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/apisupport.harness/release/suite.xml
-+++ b/apisupport.harness/release/suite.xml
-@@ -313,8 +313,6 @@
- <condition property="app.exe.prefix" value="" else="pre7_">
- <isset property="nbexec.dll.found"/>
- </condition>
-- <copy file="${harness.dir}/launchers/${app.exe.prefix}app.exe" tofile="${build.launcher.dir}/bin/${app.name}.exe" overwrite="true"/>
-- <copy file="${harness.dir}/launchers/${app.exe.prefix}app_w.exe" tofile="${build.launcher.dir}/bin/${app.name}_w.exe" failonerror="false" overwrite="true"/>
-
- <copy file="${harness.dir}/launchers/app.sh" tofile="${build.launcher.dir}/bin/${app.name}"/>
- <property name="app.conf" location="${harness.dir}/etc/app.conf"/>
diff --git a/debian/patches/netbeans-platform~include-extras.patch b/debian/patches/netbeans-platform~include-extras.patch
new file mode 100644
index 0000000..953012a
--- /dev/null
+++ b/debian/patches/netbeans-platform~include-extras.patch
@@ -0,0 +1,53 @@
+Include the extra modules libs.junit4 and libs.antlr3.devel.
+
+Index: libnb-platform-java-7.0+dfsg1/libs.junit4/nbproject/project.xml
+===================================================================
+--- libnb-platform-java-7.0+dfsg1.orig/libs.junit4/nbproject/project.xml 2011-06-13 21:39:34.377759015 +0100
++++ libnb-platform-java-7.0+dfsg1/libs.junit4/nbproject/project.xml 2011-06-13 21:40:18.366926695 +0100
+@@ -63,6 +63,10 @@
+ <package>org.junit.runners</package>
+ </public-packages>
+ <class-path-extension>
++ <runtime-relative-path>ext/hamcrest-core.jar</runtime-relative-path>
++ <binary-origin>external/hamcrest-core.jar</binary-origin>
++ </class-path-extension>
++ <class-path-extension>
+ <runtime-relative-path>ext/junit-4.8.2.jar</runtime-relative-path>
+ <binary-origin>external/junit-4.8.2.jar</binary-origin>
+ </class-path-extension>
+Index: libnb-platform-java-7.0+dfsg1/libs.junit4/nbproject/project.properties
+===================================================================
+--- libnb-platform-java-7.0+dfsg1.orig/libs.junit4/nbproject/project.properties 2011-06-13 21:39:34.357759030 +0100
++++ libnb-platform-java-7.0+dfsg1/libs.junit4/nbproject/project.properties 2011-06-13 21:40:18.366926695 +0100
+@@ -42,6 +42,7 @@
+
+ is.autoload=true
+ release.external/junit-4.8.2.jar=modules/ext/junit-4.8.2.jar
++release.external/hamcrest-core.jar=modules/ext/hamcrest-core.jar
+ nbm.target.cluster=platform
+ sigtest.skip.check=true
+
+Index: libnb-platform-java-7.0+dfsg1/nbbuild/cluster.properties
+===================================================================
+--- libnb-platform-java-7.0+dfsg1.orig/nbbuild/cluster.properties 2011-06-13 22:38:44.426926832 +0100
++++ libnb-platform-java-7.0+dfsg1/nbbuild/cluster.properties 2011-06-13 23:03:50.246926496 +0100
+@@ -167,9 +167,11 @@
+ javahelp,\
+ keyring,\
+ keyring.impl,\
++ libs.antlr3.devel,\
+ libs.felix,\
+ libs.jna,\
+ libs.jsr223,\
++ libs.junit4,\
+ libs.osgi,\
+ masterfs,\
+ o.jdesktop.layout,\
+@@ -1044,7 +1046,6 @@
+ kenai.maven,\
+ kenai.ui,\
+ libs.jira,\
+- libs.junit4,\
+ libs.svnjavahlwin32,\
+ loadgenerator,\
+ mobility.proguard,\
diff --git a/debian/patches/netbeans-platform~launcher.patch b/debian/patches/netbeans-platform~launcher.patch
new file mode 100644
index 0000000..b95d7ec
--- /dev/null
+++ b/debian/patches/netbeans-platform~launcher.patch
@@ -0,0 +1,24 @@
+Include the jni path /usr/lib/jni on the library search path.
+
+Index: libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/unix/nbexec
+===================================================================
+--- libnb-platform-java-7.0+dfsg1.orig/o.n.bootstrap/launcher/unix/nbexec 2011-04-08 00:33:00.000000000 +0100
++++ libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/unix/nbexec 2011-06-12 21:16:28.031368069 +0100
+@@ -180,7 +180,7 @@
+ fi
+
+ # if heap dump on OOME is supported enable it
+-if "${jdkhome}/bin/java" -XX:+HeapDumpOnOutOfMemoryError > /dev/null 2>&1 ; then
++if "${jdkhome}/bin/java" -XX:+HeapDumpOnOutOfMemoryError &> /dev/null 2>&1 ; then
+ jargs="$jargs -XX:+HeapDumpOnOutOfMemoryError"
+ if echo $jargs | grep -v -- "-XX:HeapDumpPath=" > /dev/null ; then
+ jargs="$jargs -XX:HeapDumpPath=\"${userdir}/var/log/heapdump.hprof\""
+@@ -541,7 +541,7 @@
+ #
+ delete_new_clusters_file
+ rm -f "${restart_file}"
+- eval ${_NB_PROFILE_CMD} "\"${jdkhome}/bin/java\"" -Djdk.home="\"${jdkhome}\"" -classpath "\"$cp\"" \
++ eval ${_NB_PROFILE_CMD} "\"${jdkhome}/bin/java\"" -Djdk.home="\"${jdkhome}\"" -Djava.library.path="/usr/lib/jni" -classpath "\"$cp\"" \
+ "$jargs" org.netbeans.Main "$args" '<&0' '&'
+ PID=$!
+ trap "kill $PID" EXIT
diff --git a/debian/patches/netbeans-platform~nbi.patch b/debian/patches/netbeans-platform~nbi.patch
new file mode 100644
index 0000000..b219563
--- /dev/null
+++ b/debian/patches/netbeans-platform~nbi.patch
@@ -0,0 +1,16 @@
+Don't build the Netbeans Installer modules.
+
+Index: libnb-platform-java-7.0+dfsg1/nbbuild/cluster.properties
+===================================================================
+--- libnb-platform-java-7.0+dfsg1.orig/nbbuild/cluster.properties 2011-06-14 23:47:49.198990461 +0100
++++ libnb-platform-java-7.0+dfsg1/nbbuild/cluster.properties 2011-06-14 23:47:49.999823035 +0100
+@@ -763,8 +763,6 @@
+ apisupport.harness,\
+ jellytools.platform,\
+ jemmy,\
+- libs.nbi.ant,\
+- libs.nbi.engine,\
+ nbjunit,\
+ o.n.insane
+
+
diff --git a/debian/patches/netbeans-platform~nodownloads.patch b/debian/patches/netbeans-platform~nodownloads.patch
new file mode 100644
index 0000000..74b12fe
--- /dev/null
+++ b/debian/patches/netbeans-platform~nodownloads.patch
@@ -0,0 +1,77 @@
+Don't try and download jar files from the netbeans website. We want to use those that are
+already packaged in Debian instead.
+
+Index: platform/o.jdesktop.layout/external/binaries-list
+===================================================================
+--- platform.orig/o.jdesktop.layout/external/binaries-list 2011-05-22 19:45:34.183504401 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,3 +0,0 @@
+-1C7FE319052EF49126CF07D0DB6953CB7007229E swing-layout-1.0.4-doc.zip
+-69D72835E165439CF7816EFDA65868FD4E0C6E2A swing-layout-1.0.4.jar
+-D2503D2217868ABAE1A5E7480A9CCA1DB3522464 swing-layout-1.0.4-src.zip
+Index: platform/libs.jna/external/binaries-list
+===================================================================
+--- platform.orig/libs.jna/external/binaries-list 2011-05-22 19:45:38.754338310 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1 +0,0 @@
+-4F25AA7292F70E721A9B96A6ED49365BA6E03EAB jna-3.2.7.jar
+Index: platform/apisupport.harness/external/binaries-list
+===================================================================
+--- platform.orig/apisupport.harness/external/binaries-list 2011-05-22 19:45:41.736004847 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,2 +0,0 @@
+-D4EF66C1CC8A5B3C97E0CC7C210227AAEC1F1086 jsearch-2.0_05.jar
+-A806D99716C5E9441BFD8B401176FDDEFC673022 bindex-2.2.jar
+Index: platform/javahelp/external/binaries-list
+===================================================================
+--- platform.orig/javahelp/external/binaries-list 2011-05-22 19:45:44.513504895 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1 +0,0 @@
+-CA70822C47A67FC3A11670270567C2D01566DAE1 jhall-2.0_05.jar
+Index: platform/libs.osgi/external/binaries-list
+===================================================================
+--- platform.orig/libs.osgi/external/binaries-list 2011-05-22 19:45:47.933510917 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,2 +0,0 @@
+-986195A7E31034EE73F7A896A36B24169692F142 osgi.core-4.2.jar
+-972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD osgi.cmpn-4.2.jar
+Index: platform/libs.felix/external/binaries-list
+===================================================================
+--- platform.orig/libs.felix/external/binaries-list 2011-05-22 19:45:51.025171080 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,2 +0,0 @@
+-08676C719D33D26DF4F3988E210A04D7F11183B7 felix-2.0.3.jar
+-BD5615C6A15497B60A0AAA9A04D4F05E2BC42D07 felix-main-2.0.2.jar
+Index: platform/libs.junit4/external/binaries-list
+===================================================================
+--- platform.orig/libs.junit4/external/binaries-list 2011-05-22 19:45:54.016006455 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1 +0,0 @@
+-C94F54227B08100974C36170DCB53329435FE5AD junit-4.8.2.jar
+\ No newline at end of file
+Index: platform/core.nativeaccess/external/binaries-list
+===================================================================
+--- platform.orig/core.nativeaccess/external/binaries-list 2011-05-22 19:45:56.875171251 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1 +0,0 @@
+-AF109BEA46056EF1D09172A96E968ADFA8CE74F1 platform-3.2.7.jar
+Index: platform/jemmy/external/binaries-list
+===================================================================
+--- platform.orig/jemmy/external/binaries-list 2011-05-22 19:46:00.094337657 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1 +0,0 @@
+-418FC62C8A6EF5311987B01FE389B1F88EFDDCA2 jemmy-2.3.0.0.jar
+Index: platform/nbbuild/external/binaries-list
+===================================================================
+--- platform.orig/nbbuild/external/binaries-list 2011-05-22 19:46:02.803504511 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,2 +0,0 @@
+-E160D64FA4680FD5C581A0F5AB516D88FB09AD47 apitest.jar
+-
+Index: platform/libs.antlr3.devel/external/binaries-list
+===================================================================
+--- platform.orig/libs.antlr3.devel/external/binaries-list 2011-05-22 19:46:05.415171258 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,2 +0,0 @@
+-1E18576780EB117E410E7A262453A99B01E55B02 antlr-3.1.3.jar
+-6FE2E3BB57DAEBD1555494818909F9664376DD6C stringtemplate-3.2.jar
diff --git a/debian/patches/netbeans-platform~nojnabinaries.patch b/debian/patches/netbeans-platform~nojnabinaries.patch
new file mode 100644
index 0000000..fd323d5
--- /dev/null
+++ b/debian/patches/netbeans-platform~nojnabinaries.patch
@@ -0,0 +1,21 @@
+We don't need to install any JNA binaries, since they're already installed.
+
+Index: platform/libs.jna/nbproject/project.properties
+===================================================================
+--- platform.orig/libs.jna/nbproject/project.properties 2011-05-22 19:51:45.514338125 +0100
++++ platform/libs.jna/nbproject/project.properties 2011-05-22 21:56:53.854338968 +0100
+@@ -41,9 +41,9 @@
+ # 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/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
+ jnlp.indirect.files=modules/lib/**/*jnidispatch*
diff --git a/debian/patches/netbeans-platform~properties.patch b/debian/patches/netbeans-platform~properties.patch
new file mode 100644
index 0000000..2b5fec1
--- /dev/null
+++ b/debian/patches/netbeans-platform~properties.patch
@@ -0,0 +1,14 @@
+We don't include the swing layout source zip.
+
+diff -Nur netbeans-platform-6.9/o.jdesktop.layout/nbproject/project.properties netbeans-platform-6.9.new/o.jdesktop.layout/nbproject/project.properties
+--- netbeans-platform-6.9/o.jdesktop.layout/nbproject/project.properties 2010-05-31 20:58:16.000000000 +0400
++++ netbeans-platform-6.9.new/o.jdesktop.layout/nbproject/project.properties 2010-06-10 09:34:11.689150157 +0400
+@@ -42,6 +42,6 @@
+
+ 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
++#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/debian/patches/netbeans-platform~windowslauncher.patch b/debian/patches/netbeans-platform~windowslauncher.patch
new file mode 100644
index 0000000..f667fb8
--- /dev/null
+++ b/debian/patches/netbeans-platform~windowslauncher.patch
@@ -0,0 +1,168 @@
+Use mingw32 to build the windows launchers. These are useful if the Netbeans platform is used to build
+another application on Debian which you want to be able to run on a Windows system.
+
+Index: libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/Makefile
+===================================================================
+--- libnb-platform-java-7.0+dfsg1.orig/o.n.bootstrap/launcher/windows/Makefile 2011-06-13 21:39:36.107758898 +0100
++++ libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/Makefile 2011-06-14 23:46:57.388989761 +0100
+@@ -34,7 +34,7 @@
+ MKDIR=mkdir
+ CP=cp
+ CCADMIN=CCadmin
+-RANLIB=ranlib
++RANLIB=i586-mingw32msvc-ranlib
+
+ # build
+ build: .build-post
+@@ -48,8 +48,8 @@
+ cp nbexec.dll ../../../nbbuild/netbeans/platform/lib/
+
+ nbexec.exe: nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc
+- windres.exe -Ocoff nbexec_exe.rc nbexec_exe.res
+- g++ -s -mno-cygwin nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
++ i586-mingw32msvc-windres -Ocoff nbexec_exe.rc nbexec_exe.res
++ i586-mingw32msvc-g++ -s -mno-cygwin nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
+
+ # clean
+ clean: .clean-post
+Index: libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
+===================================================================
+--- libnb-platform-java-7.0+dfsg1.orig/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk 2011-06-13 21:39:36.137760501 +0100
++++ libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk 2011-06-14 23:47:19.998990498 +0100
+@@ -11,12 +11,12 @@
+ MKDIR=mkdir
+ CP=cp
+ CCADMIN=CCadmin
+-RANLIB=ranlib
+-CC=gcc
+-CCC=g++
+-CXX=g++
++RANLIB=i586-mingw32msvc-ranlib
++CC=i586-mingw32msvc-gcc
++CCC=i586-mingw32msvc-g++
++CXX=i586-mingw32msvc-g++
+ FC=
+-AS=as
++AS=i586-mingw32msvc-as
+
+ # Macros
+ CND_PLATFORM=Cygwin-Windows
+@@ -65,22 +65,22 @@
+ ${OBJECTDIR}/platformlauncher.o: nbproject/Makefile-${CND_CONF}.mk platformlauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} $@.d
+- $(COMPILE.cc) -O2 -Wall -s -I/cygdrive/c/cygwin/usr/include/mingw -I/cygdrive/D/Program\ Files/Java/jdk1.6.0_22/include/win32 -I/cygdrive/D/Program\ Files/Java/jdk1.6.0_22/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
++ $(COMPILE.cc) -O2 -Wall -s -I/usr/lib/jvm/default-java/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
+
+ ${OBJECTDIR}/nbexec.o: nbproject/Makefile-${CND_CONF}.mk nbexec.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} $@.d
+- $(COMPILE.cc) -O2 -Wall -s -I/cygdrive/c/cygwin/usr/include/mingw -I/cygdrive/D/Program\ Files/Java/jdk1.6.0_22/include/win32 -I/cygdrive/D/Program\ Files/Java/jdk1.6.0_22/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexec.o nbexec.cpp
++ $(COMPILE.cc) -O2 -Wall -s -I/usr/lib/jvm/default-java/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexec.o nbexec.cpp
+
+ ${OBJECTDIR}/nbexec.res: nbproject/Makefile-${CND_CONF}.mk nbexec.rc version.h
+ ${MKDIR} -p ${OBJECTDIR}
+ @echo Compiling Resource files...
+- windres.exe -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res
++ i586-mingw32msvc-windres -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res
+
+ ${OBJECTDIR}/nbexecexe.o: nbproject/Makefile-${CND_CONF}.mk nbexecexe.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} $@.d
+- $(COMPILE.cc) -O2 -Wall -s -I/cygdrive/c/cygwin/usr/include/mingw -I/cygdrive/D/Program\ Files/Java/jdk1.6.0_22/include/win32 -I/cygdrive/D/Program\ Files/Java/jdk1.6.0_22/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
++ $(COMPILE.cc) -O2 -Wall -s -I/usr/lib/jvm/default-java/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
+
+ : nbproject/Makefile-${CND_CONF}.mk nbexec_exe.rc
+ @echo
+@@ -89,12 +89,12 @@
+ ${OBJECTDIR}/jvmlauncher.o: nbproject/Makefile-${CND_CONF}.mk jvmlauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} $@.d
+- $(COMPILE.cc) -O2 -Wall -s -I/cygdrive/c/cygwin/usr/include/mingw -I/cygdrive/D/Program\ Files/Java/jdk1.6.0_22/include/win32 -I/cygdrive/D/Program\ Files/Java/jdk1.6.0_22/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
++ $(COMPILE.cc) -O2 -Wall -s -I/usr/lib/jvm/default-java/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
+
+ ${OBJECTDIR}/utilsfuncs.o: nbproject/Makefile-${CND_CONF}.mk utilsfuncs.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} $@.d
+- $(COMPILE.cc) -O2 -Wall -s -I/cygdrive/c/cygwin/usr/include/mingw -I/cygdrive/D/Program\ Files/Java/jdk1.6.0_22/include/win32 -I/cygdrive/D/Program\ Files/Java/jdk1.6.0_22/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
++ $(COMPILE.cc) -O2 -Wall -s -I/usr/lib/jvm/default-java/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
+
+ # Subprojects
+ .build-subprojects:
+Index: libnb-platform-java-7.0+dfsg1/apisupport.harness/windows-launcher-src/Makefile
+===================================================================
+--- libnb-platform-java-7.0+dfsg1.orig/apisupport.harness/windows-launcher-src/Makefile 2011-06-14 23:46:57.338990509 +0100
++++ libnb-platform-java-7.0+dfsg1/apisupport.harness/windows-launcher-src/Makefile 2011-06-14 23:56:49.309005828 +0100
+@@ -34,7 +34,7 @@
+ MKDIR=mkdir
+ CP=cp
+ CCADMIN=CCadmin
+-RANLIB=ranlib
++RANLIB=i586-mingw32msvc-ranlib
+
+
+ # build
+@@ -47,10 +47,11 @@
+ # Add your post 'build' code here...
+
+ app.res : app.rc
+- windres -o$@ -Ocoff app.rc
++ i586-mingw32msvc-windres -o$@ -Ocoff app.rc
+
+ # clean
+ clean: .clean-post
++ rm -f app.res
+
+ .clean-pre:
+ # Add your pre 'clean' code here...
+Index: libnb-platform-java-7.0+dfsg1/apisupport.harness/windows-launcher-src/nbproject/Makefile-Release.mk
+===================================================================
+--- libnb-platform-java-7.0+dfsg1.orig/apisupport.harness/windows-launcher-src/nbproject/Makefile-Release.mk 2011-06-14 23:46:57.358990425 +0100
++++ libnb-platform-java-7.0+dfsg1/apisupport.harness/windows-launcher-src/nbproject/Makefile-Release.mk 2011-06-14 23:47:19.998990498 +0100
+@@ -11,10 +11,10 @@
+ MKDIR=mkdir
+ CP=cp
+ CCADMIN=CCadmin
+-RANLIB=ranlib
+-CC=gcc.exe
+-CCC=g++.exe
+-CXX=g++.exe
++RANLIB=i586-mingw32msvc-ranlib
++CC=i586-mingw32msvc-gcc
++CCC=i586-mingw32msvc-g++
++CXX=i586-mingw32msvc-g++
+ FC=
+ AS=
+
+@@ -84,7 +84,7 @@
+ # Clean Targets
+ .clean-conf:
+ ${RM} -r build/Release
+- ${RM} ../release/launchers/app.exe.exe
++ ${RM} ../release/launchers/app.exe
+
+ # Subprojects
+ .clean-subprojects:
+Index: libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/jvmlauncher.h
+===================================================================
+--- libnb-platform-java-7.0+dfsg1.orig/o.n.bootstrap/launcher/windows/jvmlauncher.h 2011-06-14 23:46:57.428989809 +0100
++++ libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/jvmlauncher.h 2011-06-15 18:56:36.509511571 +0100
+@@ -50,6 +50,18 @@
+ #include <windows.h>
+ #include <string>
+ #include <list>
++
++// Use the definitions below rather than the linux jdk ones
++#define _JAVASOFT_JNI_MD_H_
++// imports, exports, and calling conventions need to match those used in a dll
++#define JNIEXPORT __declspec(dllexport)
++#define JNIIMPORT __declspec(dllimport)
++#define JNICALL __stdcall
++// Correct types for the windows platform
++typedef long jint;
++typedef __int64 jlong;
++typedef signed char jbyte;
++
+ #include "jni.h"
+ #include "utilsfuncs.h"
+
diff --git a/debian/patches/series b/debian/patches/series
index 3b760b3..2a49a93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
-netbeans-platform-6.9~bootstrap.patch
-netbeans-platform-6.9~junit.patch
-netbeans-platform-6.9~launcher.patch
-netbeans-platform-6.9~nbi.patch
-netbeans-platform-6.9~properties.patch
-netbeans-platform-6.9~suite-xml.patch
+netbeans-platform~launcher.patch
+netbeans-platform~nodownloads.patch
+netbeans-platform~nojnabinaries.patch
+netbeans-platform~windowslauncher.patch
+netbeans-platform~include-extras.patch
+netbeans-platform~nbi.patch
+netbeans-platform~properties.patch
diff --git a/debian/pom/openide-modules.xml b/debian/pom/openide-modules.xml
new file mode 100644
index 0000000..40c598d
--- /dev/null
+++ b/debian/pom/openide-modules.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-modules</artifactId>
+ <version>7.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-util</artifactId>
+ <version>7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-util-lookup</artifactId>
+ <version>7.0</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/pom/openide-util-lookup.xml b/debian/pom/openide-util-lookup.xml
new file mode 100644
index 0000000..2c5db14
--- /dev/null
+++ b/debian/pom/openide-util-lookup.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-util-lookup</artifactId>
+ <version>7.0</version>
+</project>
diff --git a/debian/pom/openide-util.xml b/debian/pom/openide-util.xml
new file mode 100644
index 0000000..ab842c2
--- /dev/null
+++ b/debian/pom/openide-util.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-util</artifactId>
+ <version>7.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-util-lookup</artifactId>
+ <version>7.0</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/rules b/debian/rules
index 3e7993f..791e109 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
export JAVA_HOME=/usr/lib/jvm/default-java
#package names
-pkg-base := platform12
+pkg-base := platform13
pkg-lib-base := libnb-$(pkg-base)
libnb-platform-java := $(pkg-lib-base)-java
libnb-platform-java-doc := $(pkg-lib-base)-java-doc
@@ -11,49 +11,47 @@ libnb-platform-devel-java := libnb-platform-devel-java
JAVADIR := /usr/share/java
-JHALL_JAR := jhall.jar
-JH_JAR := jh.jar
-JSEARCH_JAR := jsearch.jar
-JNA_JAR := jna.jar
-SWINGL_JAR := swing-layout.jar
-JUNIT_JAR := junit4.jar
-HAMCREST_JAR := hamcrest-core.jar
-ORO_JAR := oro.jar
-ASM_JAR := asm2.jar
-ASM_TREE_JAR := asm2-tree.jar
-LOG4J_JAR := log4j-1.2.jar
-COBERTURA_JAR := cobertura.jar
-
-BINDEX_JAR := bindex.jar
-FELIX_FRW_JAR := org.apache.felix.framework.jar
-FELIX_MAIN_JAR := org.apache.felix.main.jar
-OSGI_CORE_JAR := org.eclipse.osgi.jar
-OSGI_CMPN_JAR := org.eclipse.osgi.services.jar
-
-NB_SWINGL_JAR := swing-layout-1.0.4.jar
-NB_JSEARCH_JAR := jsearch-2.0_05.jar
-NB_JH_JAR := jh-2.0_05.jar
-NB_JNA_JAR := jna-3.0.9.jar
-NB_JSR223_JAR := jsr223-api.jar
-NB_JUNIT_JAR := junit-4.8.jar
-NB_HAMCREST_JAR := hamcrest-core.jar
-NB_ORO_JAR := jakarta-oro-2.0.8.jar
-NB_ASM_JAR := asm-3.0.jar
-NB_ASM_TREE_JAR := asm-tree-3.0.jar
-NB_LOG4J_JAR := log4j-1.2.9.jar
-NB_COBERTURA_JAR:= cobertura-1.9.3.jar
-
-NB_BINDEX_JAR := bindex-2.2.jar
+SWINGL_JAR := swing-layout.jar
+JH_JAR := jhall.jar
+JNA_JAR := jna.jar
+JNA_PF_JAR := jna-platform.jar
+FELIX_FRW_JAR := org.apache.felix.framework.jar
+FELIX_MAIN_JAR := org.apache.felix.main.jar
+OSGI_CORE_JAR := org.eclipse.osgi.jar
+OSGI_CMPN_JAR := org.eclipse.osgi.services.jar
+JSEARCH_JAR := jsearch.jar
+BINDEX_JAR := bindex.jar
+JEMMY_JAR := jemmy2.jar
+ANTLR_JAR := antlr3.jar
+STRTEMPL_JAR := stringtemplate.jar
+JUNIT_JAR := junit4.jar
+HAMCREST_JAR := hamcrest-core.jar
+
+NB_SWINGL_JAR := swing-layout-1.0.4.jar
+NB_JH_JAR := jhall-2.0_05.jar
+NB_JNA_JAR := jna-3.2.7.jar
+NB_JNA_PF_JAR := platform-3.2.7.jar
NB_FELIX_FRW_JAR:= felix-2.0.3.jar
NB_FELIX_MAIN_JAR:= felix-main-2.0.2.jar
NB_OSGI_CORE_JAR:= osgi.core-4.2.jar
NB_OSGI_CMPN_JAR:= osgi.cmpn-4.2.jar
+NB_JSEARCH_JAR := jsearch-2.0_05.jar
+NB_BINDEX_JAR := bindex-2.2.jar
+NB_JEMMY_JAR := jemmy-2.3.0.0.jar
+NB_ANTLR_JAR := antlr-3.1.3.jar
+NB_STRTEMPL_JAR := stringtemplate-3.2.jar
+NB_JUNIT_JAR := junit-4.8.2.jar
+NB_HAMCREST_JAR := hamcrest-core.jar
JAVADOC_INSTALL_DIR := usr/share/doc/$(libnb-platform-java-doc)/api
NB_INSTALL_DIR := usr/share/netbeans
-JAVADOC_WEBSITE := http://bits.netbeans.org/6.9/javadoc
+EXT_JAR_LINK_DIR := $(NB_INSTALL_DIR)/$(pkg-base)/modules/ext/
+LIB_DIR := $(NB_INSTALL_DIR)/$(pkg-base)/lib/
+
+
+JAVADOC_WEBSITE := http://bits.netbeans.org/7.0/javadoc
INSTALL := dh_install -p
LINK := dh_link -p
@@ -68,32 +66,25 @@ endef
dh $@ --with javahelper
override_dh_auto_build:
- # generate empty javax.script file, so there is something in jsr223 API module
- 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
- jar cf libs.jsr223/external/$(NB_JSR223_JAR) libs.jsr223/src/javax/script/empty.java
mkdir -p nbbuild/external/xhtml1-dtds
ln -sf /usr/share/xml/xhtml/schema/dtd/1.0/xhtml* nbbuild/external/xhtml1-dtds
ln -sf /usr/share/xml/entities/xhtml/xhtml* nbbuild/external/xhtml1-dtds
$(call symlink, $(JAVADIR)/$(SWINGL_JAR), o.jdesktop.layout/external/$(NB_SWINGL_JAR))
- $(call symlink, $(JAVADIR)/$(JHALL_JAR), javahelp/external/$(NB_JH_JAR))
+ $(call symlink, $(JAVADIR)/$(JH_JAR), javahelp/external/$(NB_JH_JAR))
$(call symlink, $(JAVADIR)/$(JNA_JAR), libs.jna/external/$(NB_JNA_JAR))
- $(call symlink, $(JAVADIR)/$(JUNIT_JAR), libs.junit4/external/$(NB_JUNIT_JAR))
- $(call symlink, $(JAVADIR)/$(HAMCREST_JAR), libs.junit4/external/$(NB_HAMCREST_JAR))
+ $(call symlink, $(JAVADIR)/$(JNA_PF_JAR), core.nativeaccess/external/$(NB_JNA_PF_JAR))
$(call symlink, $(JAVADIR)/$(FELIX_FRW_JAR), libs.felix/external/$(NB_FELIX_FRW_JAR))
$(call symlink, $(JAVADIR)/$(FELIX_MAIN_JAR), libs.felix/external/$(NB_FELIX_MAIN_JAR))
# $(call symlink, $(JAVADIR)/$(OSGI_CORE_JAR), libs.osgi/external/$(NB_OSGI_CORE_JAR))
$(call symlink, $(JAVADIR)/$(OSGI_CMPN_JAR), libs.osgi/external/$(NB_OSGI_CMPN_JAR))
-
- $(call symlink, $(JAVADIR)/$(JHALL_JAR), apisupport.harness/external/$(NB_JSEARCH_JAR))
+ $(call symlink, $(JAVADIR)/$(JSEARCH_JAR), apisupport.harness/external/$(NB_JSEARCH_JAR))
$(call symlink, $(JAVADIR)/$(BINDEX_JAR), apisupport.harness/external/$(NB_BINDEX_JAR))
- $(call symlink, $(JAVADIR)/$(ASM_JAR), apisupport.tc.cobertura/external/$(NB_ASM_JAR))
- $(call symlink, $(JAVADIR)/$(ASM_TREE_JAR), apisupport.tc.cobertura/external/$(NB_ASM_TREE_JAR))
- $(call symlink, $(JAVADIR)/$(ORO_JAR), apisupport.tc.cobertura/external/$(NB_ORO_JAR))
- $(call symlink, $(JAVADIR)/$(LOG4J_JAR), apisupport.tc.cobertura/external/$(NB_LOG4J_JAR))
- $(call symlink, $(JAVADIR)/$(COBERTURA_JAR), apisupport.tc.cobertura/external/$(NB_COBERTURA_JAR))
-
+ $(call symlink, $(JAVADIR)/$(JEMMY_JAR), jemmy/external/$(NB_JEMMY_JAR))
+ $(call symlink, $(JAVADIR)/$(ANTLR_JAR), libs.antlr3.devel/external/$(NB_ANTLR_JAR))
+ $(call symlink, $(JAVADIR)/$(STRTEMPL_JAR), libs.antlr3.devel/external/$(NB_STRTEMPL_JAR))
+ $(call symlink, $(JAVADIR)/$(JUNIT_JAR), libs.junit4/external/$(NB_JUNIT_JAR))
+ $(call symlink, $(JAVADIR)/$(HAMCREST_JAR), libs.junit4/external/$(NB_HAMCREST_JAR))
+ #
######## Remove services and org/eclipse/* from equinox osgi.jar#####################
mkdir debian/jar_tmp; cd debian/jar_tmp; \
jar -xf $(JAVADIR)/$(OSGI_CORE_JAR); \
@@ -101,17 +92,18 @@ override_dh_auto_build:
jar -cf ../../libs.osgi/external/$(NB_OSGI_CORE_JAR) ./*;
rm -rf debian/jar_tmp
################################################################
-
- # Build main package
- ant \
+ # Build the Windows launcher
+ cd o.n.bootstrap/launcher/windows && make .build-impl nbexec.exe
+ cd apisupport.harness/windows-launcher-src && make
+ ################################################################
+ # Build main package. DISPLAY must be unset or tests will fail
+ unset DISPLAY; ant \
-Dpermit.jdk6.builds=true \
-Dbuild.compiler.deprecation=false \
-Dbuild.compiler.debug=false \
-Dverify.checkout=false \
-f nbbuild/build.xml build-platform
-
- cd l10n && ant -v -f build.xml -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" build
-
+ ################################################################
# Build javadoc package
ant \
-Dbuild.compiler.deprecation=false \
@@ -120,35 +112,51 @@ override_dh_auto_build:
-Dallmodules= \
-Dcluster.config=platform \
-Dconfig.javadoc.cluster=$(pkg-base) \
- -Dconfig.javadoc.netbeans=\
-openide.util,openide.actions,openide.options,openide.awt,\
-openide.dialogs,openide.nodes,openide.explorer,openide.filesystems,openide.modules,\
-openide.text,openide.windows,openide.loaders,openide.io,queries,\
-o.n.api.progress,settings,javahelp,openide.execution,\
-sendopts,options.api,editor.mimelookup \
-Djavadoc.docs.org-netbeans-api-java=$(JAVADOC_WEBSITE)/org-netbeans-api-java/ \
-Djavadoc.docs.org-netbeans-modules-project-ant=$(JAVADOC_WEBSITE)/org-netbeans-modules-project-ant/ \
-Djavadoc.docs.org-netbeans-modules-projectapi=$(JAVADOC_WEBSITE)/org-netbeans-modules-projectapi/ \
-f nbbuild/build.xml build-javadoc
-
+# -Dconfig.javadoc.netbeans=\
+#openide.util,openide.actions,openide.options,openide.awt,\
+#openide.dialogs,openide.nodes,openide.explorer,openide.filesystems,openide.modules,\
+#openide.text,openide.windows,openide.loaders,openide.io,queries,\
+#o.n.api.progress,settings,javahelp,openide.execution,\
+#sendopts,options.api,editor.mimelookup \
+
override_dh_auto_install:
+ # Install libraries
+ mh_installjar -plibnb-org-openide-util-java -l debian/pom/openide-util.xml \
+ nbbuild/netbeans/platform/lib/org-openide-util.jar
+ mh_installpom -plibnb-org-openide-util-java debian/pom/openide-util.xml
+ mh_installjar -plibnb-org-openide-util-lookup-java -l debian/pom/openide-util-lookup.xml \
+ nbbuild/netbeans/platform/lib/org-openide-util-lookup.jar
+ mh_installpom -plibnb-org-openide-util-lookup-java debian/pom/openide-util-lookup.xml
+ mh_installjar -plibnb-org-openide-modules-java -l debian/pom/openide-modules.xml \
+ nbbuild/netbeans/platform/lib/org-openide-modules.jar
+ mh_installpom -plibnb-org-openide-modules-java debian/pom/openide-modules.xml
+ #
+ # Install main package
echo > nbbuild/netbeans/platform/.noautoupdate
echo > nbbuild/netbeans/platform/.lastModified
-
- # Install main package
$(INSTALL)$(libnb-platform-java) nbbuild/netbeans/platform/* $(NB_INSTALL_DIR)/$(pkg-base)
$(INSTALL)$(libnb-platform-java) nbbuild/netbeans/platform/.noautoupdate $(NB_INSTALL_DIR)/$(pkg-base)
$(INSTALL)$(libnb-platform-java) nbbuild/netbeans/platform/.lastModified $(NB_INSTALL_DIR)/$(pkg-base)
- $(LINK)$(libnb-platform-java) $(JAVADIR)/$(SWINGL_JAR) $(NB_INSTALL_DIR)/$(pkg-base)/modules/ext/$(NB_SWINGL_JAR)
- $(LINK)$(libnb-platform-java) $(JAVADIR)/$(JH_JAR) $(NB_INSTALL_DIR)/$(pkg-base)/modules/ext/$(NB_JH_JAR)
- $(LINK)$(libnb-platform-java) $(JAVADIR)/$(JNA_JAR) $(NB_INSTALL_DIR)/$(pkg-base)/modules/ext/$(NB_JNA_JAR)
- $(LINK)$(libnb-platform-java) $(JAVADIR)/$(JUNIT_JAR) $(NB_INSTALL_DIR)/$(pkg-base)/modules/ext/$(NB_JUNIT_JAR)
- $(LINK)$(libnb-platform-java) $(JAVADIR)/$(HAMCREST_JAR) $(NB_INSTALL_DIR)/$(pkg-base)/modules/ext/$(NB_HAMCREST_JAR)
- $(LINK)$(libnb-platform-java) $(JAVADIR)/$(FELIX_FRW_JAR) $(NB_INSTALL_DIR)/$(pkg-base)/modules/ext/$(NB_FELIX_FRW_JAR)
- $(LINK)$(libnb-platform-java) $(JAVADIR)/$(FELIX_MAIN_JAR) $(NB_INSTALL_DIR)/$(pkg-base)/modules/ext/$(NB_FELIX_MAIN_JAR)
-# $(LINK)$(libnb-platform-java) $(JAVADIR)/$(OSGI_CORE_JAR) $(NB_INSTALL_DIR)/$(pkg-base)/modules/ext/$(NB_OSGI_CORE_JAR)
- $(LINK)$(libnb-platform-java) $(JAVADIR)/$(OSGI_CMPN_JAR) $(NB_INSTALL_DIR)/$(pkg-base)/modules/ext/$(NB_OSGI_CMPN_JAR)
-
+ $(LINK)$(libnb-platform-java) $(JAVADIR)/$(SWINGL_JAR) $(EXT_JAR_LINK_DIR)/$(NB_SWINGL_JAR)
+ $(LINK)$(libnb-platform-java) $(JAVADIR)/$(JH_JAR) $(EXT_JAR_LINK_DIR)/$(NB_JH_JAR)
+ $(LINK)$(libnb-platform-java) $(JAVADIR)/$(JNA_JAR) $(EXT_JAR_LINK_DIR)/$(NB_JNA_JAR)
+ $(LINK)$(libnb-platform-java) $(JAVADIR)/$(JNA_PF_JAR) $(EXT_JAR_LINK_DIR)/$(NB_JNA_PF_JAR)
+ $(LINK)$(libnb-platform-java) $(JAVADIR)/$(FELIX_FRW_JAR) $(EXT_JAR_LINK_DIR)/$(NB_FELIX_FRW_JAR)
+ $(LINK)$(libnb-platform-java) $(JAVADIR)/$(FELIX_MAIN_JAR) $(EXT_JAR_LINK_DIR)/$(NB_FELIX_MAIN_JAR)
+# $(LINK)$(libnb-platform-java) $(JAVADIR)/$(OSGI_CORE_JAR) $(EXT_JAR_LINK_DIR)/$(NB_OSGI_CORE_JAR)
+ $(LINK)$(libnb-platform-java) $(JAVADIR)/$(OSGI_CMPN_JAR) $(EXT_JAR_LINK_DIR)/$(NB_OSGI_CMPN_JAR)
+ $(LINK)$(libnb-platform-java) $(JAVADIR)/$(ANTLR_JAR) $(EXT_JAR_LINK_DIR)/$(NB_ANTLR_JAR)
+ $(LINK)$(libnb-platform-java) $(JAVADIR)/$(STRTEMPL_JAR) $(EXT_JAR_LINK_DIR)/$(NB_STRTEMPL_JAR)
+ $(LINK)$(libnb-platform-java) $(JAVADIR)/$(JUNIT_JAR) $(EXT_JAR_LINK_DIR)/$(NB_JUNIT_JAR)
+ $(LINK)$(libnb-platform-java) $(JAVADIR)/$(HAMCREST_JAR) $(EXT_JAR_LINK_DIR)/$(NB_HAMCREST_JAR)
+ $(LINK)$(libnb-platform-java) $(JAVADIR)/org-openide-util.jar $(LIB_DIR)/org-openide-util.jar
+ $(LINK)$(libnb-platform-java) $(JAVADIR)/org-openide-util-lookup.jar $(LIB_DIR)/org-openide-util-lookup.jar
+ $(LINK)$(libnb-platform-java) $(JAVADIR)/org-openide-modules.jar $(LIB_DIR)/org-openide-modules.jar
+ #
# Install devel package
rm -f nbbuild/netbeans/harness/antlib/$(NB_JSEARCH_JAR)
echo > nbbuild/netbeans/harness/.noautoupdate
@@ -158,53 +166,50 @@ override_dh_auto_install:
$(INSTALL)$(libnb-platform-devel-java) nbbuild/netbeans/harness/.lastModified $(NB_INSTALL_DIR)/harness
$(LINK)$(libnb-platform-devel-java) $(JAVADIR)/$(JSEARCH_JAR) $(NB_INSTALL_DIR)/harness/antlib/$(NB_JSEARCH_JAR)
$(LINK)$(libnb-platform-devel-java) $(JAVADIR)/$(BINDEX_JAR) $(NB_INSTALL_DIR)/harness/antlib/$(NB_BINDEX_JAR)
- $(LINK)$(libnb-platform-devel-java) $(JAVADIR)/$(ASM_JAR) $(NB_INSTALL_DIR)/harness/testcoverage/cobertura/lib/$(NB_ASM_JAR)
- $(LINK)$(libnb-platform-devel-java) $(JAVADIR)/$(ASM_TREE_JAR) $(NB_INSTALL_DIR)/harness/testcoverage/cobertura/lib/$(NB_ASM_TREE_JAR)
- $(LINK)$(libnb-platform-devel-java) $(JAVADIR)/$(ORO_JAR) $(NB_INSTALL_DIR)/harness/testcoverage/cobertura/lib/$(NB_ORO_JAR)
- $(LINK)$(libnb-platform-devel-java) $(JAVADIR)/$(LOG4J_JAR) $(NB_INSTALL_DIR)/harness/testcoverage/cobertura/lib/$(NB_LOG4J_JAR)
- $(LINK)$(libnb-platform-devel-java) $(JAVADIR)/$(COBERTURA_JAR) $(NB_INSTALL_DIR)/harness/testcoverage/cobertura/$(NB_COBERTURA_JAR)
-
+ $(LINK)$(libnb-platform-devel-java) $(JAVADIR)/$(JEMMY_JAR) $(NB_INSTALL_DIR)/harness/modules/ext/$(NB_JEMMY_JAR)
+ #
#Fixing permissions
chmod 0755 debian/$(libnb-platform-devel-java)/$(NB_INSTALL_DIR)/harness/launchers/app.sh
-
+ #
# Install javadoc package
# copy core platform files
rm -f nbbuild/build/javadoc/*.zip
$(INSTALL)$(libnb-platform-java-doc) nbbuild/build/javadoc/* $(JAVADOC_INSTALL_DIR)
-
+
override_dh_auto_clean:
-rm -f *.cdbs-config_list
-rm -f stamp-build-$(libnb-platform-java)
-rm -f stamp-build-$(libnb-platform-devel-java)
-rm -f stamp-build-$(libnb-platform-java-doc)
- $(call symlink, $(JAVADIR)/$(JHALL_JAR), javahelp/external/$(NB_JH_JAR))
- $(call symlink, $(JAVADIR)/$(JHALL_JAR), apisupport.harness/external/$(NB_JSEARCH_JAR))
-# cd l10n && ant -v -f build.xml -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" clean
+ $(call symlink, $(JAVADIR)/$(JH_JAR), javahelp/external/$(NB_JH_JAR))
+ $(call symlink, $(JAVADIR)/$(JSEARCH_JAR), apisupport.harness/external/$(NB_JSEARCH_JAR))
ant -Dpermit.jdk6.builds=true -f nbbuild/build.xml clean
- -rm -f apisupport.harness/external/$(NB_JSEARCH_JAR)
- -rm -f apisupport.harness/external/$(NB_BINDEX_JAR)
- -rm -f apisupport.tc.cobertura/external/$(NB_ASM_JAR)
- -rm -f apisupport.tc.cobertura/external/$(NB_ASM_TREE_JAR)
- -rm -f apisupport.tc.cobertura/external/$(NB_ORO_JAR)
- -rm -f apisupport.tc.cobertura/external/$(NB_LOG4J_JAR)
- -rm -f apisupport.tc.cobertura/external/$(NB_COBERTURA_JAR)
- -rm -f javahelp/external/$(NB_JH_JAR)
+ cd o.n.bootstrap/launcher/windows && make clean
+ cd apisupport.harness/windows-launcher-src && make clean
+ mh_clean
-rm -f o.jdesktop.layout/external/$(NB_SWINGL_JAR)
+ -rm -f javahelp/external/$(NB_JH_JAR)
-rm -f libs.jna/external/$(NB_JNA_JAR)
- -rm -f libs.junit4/external/$(NB_JUNIT_JAR)
- -rm -f libs.junit4/external/$(NB_HAMCREST_JAR)
+ -rm -f core.nativeaccess/external/$(NB_JNA_PF_JAR)
-rm -f libs.felix/external/$(NB_FELIX_FRW_JAR)
-rm -f libs.felix/external/$(NB_FELIX_MAIN_JAR)
-rm -f libs.osgi/external/$(NB_OSGI_CORE_JAR)
-rm -f libs.osgi/external/$(NB_OSGI_CMPN_JAR)
- -rm -f libs.jsr223/external/$(NB_JSR223_JAR)
- -rm -f libs.jsr223/src/javax/script/empty.java
+ -rm -f apisupport.harness/external/$(NB_JSEARCH_JAR)
+ -rm -f apisupport.harness/external/$(NB_BINDEX_JAR)
+ -rm -f jemmy/external/$(NB_JEMMY_JAR)
+ -rm -f libs.antlr3.devel/external/$(NB_ANTLR_JAR)
+ -rm -f libs.antlr3.devel/external/$(NB_STRTEMPL_JAR)
+ -rm -f libs.junit4/external/$(NB_JUNIT_JAR)
+ -rm -f libs.junit4/external/$(NB_HAMCREST_JAR)
-rm -rf nbbuild/external/xhtml1-dtds
-rm -f nbbuild/nbproject/private/scan-cache-standard.ser
- -rm -f nbbuild/nbantext.jar
- -rm -rf l10n/build
- -rm -f l10n/l10nantext.jar
+# -rm -f nbbuild/nbantext.jar
-rm -rf debian/jar_tmp
override_jh_depends:
- # Skipping jh_depends run. See bug #610817.
+ # Skipping jh_depends run - since we use symlinks to /usr/share/java then
+ # jh_depends gets it wrong.
+
+get-orig-source:
+ uscan --verbose --rename --force-download
diff --git a/debian/watch b/debian/watch
index fa0c499..282f44d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
-http://netbeans.org/projects/installer/downloads/directory/netbeans-([\d\.]+)/ \
- /projects/installer/downloads/download/netbeans-[\d\.]+/platform-([\d\.]+)-\d+-src-linux.tar.gz debian uupdate
+opts=dversionmangle=s/\+dfsg.?$// \
+http://download.netbeans.org/netbeans/ ([\d\.]*)/ debian debian/orig-tar.sh
hooks/post-receive
--
libnb-platform-java packaging
More information about the pkg-java-commits
mailing list