From fb9f295ed428f2513438decf8cf69323abca9845 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Fri, 18 Aug 2006 08:39:12 +0000 Subject: [PATCH] Workaround bug 154069 - downgrade pack200 effort --- releng/org.eclipse.rse.updatesite/bin/.cvsignore | 1 + .../bin/mkTestUpdates.sh | 10 +++++++--- releng/org.eclipse.rse.updatesite/bin/pack200 | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 releng/org.eclipse.rse.updatesite/bin/.cvsignore create mode 100755 releng/org.eclipse.rse.updatesite/bin/pack200 diff --git a/releng/org.eclipse.rse.updatesite/bin/.cvsignore b/releng/org.eclipse.rse.updatesite/bin/.cvsignore new file mode 100644 index 00000000000..3f0ee91c711 --- /dev/null +++ b/releng/org.eclipse.rse.updatesite/bin/.cvsignore @@ -0,0 +1 @@ +pack200.stamp diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh index fdb94bebd73..ca0702e93a0 100755 --- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh +++ b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh @@ -11,6 +11,9 @@ mydir=`pwd` umask 002 +#Use Java5 on build.eclipse.org +export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH + # patch site.xml cd .. SITE=`pwd` @@ -47,11 +50,12 @@ mv -f site.xml.new site.xml # optimize the site # see http://wiki.eclipse.org/index.php/Platform-releng-faq -#Use Java5 on build.eclipse.org -export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH #Pack the site +# Workaround for downgrading effort of pack200 to avoid VM bug +# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=154069 echo "Packing the site... $SITE" java -jar $HOME/ws/eclipse/startup.jar \ + -Dorg.eclipse.update.jarprocessor.pack200=$mydir \ -application org.eclipse.update.core.siteOptimizer \ -jarProcessor -outputDir $SITE \ -processAll -pack $SITE @@ -66,4 +70,4 @@ java -jar $HOME/ws/eclipse/startup.jar \ cd $SITE chgrp -R dsdp-tm-rse . chmod -R g+w . -cd $curdir +cd $curdir \ No newline at end of file diff --git a/releng/org.eclipse.rse.updatesite/bin/pack200 b/releng/org.eclipse.rse.updatesite/bin/pack200 new file mode 100755 index 00000000000..afb0b24aac0 --- /dev/null +++ b/releng/org.eclipse.rse.updatesite/bin/pack200 @@ -0,0 +1,15 @@ +#!/bin/sh +# +# Workaround for downgrading effort of pack200 to avoid VM bug +# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=154069 +# +curdir=`pwd` +cd `dirname $0` +mydir=`pwd` +cd "$curdir" + +touch "$mydir/pack200.stamp" +date >> "$mydir/pack200.stamp" +env >> "$mydir/pack200.stamp" +echo "pack200 -E4 $*" >> "$mydir/pack200.stamp" +pack200 -E4 $*