[visualvm] 03/07: Build from the unarchived source tree

Mon May 5 22:05:10 UTC 2014

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository visualvm.

commit e9ea54cfae7c4cea21da2bb80cd31490a4b6be03
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 5 21:52:59 2014 +0200

    Build from the unarchived source tree
---
 debian/README.source                    | 26 --------------------------
 debian/control                          |  3 +--
 debian/copyright                        | 12 ++----------
 debian/libvisualvm-jni.install          |  4 ++--
 debian/patches/01-gcc-settings.patch    | 13 +++++++++++++
 debian/patches/series                   |  3 +++
 debian/patches/series.netbeans-profiler |  2 --
 debian/rules                            | 24 ++++++------------------
 8 files changed, 27 insertions(+), 60 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index fbe14c5..d423ac8 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -36,29 +36,3 @@ Here are the steps to create a new upstream tarball:
 
 5) Adjust the version of the NetBeans platform used
    (there are references in debian/control, debian/rules and debian/visualvm.links)
-
-
-Applying patches
-----------------
-
-quilt can't be used in the usual way since the source files are packed
-in an archive. Patches can be applied by enabling 01-inject-patches.patch.
-This patch will hook into the IcedTea makefile and apply a quilt series after
-extracting the source files. The patch have to be declared in
-debian/patches/series.netbeans-profiler.
-
-To create or modify patch you have to:
-
-1) Build the package once to extract the source files
-
-2) Use quilt by prefixing the command with:
-
-     QUILT_SERIES=debian/patches/series.netbeans-profiler
-
-   For example:
-
-     QUILT_SERIES=debian/patches/series.netbeans-profiler quilt new 03-fix-another-issue.patch
-     QUILT_SERIES=debian/patches/series.netbeans-profiler quilt add path/to/file
-     nano path/to/file
-     QUILT_SERIES=debian/patches/series.netbeans-profiler quilt refresh
-     QUILT_SERIES=debian/patches/series.netbeans-profiler quilt pop -a
diff --git a/debian/control b/debian/control
index 1be4e89..f4ef54e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,7 @@ Build-Depends: debhelper (>= 9),
  libnb-platform-devel-java (>= 7.0),
  libnb-platform18-java,
  quilt,
- wget,
- dh-autoreconf
+ wget
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-java/visualvm.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/visualvm.git
diff --git a/debian/copyright b/debian/copyright
index 7620b52..9be7e9c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,14 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: VisualVM
-Source: http://icedtea.classpath.org/hg/visualvm/
-        https://java.net/downloads/visualvm//release137/visualvm_136-src.tar.gz
+Source: https://java.net/downloads/visualvm//release137/visualvm_137-src.tar.gz
         https://java.net/downloads/visualvm//release137/netbeans-profiler-visualvm_release741.tar.gz
 
