### Eclipse Workspace Patch 1.0

#P org.eclipse.pde.build

Index: templates/package-build/prepare-build-dir.sh

===================================================================

RCS file: templates/package-build/prepare-build-dir.sh

diff -N templates/package-build/prepare-build-dir.sh

--- /dev/null	1 Jan 1970 00:00:00 -0000

+++ templates/package-build/prepare-build-dir.sh	1 Jan 1970 00:00:00 -0000

@@ -0,0 +1,105 @@

+#!/bin/sh

+

+if [ $# -lt 2 ]; then

+  echo "usage: $0 <path to source dir> <path to build dir>"

+  exit 1

+fi

+

+if [ ! -d $1 ]; then

+  echo "usage: $0 <path to source dir> <path to build dir>"

+  exit 1

+fi

+

+SOURCEDIR=$1

+BUILDDIR=$2

+TESTING=$3

+

+echo "preparing files in $1 for buildfile generation ..."

+mkdir -p $BUILDDIR

+

+# make some ant build files to extract the id from the feature.xml, plugin.xml or the fragment.xml

+mkdir -p $BUILDDIR/tmp

+BUILDFILE=$BUILDDIR/tmp/build.xml

+

+echo "<project default=\"main\">

+	<target name=\"main\">

+               	<xmlproperty file=\"@type@.xml\" collapseAttributes=\"true\"/>

+		<fail unless=\"@type@.id\" message=\"feature.id not set\"/>

+               	<echo message=\"\${@type@.id}\" />

+        </target>

+</project>" > $BUILDFILE

+

+for type in feature plugin fragment; do

+  CURBUILDFILE=$BUILDDIR/tmp/$type-build.xml

+  cat $BUILDFILE | sed "s|@type@|$type|" > $CURBUILDFILE

+done

+

+# make the directories eclipse is expecting

+echo "  making the 'features' and 'plugins' directories"

+mkdir -p $BUILDDIR/features $BUILDDIR/plugins

+

+# make symlinks for the features

+FEATURES=$(find $SOURCEDIR -name feature.xml)

+find $SOURCEDIR -name feature.xml | while read f; do

+  PROJECTDIR=$(dirname "$f")

+  inSDK=1

+  inSDK=$(echo $PROJECTDIR | grep -c $BUILDDIR)

+  if [ $inSDK == 0 ]; then

+    PROJECTNAME=$(ant -Dbasedir="$PROJECTDIR" -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)

+    ERROR=""

+    if [ -z "$PROJECTNAME" ]; then

+      echo "ERROR: could not determine the feature id for $PROJECTDIR"

+      if [ $TESTING != true ]; then

+        exit 1

+      else

+        ERROR="yes"

+      fi

+    fi

+

+  if [ "x$ERROR" != "xyes" ]; then

+    if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then

+    echo "  making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"

+    ln -sf "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"

+      fi

+    fi

+  fi

+done

+

+# make symlinks for plugins and fragments

+PLUGINDIRS=$(find $SOURCEDIR -name plugin.xml -o -name fragment.xml -o -name MANIFEST.MF | sed "s/plugin.xml//g" | sed "s/fragment.xml//g" | sed "s/META-INF\/MANIFEST.MF//" | sort | uniq)

+find $SOURCEDIR -name plugin.xml -o -name fragment.xml -o -name MANIFEST.MF | sed "s/plugin.xml//g" | sed "s/fragment.xml//g" | sed "s/META-INF\/MANIFEST.MF//" | sort | uniq | while read dir; do

+  PROJECTNAME=""

+  ERROR=""

+  inSDK=1

+  inSDK=$(echo $dir | grep -c $BUILDDIR)

+  if [ $inSDK == 0 ]; then

+    if [ -e "$dir/META-INF/MANIFEST.MF" ]; then

+      PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)

+    elif [ -e "$dir/plugin.xml" ]; then

+      PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/plugin-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)

+    elif [ -e "$dir/fragment.xml" ]; then

+      PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/fragment-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)

+    fi

+

+    if [ -z "$PROJECTNAME"  ]; then

+      echo "ERROR: could not determine the plugin or fragment id for $dir"

+      if [ $TESTING != true ]; then

+        exit 1

+      else

+        ERROR="yes"

+      fi

+    fi

+

+  fi

+

+  if [ "x$ERROR" != "xyes" ]; then

+    if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then

