rpms/eclipse/devel eclipse-pde.build-add-package-build.patch, 1.9, 1.10 eclipse-pdebuild.sh, 1.10, 1.11 eclipse.spec, 1.611, 1.612
Andrew Overholt
overholt at fedoraproject.org
Mon Dec 15 17:32:26 UTC 2008
- Previous message (by thread): rpms/totem/devel .cvsignore, 1.68, 1.69 sources, 1.68, 1.69 totem.spec, 1.208, 1.209
- Next message (by thread): rpms/evolution/devel evolution-2.25.3.1-libgweather.patch, NONE, 1.1 .cvsignore, 1.102, 1.103 evolution.spec, 1.364, 1.365 sources, 1.102, 1.103
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: overholt
Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20329/devel
Modified Files:
eclipse-pde.build-add-package-build.patch eclipse-pdebuild.sh
eclipse.spec
Log Message:
* Mon Dec 15 2008 Andrew Overholt <overholt at redhat.com> 1:3.4.1-12
- Update pdebuild and package-build patch to include -z option.
eclipse-pde.build-add-package-build.patch:
Index: eclipse-pde.build-add-package-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-pde.build-add-package-build.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- eclipse-pde.build-add-package-build.patch 27 Aug 2008 20:12:34 -0000 1.9
+++ eclipse-pde.build-add-package-build.patch 15 Dec 2008 17:32:26 -0000 1.10
@@ -6,10 +6,10 @@
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,96 @@
+@@ -0,0 +1,105 @@
+#!/bin/sh
+
-+if [ $# -lt 2 ]; then
++if [ $# -lt 2 ]; then
+ echo "usage: $0 <path to source dir> <path to build dir>"
+ exit 1
+fi
@@ -43,7 +43,7 @@
+ cat $BUILDFILE | sed "s|@type@|$type|" > $CURBUILDFILE
+done
+
-+# make the directories eclipse is expecting
++# make the directories eclipse is expecting
+echo " making the 'features' and 'plugins' directories"
+mkdir -p $BUILDDIR/features $BUILDDIR/plugins
+
@@ -51,21 +51,25 @@
+FEATURES=$(find $SOURCEDIR -name feature.xml)
+find $SOURCEDIR -name feature.xml | while read f; do
+ PROJECTDIR=$(dirname "$f")
-+ 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"
++ 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
-+ 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
@@ -75,21 +79,26 @@
+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=""
-+ 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
++ 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"
++ 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
@@ -99,10 +108,10 @@
+ fi
+ fi;
+
-+done
++done
+
+rm -rf $BUILDDIR/tmp
-+echo done
++echo done
Index: templates/package-build/customTargets-assemble-target.xml
===================================================================
RCS file: templates/package-build/customTargets-assemble-target.xml
Index: eclipse-pdebuild.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-pdebuild.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- eclipse-pdebuild.sh 17 Oct 2008 19:49:13 -0000 1.10
+++ eclipse-pdebuild.sh 15 Dec 2008 17:32:26 -0000 1.11
@@ -18,6 +18,7 @@
-v Be verbose
-D Debug platform itself (passes -consolelog -debug to Eclipse)
-o Directory containing Orbit-style dependencies
+ -z Comma-delimited list of dependency zips (not for use during RPM build)
_EOF_
}
@@ -115,9 +116,10 @@
orbitDepsDir=
p2Generate=
testing=false
+zipDeps=
# See above. r = dry run (used for testing)
-while getopts âhf:d:a:j:tvrDo:â OPTION
+while getopts âhf:d:z:a:j:tvrDo:â OPTION
do
case $OPTION in
h)
@@ -151,6 +153,9 @@
o)
orbitDepsDir=$OPTARG
;;
+ z)
+ zipDeps=$OPTARG
+ ;;
?)
usage
exit
@@ -208,6 +213,30 @@
orbitDeps="-DorbitDepsDir=\"$orbitDepsDir\""
fi
+if [ "x$zipDeps" != "x" ]; then
+ OLD_IFS="$IFS"
+ IFS=","
+ zipDepsArray=($zipDeps)
+ IFS="$OLD_IFS"
+ numZips=${#zipDepsArray[@]}
+ for (( i=0; i< $numZips; i++ )); do
+ thisZip=${zipDepsArray[$i]}
+ thisFile=$(basename $thisZip)
+ thisURL=$(echo $thisZip | sed s/$thisFile//)
+ if [ ! -e $thisFile ]; then
+ wget -q $thisZip
+ fi
+ mkdir -p tmp
+ unzip -q -o $thisFile -d tmp
+ cp -raf tmp/eclipse/features/* $SDK/features
+ cp -raf tmp/eclipse/plugins/* $SDK/plugins
+ rm -rf tmp
+ thisZip=
+ thisFile=
+ thisURL=
+ done
+fi
+
echo "Starting build:"
if [ $testing != true ]; then
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.611
retrieving revision 1.612
diff -u -r1.611 -r1.612
--- eclipse.spec 5 Dec 2008 19:04:18 -0000 1.611
+++ eclipse.spec 15 Dec 2008 17:32:26 -0000 1.612
@@ -30,7 +30,7 @@
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 10%{?dist}
+Release: 11%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -1537,6 +1537,9 @@
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
+* Mon Dec 15 2008 Andrew Overholt <overholt at redhat.com> 1:3.4.1-12
+- Update pdebuild and package-build patch to include -z option.
+
* Fri Dec 5 2008 Andrew Overholt <overholt at redhat.com> 1:3.4.1-10
- Remove MaxPermSize from sysproperty lists in library.xml as it was causing the
JVM to not start.
- Previous message (by thread): rpms/totem/devel .cvsignore, 1.68, 1.69 sources, 1.68, 1.69 totem.spec, 1.208, 1.209
- Next message (by thread): rpms/evolution/devel evolution-2.25.3.1-libgweather.patch, NONE, 1.1 .cvsignore, 1.102, 1.103 evolution.spec, 1.364, 1.365 sources, 1.102, 1.103
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list