-Files: *
-Copyright: 2010-2011, Andrew John Hughes
-           2011, Jiri Vanek
-           2011, Omair Majid
-License: GPL-2
-
 Files: debian/*
 Copyright: 2008-2012, Matthias Klose <doko at ubuntu.com>
            2014, Emmanuel Bourg <ebourg at apache.org>
 License: GPL-2
 
-Files: netbeans/*
-       visualvm/*
+Files: *
 Copyright: 2007-2014, Oracle and/or its affiliates
 License: CDDL-1.1 or GPL-2 with Classpath exception
 
diff --git a/debian/libvisualvm-jni.install b/debian/libvisualvm-jni.install
index aeb246d..84fc1ec 100644
--- a/debian/libvisualvm-jni.install
+++ b/debian/libvisualvm-jni.install
@@ -1,2 +1,2 @@
-netbeans/lib.profiler/release/lib/deployed/jdk15/linux-amd64/libprofilerinterface-jdk15.so usr/lib/jni/
-netbeans/lib.profiler/release/lib/deployed/jdk16/linux-amd64/libprofilerinterface-jdk16.so usr/lib/jni/
+netbeans/lib.profiler/release/lib/deployed/libprofilerinterface-jdk15.so usr/lib/jni/
+netbeans/lib.profiler/release/lib/deployed/libprofilerinterface-jdk16.so usr/lib/jni/
diff --git a/debian/patches/01-gcc-settings.patch b/debian/patches/01-gcc-settings.patch
new file mode 100644
index 0000000..d592b67
--- /dev/null
+++ b/debian/patches/01-gcc-settings.patch
@@ -0,0 +1,13 @@
+--- a/netbeans/lib.profiler/native/build/buildnative-linux64.sh
++++ b/netbeans/lib.profiler/native/build/buildnative-linux64.sh
+@@ -47,8 +47,8 @@
+         JAVA_HOME=$1
+         JDK_ID=$2
+         echo $JAVA_HOME $JDK_ID
+-	gcc32 -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -DLINUX -pthread -fPIC -shared -O3 -Wall -m64  \
+-	-o ../../release/lib/deployed/$JDK_ID/linux-amd64/libprofilerinterface.so \
++	gcc -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -DLINUX -pthread -fPIC -shared -O3 -Wall -g $ARCHFLAG  \
++	-o ../../release/lib/deployed/libprofilerinterface-$JDK_ID.so \
+ 	../src-jdk15/class_file_cache.c \
+ 	../src-jdk15/attach.c \
+ 	../src-jdk15/Classes.c \
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..dfd4239 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01-gcc-settings.patch
+02-relocate-native-libraries.patch
+03-launcher.patch
diff --git a/debian/patches/series.netbeans-profiler b/debian/patches/series.netbeans-profiler
deleted file mode 100644
index 130bda8..0000000
--- a/debian/patches/series.netbeans-profiler
+++ /dev/null
@@ -1,2 +0,0 @@
-02-relocate-native-libraries.patch
-03-launcher.patch
diff --git a/debian/rules b/debian/rules
index 73da13b..178f741 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,29 +21,14 @@ NB_DEST_DIR=$(ABS_TOP_DIR)/netbeans/nbbuild/netbeans_visualvm
 %:
 	dh $@
 
-override_dh_auto_configure:
-
 override_dh_auto_build:
-	# Extract the tarballs
-	mkdir netbeans
-	tar -xf netbeans-profiler-visualvm_release*.tar.gz -C netbeans
-	tar -xf visualvm_*-src.tar.gz
-
 	# Prepare the source tree
-	rm -f netbeans/nbbuild/external/binaries-list
 	mkdir -p netbeans/nbbuild/netbeans_visualvm/
 	ln -s /usr/share/netbeans/platform$(NB_PLATFORM_VERSION) netbeans/nbbuild/netbeans_visualvm/platform
 	ln -s /usr/share/netbeans/harness/ netbeans/nbbuild/netbeans_visualvm
 
 	# Build the native libraries
-	mkdir -p netbeans/lib.profiler/release/lib/deployed/jdk15/linux-amd64
-	mkdir -p netbeans/lib.profiler/release/lib/deployed/jdk16/linux-amd64
 	cd netbeans/lib.profiler/native/build && \
-	sed -i -e 's#gcc32#gcc#' \
-	       -e 's#-m64#$(ARCHFLAG)#' \
-	       -e 's#Wall#Wall -g#' \
-	       -e 's#libprofilerinterface.so#libprofilerinterface-$$JDK_ID.so#' \
-	       buildnative-linux64.sh && \
 	JAVA_HOME_15=$(JAVA_HOME) JAVA_HOME_16=$(JAVA_HOME) ./buildnative-linux64.sh
 
 	# Build the Netbeans profiler
@@ -78,6 +63,9 @@ override_dh_install:
 	rm -Rf debian/visualvm/usr/share/visualvm/profiler/lib/deployed
 
 override_dh_auto_clean:
-	rm -Rf visualvm netbeans
-	dh_autoreconf_clean
-	dh_clean
+	rm -Rf netbeans/lib.profiler/release/lib/deployed/*
+	rm -Rf netbeans/nbbuild/netbeans_visualvm
+	rm -Rf netbeans/nbbuild/netbeans/moduleCluster.properties
+	rm -Rf visualvm/netbeans
+
+	find netbeans visualvm -name 'build' -not -path netbeans/lib.profiler/native/build | xargs rm -Rf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/visualvm.git

