From e47f5a3bf0f9015919a66274223ab9d5eca05dae Mon Sep 17 00:00:00 2001 From: spingel Date: Tue, 8 Feb 2011 08:02:36 +0000 Subject: bug 296436: modularize Mylyn Incubator build --- org.eclipse.mylyn.incubator-site/.cvsignore | 1 + org.eclipse.mylyn.incubator-site/assembly.xml | 13 + org.eclipse.mylyn.incubator-site/index.html | 42 ++++ .../pack-and-sign/build.xml | 140 +++++++++++ .../pack-and-sign/sign-and-wait.sh | 72 ++++++ org.eclipse.mylyn.incubator-site/pom.xml | 105 ++++++++ org.eclipse.mylyn.incubator-site/site.xml | 31 +++ pom.xml | 280 ++++++++++++++++++++- 8 files changed, 678 insertions(+), 6 deletions(-) create mode 100644 org.eclipse.mylyn.incubator-site/.cvsignore create mode 100644 org.eclipse.mylyn.incubator-site/assembly.xml create mode 100644 org.eclipse.mylyn.incubator-site/index.html create mode 100644 org.eclipse.mylyn.incubator-site/pack-and-sign/build.xml create mode 100644 org.eclipse.mylyn.incubator-site/pack-and-sign/sign-and-wait.sh create mode 100644 org.eclipse.mylyn.incubator-site/pom.xml create mode 100644 org.eclipse.mylyn.incubator-site/site.xml diff --git a/org.eclipse.mylyn.incubator-site/.cvsignore b/org.eclipse.mylyn.incubator-site/.cvsignore new file mode 100644 index 00000000..eb5a316c --- /dev/null +++ b/org.eclipse.mylyn.incubator-site/.cvsignore @@ -0,0 +1 @@ +target diff --git a/org.eclipse.mylyn.incubator-site/assembly.xml b/org.eclipse.mylyn.incubator-site/assembly.xml new file mode 100644 index 00000000..907a49c0 --- /dev/null +++ b/org.eclipse.mylyn.incubator-site/assembly.xml @@ -0,0 +1,13 @@ + + site + + zip + + false + + + ${project.build.directory}/site + / + + + diff --git a/org.eclipse.mylyn.incubator-site/index.html b/org.eclipse.mylyn.incubator-site/index.html new file mode 100644 index 00000000..6a23cdc0 --- /dev/null +++ b/org.eclipse.mylyn.incubator-site/index.html @@ -0,0 +1,42 @@ + + + +Eclipse Mylyn Software Repository + + + + + + + +
+ +

This software repository URL + +provides access to the software repository of the +Eclipse Mylyn project. + +

+Compatibility: This version of Mylyn supports Eclipse 3.5.2 (Galileo SR2) or later.

+

+ +

If you are using Eclipse Helios you may also install Mylyn from the Helios repository. + +Click Help > Install New Software, type "helios", select the Helios repository URL, select +Collaboration > Eclipse Mylyn and click Install. + +

Alternatively you may install Mylyn using the Eclipse Marketplace client: click +Help > Eclipse Marketplace, enter "Mylyn" into the search field, then click Go and Install.

+ +

For more information about installing or updating software, see the +Eclipse Platform Help.