+    echo "  making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"

+    ln -sf $dir $BUILDDIR/plugins/"$PROJECTNAME"

+    fi

+  fi;

+

+done

+

+rm -rf $BUILDDIR/tmp

+echo done

Index: templates/package-build/customTargets-assemble-target.xml

===================================================================

RCS file: templates/package-build/customTargets-assemble-target.xml

diff -N templates/package-build/customTargets-assemble-target.xml

--- /dev/null	1 Jan 1970 00:00:00 -0000

+++ templates/package-build/customTargets-assemble-target.xml	1 Jan 1970 00:00:00 -0000

@@ -0,0 +1,12 @@

+<project>

+	

+	

+	

+	

+	

+	

+

+	<target name="assemble.@id@">

+		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>

+	</target>

+</project>

Index: templates/package-build/customTargets.xml

===================================================================

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,147 @@

+<project name="Build specific targets and properties" default="noDefault">

+

+	<fail unless="type" message="Please set the ${type} property to 'feature', 'plugin' or 'fragment'." />

+	<fail unless="id" message="Please set the ${id} property to the feature, plugin or fragment id of the plugin you are building." />

+	<fail unless="sourceDirectory" message="Please set the ${sourceDirectory} property to the directory that has the source plugins." />

+

+		

+	<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}" />

+	<import file="${buildDirectory}/customTargets-${id}-assemble-target.xml" />

+

+	

+	

+	

+	

+	<target name="allElements">

+		<ant antfile="${genericTargets}" target="${target}">

+			<property name="type" value="${type}" />

+			<property name="id" value="${id}" />

+		</ant>

+	</target>

+

+	

+	

+	

+	

+	<target name="getMapFiles">

+	</target>

+

+	

+

+	<target name="clean" unless="noclean">

+		<antcall target="allElements">

+			<param name="target" value="cleanElement" />

+		</antcall>

+	</target>

+

+	

+	

+	

+	<target name="preSetup">

+	</target>

+

+	

+	

+	

+	<target name="postSetup">

+	</target>

+

+	

+	

+	

+	<target name="preFetch">

+	</target>

+

+	

+	

+	

+	<target name="postFetch">

+	</target>

+

+	

+	

+	

+	<target name="preGenerate">

+		

+   		plugin projects to be in the 'plugins' directory. The build infrastructure 

+		normally arranges the projects during the fetch stage. Since we aren't doing

+ 		the fetch stage, we have to manually arrange the files -->

+		<exec dir="${builder}" executable="/bin/sh">

+			<arg line="prepare-build-dir.sh ${sourceDirectory} ${buildDirectory} ${testing}" />

+		</exec>

+		<exec dir="${builder}" executable="/bin/sh">

+		    <arg line="symlink-deps.sh ${buildDirectory} ${orbitDepsDir}" />

+		</exec> 

+

+	</target>

+

+	

+	

+	

+	<target name="postGenerate">

+		<antcall target="clean" />

+	</target>

+

+	

+	

+	

+	<target name="preProcess">

+	</target>

+

+	

+	

+	

+	<target name="postProcess">

+	</target>

+

+	

+	

+	

+	<target name="preAssemble">

+	</target>

+

+	

+	

+	

+	<target name="postAssemble">

+	</target>

+

+	

+	

+	

+	<target name="prePackage">

+	</target>

+

+	

+	

+	

+	<target name="postPackage">

+	</target>

+

+	

+	

+	

+	<target name="postBuild">

+	</target>

+

+	

+	

+	

+	<target name="test">

+	</target>

+

+	

+	

+	

+	<target name="publish">

+	</target>

+

+	

+	

+	

+	<target name="noDefault">

+		<echo message="You must specify a target when invoking this file" />

+	</target>

+

+</project>

Index: templates/package-build/build.properties

===================================================================

RCS file: templates/package-build/build.properties

diff -N templates/package-build/build.properties

--- /dev/null	1 Jan 1970 00:00:00 -0000

+++ templates/package-build/build.properties	1 Jan 1970 00:00:00 -0000

@@ -0,0 +1,12 @@

+buildDirectory=${sourceDirectory}/build

+buildLabel=rpmBuild

+archivePrefix=eclipse

+skipFetch=true

+javacFailOnError=true

+collectingFolder=eclipse

+archivesFormat=*,*,*-zip

+zipargs=-y

+javacDebugInfo=true

+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