[eclipse-ptp] - Update to git master - Build sdm executable and install it so that debuginfo is generated
Orion Poplawski
orion at fedoraproject.org
Tue Apr 23 22:52:18 UTC 2013
commit c07c37bc62bf6e91f19978978b895d5e0e1287f6
Author: Orion Poplawski <orion at nwra.com>
Date: Tue Apr 23 16:52:16 2013 -0600
- Update to git master
- Build sdm executable and install it so that debuginfo is generated
.gitignore | 1 +
eclipse-ptp-deps.patch | 24 ++++++++++--------------
eclipse-ptp.spec | 30 ++++++++++++++++++++++++------
sources | 2 +-
4 files changed, 36 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8482422..252e8f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/org.eclipse.photran-a3b657517fd448af21dbcfa9bf05e0e2cb36fbbb.tar.gz
/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7.tar.gz
/org.eclipse.photran-74923924e5df7031ca51b6de85a64ea7d96a5c70.tar.gz
+/org.eclipse.ptp-c4667a9a6061f2fbee014509432aac74a985672b.tar.gz
diff --git a/eclipse-ptp-deps.patch b/eclipse-ptp-deps.patch
index b4d006e..98a16b3 100644
--- a/eclipse-ptp-deps.patch
+++ b/eclipse-ptp-deps.patch
@@ -1,6 +1,6 @@
-diff -up eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp.rcp.sysmon-feature/feature.xml.deps eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp.rcp.sysmon-feature/feature.xml
---- eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp.rcp.sysmon-feature/feature.xml.deps 2013-04-08 14:06:09.000000000 -0600
-+++ eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp.rcp.sysmon-feature/feature.xml 2013-04-15 13:25:51.862233070 -0600
+diff -up eclipse-ptp-7.0.0/org.eclipse.ptp-4684e25ccc1fc3354e5fe15c3500983e699c8198/releng/org.eclipse.ptp.rcp.sysmon-feature/feature.xml.deps eclipse-ptp-7.0.0/org.eclipse.ptp-4684e25ccc1fc3354e5fe15c3500983e699c8198/releng/org.eclipse.ptp.rcp.sysmon-feature/feature.xml
+--- eclipse-ptp-7.0.0/org.eclipse.ptp-4684e25ccc1fc3354e5fe15c3500983e699c8198/releng/org.eclipse.ptp.rcp.sysmon-feature/feature.xml.deps 2013-04-22 08:40:55.000000000 -0600
++++ eclipse-ptp-7.0.0/org.eclipse.ptp-4684e25ccc1fc3354e5fe15c3500983e699c8198/releng/org.eclipse.ptp.rcp.sysmon-feature/feature.xml 2013-04-22 10:47:07.644090563 -0600
@@ -312,13 +312,6 @@
unpack="false"/>
@@ -43,25 +43,21 @@ diff -up eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d
unpack="false"/>
<plugin
-diff -up eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp.sdm-feature/feature.xml.deps eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp.sdm-feature/feature.xml
---- eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp.sdm-feature/feature.xml.deps 2013-04-08 14:06:09.000000000 -0600
-+++ eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp.sdm-feature/feature.xml 2013-04-15 13:26:29.649037962 -0600
-@@ -25,17 +25,7 @@
+diff -up eclipse-ptp-7.0.0/org.eclipse.ptp-4684e25ccc1fc3354e5fe15c3500983e699c8198/releng/org.eclipse.ptp.sdm-feature/feature.xml.deps eclipse-ptp-7.0.0/org.eclipse.ptp-4684e25ccc1fc3354e5fe15c3500983e699c8198/releng/org.eclipse.ptp.sdm-feature/feature.xml
+--- eclipse-ptp-7.0.0/org.eclipse.ptp-4684e25ccc1fc3354e5fe15c3500983e699c8198/releng/org.eclipse.ptp.sdm-feature/feature.xml.deps 2013-04-22 08:40:55.000000000 -0600
++++ eclipse-ptp-7.0.0/org.eclipse.ptp-4684e25ccc1fc3354e5fe15c3500983e699c8198/releng/org.eclipse.ptp.sdm-feature/feature.xml 2013-04-22 10:48:05.338790109 -0600
+@@ -33,14 +33,6 @@
fragment="true"/>
<plugin
-- id="org.eclipse.ptp.linux.x86_64"
-- os="linux"
-- arch="x86_64"
+- id="org.eclipse.ptp.macosx"
+- os="macosx"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"/>
-
- <plugin
-- id="org.eclipse.ptp.macosx"
-- os="macosx"
-+ id="org.eclipse.ptp.linux"
+ id="org.eclipse.ptp.utils"
download-size="0"
install-size="0"
- version="0.0.0"
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index 0c72cc5..f0f642b 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -5,10 +5,10 @@
%global pdereq 1:4.2.0
%global rsereq 3.5
%global pdebuild %{_bindir}/eclipse-pdebuild
-%global ptp_build_id 20130409
+%global ptp_build_id 20130422
#global ptp_git_tag PTP_6_0_2
-%global ptp_git_tag 3ef93135125e9616e863d879fe188f338f01d9a7
-%global photran_build_id 20130409
+%global ptp_git_tag c4667a9a6061f2fbee014509432aac74a985672b
+%global photran_build_id 20130422
#global photran_git_tag PTP_6_0_2
%global photran_git_tag 74923924e5df7031ca51b6de85a64ea7d96a5c70
@@ -27,7 +27,7 @@ Summary: Eclipse Parallel Tools Platform
Name: eclipse-ptp
# Be sure to update photran version if needed
Version: %{ptpver}
-Release: 0.1.20130409git%{?dist}
+Release: 0.2.20130422git%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/ptp
@@ -297,6 +297,10 @@ Requires: %{name} = %{version}-%{release}
Parallel Tools Platform components that implement a parallel debug server
using the Scalable Debug Manager (SDM).
+NOTE: The sdm binary for the architecture of the host machine is available
+in the sdm plugin and at %{_libdir}/ptp/sdm. If the target system is of
+a different archicture, you will need to build and install it by hand.
+
%package -n eclipse-photran
Version: %{photranver}
@@ -376,8 +380,6 @@ popd
pushd org.eclipse.ptp-%{ptp_git_tag}
# Remove bundled binaries
rm -r releng/org.eclipse.ptp.linux/os/linux
-# Set arch for fragments
-sed -i -e 's/x86_64/%{eclipse_arch}/g' releng/org.eclipse.ptp.sdm-feature/feature.xml
# We don't want to build a full product
%pom_disable_module releng/org.eclipse.ptp.rcp.sysmon.product
# Disable the full sysmon for now
@@ -410,6 +412,13 @@ pushd org.eclipse.photran-%{photran_git_tag}
mvn-rpmbuild -Dmaven.repo.local=../.m2 -DforceContextQualifier=%{photran_build_id} install
popd
pushd org.eclipse.ptp-%{ptp_git_tag}
+# Build the sdm binary
+pushd debug/org.eclipse.ptp.debug.sdm
+export CFLAGS="%{optflags}"
+sh BUILD
+popd
+mkdir -p releng/org.eclipse.ptp.linux/os/linux/%{_arch}
+cp -p debug/org.eclipse.ptp.debug.sdm/bin/sdm releng/org.eclipse.ptp.linux/os/linux/%{_arch}/sdm
mvn-rpmbuild -Dmaven.repo.local=../.m2 -DforceContextQualifier=%{ptp_build_id} install
popd
@@ -448,6 +457,10 @@ sed -i -e '\,plugins/org.eclipse.ptp.remote.remotetools_,d' \
-e '\,plugins/org.eclipse.ptp.remote_,d' \
-e '\,plugins/org.eclipse.ptp.remotetools_,d' files.*
+# Install sdm binary so debuginfo is created
+mkdir -p %{buildroot}%{_libdir}/ptp
+cp -p org.eclipse.ptp-%{ptp_git_tag}/debug/org.eclipse.ptp.debug.sdm/bin/sdm %{buildroot}%{_libdir}/ptp/
+
%files -f files.org.eclipse.ptp_%{version}.%{ptp_build_id}
%doc epl-v10.html
@@ -519,6 +532,7 @@ sed -i -e '\,plugins/org.eclipse.ptp.remote.remotetools_,d' \
%files sdm -f files.org.eclipse.ptp.debug.sdm_%{version}.%{ptp_build_id}
%doc epl-v10.html
%{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.debug.sdm_*
+%{_libdir}/ptp/
%files -n eclipse-photran -f files.org.eclipse.photran_%{photranver}.%{photran_build_id} -f files.org.eclipse.rephraserengine_%{photranver}.%{photran_build_id}
%doc epl-v10.html
@@ -539,6 +553,10 @@ sed -i -e '\,plugins/org.eclipse.ptp.remote.remotetools_,d' \
%changelog
+* Tue Apr 23 2013 Orion Poplawski <orion at cora.nwra.com> - 7.0.0-0.2.20130422git
+- Update to git master
+- Build sdm executable and install it so that debuginfo is generated
+
* Tue Apr 9 2013 Orion Poplawski <orion at cora.nwra.com> - 7.0.0-0.1.20130409git
- Update to git master
diff --git a/sources b/sources
index 4971d20..56fa632 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b40afcf482b30b4ab7afd529575108ba org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7.tar.gz
+56a30b02eea5ed7df40aab9aa29f4436 org.eclipse.ptp-c4667a9a6061f2fbee014509432aac74a985672b.tar.gz
e76e2c8243726cb01034fc13af28e1fa org.eclipse.photran-74923924e5df7031ca51b6de85a64ea7d96a5c70.tar.gz
More information about the scm-commits
mailing list