+ +
+ + diff --git a/org.eclipse.mylyn.incubator-site/pack-and-sign/build.xml b/org.eclipse.mylyn.incubator-site/pack-and-sign/build.xml new file mode 100644 index 00000000..57ccc2c0 --- /dev/null +++ b/org.eclipse.mylyn.incubator-site/pack-and-sign/build.xml @@ -0,0 +1,140 @@ + + + + + + + Required property localRepository not set + Required property projectDir not set + Required property repositoryName not set + + Running on ${os.name} ${os.version} (${os.arch}) / ${ant.version} / ${java.vendor} ${java.vm.name} ${java.version} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Using ${pack200} for packing + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.mylyn.incubator-site/pack-and-sign/sign-and-wait.sh b/org.eclipse.mylyn.incubator-site/pack-and-sign/sign-and-wait.sh new file mode 100644 index 00000000..11ef105d --- /dev/null +++ b/org.eclipse.mylyn.incubator-site/pack-and-sign/sign-and-wait.sh @@ -0,0 +1,72 @@ +#!/bin/bash -e + +#******************************************************************************* +# Copyright (c) 2009 Tasktop Technologies and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Tasktop Technologies - initial API and implementation +#******************************************************************************* + +if [ $# -eq 0 ] +then + echo "usage: sign-and-wait.sh directory" + exit 1 +fi + +set -v + +SRC=$1 +DST=/home/data/httpd/download-staging.priv/tools/mylyn/hudson/signing +OUT=$DST/output +LOG=/home/data/httpd/download-staging.priv/arch/signer.log + +# prepare + +rm -rf $DST +mkdir -p $DST +mkdir -p $OUT + +# create zip + +echo Creating archive for signing + +cd $SRC +/usr/bin/find -name "org.eclipse*mylyn*.jar" | zip $DST/mylyn.zip -@ + +# sign + +/usr/bin/sign $DST/mylyn.zip nomail $OUT + +# wait up to 30 minutes for signing to complete + +tail -f $LOG | grep -E \(Extracting\|Finished\) & + +I=0 +while [ $I -lt 60 ] && [ ! -e $OUT/mylyn.zip ]; do + echo Waiting for $OUT/mylyn.zip + sleep 30 + let I=I+1 +done + +PID=`jobs -l -p` +kill $PID + +if [ ! -e $OUT/mylyn.zip ] +then + echo + echo Signing Failed: Timeout waiting for $OUT/mylyn.zip + exit 1 +fi + +# unzip + +echo Unzipping signed files +/usr/bin/unzip -o -d $SRC $OUT/mylyn.zip + +# cleanup + +rm $DST/mylyn.zip diff --git a/org.eclipse.mylyn.incubator-site/pom.xml b/org.eclipse.mylyn.incubator-site/pom.xml new file mode 100644 index 00000000..05f80f3d --- /dev/null +++ b/org.eclipse.mylyn.incubator-site/pom.xml @@ -0,0 +1,105 @@ + + + + 4.0.0 + + org.eclipse.mylyn.incubator + mylyn-incubator-parent + 0.0.1-SNAPSHOT + + incubator-site + 3.5.0-SNAPSHOT + eclipse-update-site + Mylyn Incubator + + ${project.unqualifiedVersion} + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2-beta-4 + + + assembly.xml + + + + + make-assembly + package + + single + + + + + + maven-resources-plugin + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/site + + + . + + index.html + web/* + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.6 + + + pack-and-sign + install + + + + + + + + + + + + + + + + run + + + + + + + + diff --git a/org.eclipse.mylyn.incubator-site/site.xml b/org.eclipse.mylyn.incubator-site/site.xml new file mode 100644 index 00000000..6d53bc0a --- /dev/null +++ b/org.eclipse.mylyn.incubator-site/site.xml @@ -0,0 +1,31 @@ + + + + Mylyn Incubator + + + + + + + + + + + + + + + + + + + Mylyn bridges that integrate with documents and programming languages. Mylyn connectors that integrate with task repositories. + + + + + Source code and documentation for integrators building on Mylyn. + + + diff --git a/pom.xml b/pom.xml index 137aa0f5..3af8a991 100644 --- a/pom.xml +++ b/pom.xml @@ -2,16 +2,64 @@ 4.0.0 - - org.eclipse.mylyn - mylyn-parent - 3.5.0-SNAPSHOT - ../org.eclipse.mylyn/org.eclipse.mylyn.releng - + org.eclipse.mylyn.incubator mylyn-incubator-parent 0.0.1-SNAPSHOT pom + + + 0.10.0 + + + ${basedir}/eclipse.keyring + ${basedir}/eclipse.keyring.password + + true + true + + -ea -Dmylyn.credentials=${mylyn-credentials} + -eclipse.keyring ${mylyn-keyring} -eclipse.password ${mylyn-keyring-password} + + + Mylyn Incubator + + ${java.home}/bin + + + true + true + + + + + Mylyn Incubator Mailing List + mylyn-incubator-dev@eclipse.org + https://dev.eclipse.org/mailman/listinfo/mylyn-incubator-dev + https://dev.eclipse.org/mailman/listinfo/mylyn-incubator-dev + http://dev.eclipse.org/mhonarc/lists/mylyn-incubator-dev + + + + + https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;classification=Mylyn;product=Mylyn%20Incubator + Bugzilla + + + + + Eclipse Public License v1.0 + + All rights reserved. + + This program and the accompanying materials are made + available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.htm + + + + org.eclipse.mylyn.examples.monitor.study org.eclipse.mylyn.ide.capabilities @@ -31,5 +79,225 @@ org.eclipse.mylyn.wikitext.sandbox-feature org.eclipse.mylyn.wikitext.sandbox.ui org.eclipse.mylyn.experimental-sdk-feature + org.eclipse.mylyn.incubator-site + + + + eclipse-mylyn + p2 + http://download.eclipse.org/mylyn/snapshots/weekly/ + + + eclipse-orbit + p2 + http://download.eclipse.org/tools/orbit/committers/drops/S20110124210048/repository/ + + + + + + galileo + + [3.5.0,3.6.0) + + + + galileo + p2 + http://download.eclipse.org/releases/galileo/ + + + + + helios + + [3.6.0,3.7.0) + + + + helios + p2 + http://download.eclipse.org/releases/helios/ + + + + + indigo + + true + + + [3.7.0,3.8.0) + + + + indigo + p2 + http://download.eclipse.org/releases/indigo/ + + + + + hudson.eclipse.org + + + user.name + hudsonbuild + + + + ${env.WORKSPACE}/credentials.properties + ${env.WORKSPACE}/keyring + ${env.WORKSPACE}/keyring.password + /shared/common/jdk-1.5.0-22.x86_64/bin + -ea -Dmylyn.credentials=${mylyn-credentials} -Dorg.eclipse.mylyn.wikitext.tests.disableOutput=true -Dhttp.proxyHost=proxy.eclipse.org -Dhttp.proxyPort=9898 -DhttpnonProxyHosts=wiki.eclipse.org + -eclipse.keyring ${mylyn-keyring} -eclipse.password ${mylyn-keyring-password} + + + + + + + + codehaus.snapshots + http://snapshots.repository.codehaus.org/ + + + + + + + org.sonatype.tycho + tycho-maven-plugin + ${tycho-version} + true + + + org.sonatype.tycho + target-platform-configuration + ${tycho-version} + + p2 + + + win32 + win32 + x86 + + + win32 + win32 + x86_64 + + + linux + gtk + x86 + + + linux + gtk + x86_64 + + + macosx + cocoa + x86_64 + + + + + + + + + org.sonatype.tycho + maven-osgi-compiler-plugin + ${tycho-version} + + UTF-8 + + + + + org.sonatype.tycho + maven-osgi-source-plugin + ${tycho-version} + + + attach-source + process-classes + + plugin-source + + + + + + org.sonatype.tycho + maven-osgi-packaging-plugin + ${tycho-version} + + 'I'yyyyMMdd-HHmm + true + + + + org.apache.maven.plugins + maven-resources-plugin + 2.4.1 + + ISO-8859-1 + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.3 + + + org.codehaus.mojo + findbugs-maven-plugin + 2.3.2-SNAPSHOT + + true + false + true + + + + + check + + + + + + org.apache.maven.plugins + maven-pmd-plugin + 2.5 + + utf-8 + 100 + 1.5 + xml + false + true + + + + + cpd-check + + + + + + + -- cgit v1.2.3