[SCM] eclipse - Powerful IDE written in java - Debian package. branch, upstream, updated. 3b1151a64b47d9c5a24a385ce87f784f381254a9

[Benjamin Drung]

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 "eclipse - Powerful IDE written in java - Debian package.".

The branch, upstream has been updated
       via  3b1151a64b47d9c5a24a385ce87f784f381254a9 (commit)
      from  c6d6c655f1ab0af96d0837aa313b98471586405c (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                         |   11 +++++
 build.xml                                         |   10 +++-
 patches/eclipse-pde.build-add-package-build.patch |   45 +++++----------------
 3 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b6533a..8eb26bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-30  Andrew Overholt  <overholt at redhat.com>
+
+	Bug #292610 (Benjamin Drung)
+
+	* build.xml: Apply patches from Benjamin Drung to maintain permissions upon
+	installation.  Also give executable bit to package-build shell scripts.
+
+2009-10-29  Alexander Kurtakov  <akurtako at redhat.com>
+
+	* patches/eclipse-pde.build-add-package-build.patch: Remove one shell script (done in ant now).
+
 2009-10-22  Alexander Kurtakov  <akurtako at redhat.com>
     Fix #292078. (Niels Thykier)
 	* patches/gnomeproxy-makefile.patch: New file.
diff --git a/build.xml b/build.xml
index aea98f9..3802a65 100644
--- a/build.xml
+++ b/build.xml
@@ -218,6 +218,7 @@
 		<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
 		<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
 		<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
+		<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
 		<!-- end eclipse-build-only patches -->
 		<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=290064-->
 		<patch patchfile="${basedir}/patches/eclipse-help-toolbar.patch" dir="${buildDirectory}" strip="0" />
@@ -695,9 +696,12 @@
 
 	<target name="install" depends="provision.sdk">
 		<mkdir dir="${destDir}${prefix}/${libDir}/eclipse" />
-		<copy todir="${destDir}${prefix}/${libDir}/eclipse" overwrite="true">
-			<fileset dir="${buildDirectory}/installation" />
-		</copy>
+		<exec executable="cp" failonerror="true">
+			<arg value="-rd"/>
+			<arg value="--no-target-directory" />
+			<arg value="${buildDirectory}/installation" />
+			<arg value="${destDir}${prefix}/${libDir}/eclipse"/>
+		</exec>
 		<!-- install desktop file -->
 		<copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" />
 		<!-- install icons -->
diff --git a/patches/eclipse-pde.build-add-package-build.patch b/patches/eclipse-pde.build-add-package-build.patch
index baa3778..f5998ce 100644
--- a/patches/eclipse-pde.build-add-package-build.patch
+++ b/patches/eclipse-pde.build-add-package-build.patch
@@ -140,7 +140,7 @@ RCS file: templates/package-build/customTargets.xml
 diff -N templates/package-build/customTargets.xml
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ templates/package-build/customTargets.xml	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,149 @@
+@@ -0,0 +1,154 @@
 +<project name="Build specific targets and properties" default="noDefault">
 +
 +	<fail unless="type" message="Please set the ${type} property to 'feature', 'plugin' or 'fragment'." />
@@ -150,8 +150,8 @@ diff -N templates/package-build/customTargets.xml
 +	<!-- we need to do this because you can't expand variables in target names -->
 +	<copy file="${builder}/customTargets-assemble-target.xml" tofile="${buildDirectory}/customTargets-${id}-assemble-target.xml" />
 +	<replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="@id@" value="${id}" />
-+	<replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="@configs@" value="${configs}" />              
-+	<replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="," value="." />              
++	<replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="@configs@" value="${configs}" />
++	<replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="," value="." />
 +	<import file="${buildDirectory}/customTargets-${id}-assemble-target.xml" />
 +
 +	<!-- ===================================================================== -->
@@ -215,10 +215,15 @@ diff -N templates/package-build/customTargets.xml
 +		<exec dir="${builder}" executable="/bin/bash" failOnError="true">
 +			<arg line="prepare-build-dir.sh ${sourceDirectory} ${buildDirectory} ${testing}" />
 +		</exec>
-+		<exec dir="${builder}" executable="/bin/bash" failOnError="true">
-+		    <arg line="symlink-deps.sh ${buildDirectory} ${orbitDepsDir}" />
-+		</exec>
++		<antcall target="symlinkDeps" />
++	</target>
 +
++	<target name="symlinkDeps" if="orbitDepsDir">
++		<apply executable="ln" parallel="false" dir="${buildDirectory}/plugins" verbose="true">
++			<arg line="-s" />
++			<srcfile />
++			<fileset dir="${orbitDepsDir}" includes="*.jar" />
++		</apply>
 +	</target>
 +
 +	<!-- ===================================================================== -->
@@ -309,31 +314,3 @@ diff -N templates/package-build/build.properties
 +archiveName=${id}.zip
 +runPackager=false
 +baseLocation=/usr/share/eclipse
-Index: templates/package-build/symlink-deps.sh
-===================================================================
-RCS file: templates/package-build/symlink-deps.sh
-diff -N templates/package-build/symlink-deps.sh
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ templates/package-build/symlink-deps.sh	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,21 @@
-+#!/bin/sh -x
-+
-+if [ $# -ne 2 ]; then
-+  echo "usage: $0 <path to build dir> <dependencies>"
-+  exit 1
-+fi
-+
-+if [ ! -d $1 ]; then
-+  echo "usage: $0 <path to build dir> <dependencies>"
-+  exit 1
-+fi
-+
-+BUILDDIR=$1
-+DEPENDENCIESDIR=$2
-+
-+pushd $BUILDDIR/plugins
-+  for dep in `ls $DEPENDENCIESDIR`; do
-+      echo "ln -s $DEPENDENCIESDIR/$dep"
-+      ln -s $DEPENDENCIESDIR/$dep
-+  done
-+popd


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.