Permalink
Browse files

added new profile for signing on bamboo and removed old signing ant s…

…cript code
  • Loading branch information...
1 parent 154527b commit e7a13283451eeed6aff7926ddfdaadeae87ec957 @martinlippert martinlippert committed Jul 2, 2012
@@ -33,7 +33,6 @@
<quiet>true</quiet>
<files>
<file>${dist.properties}</file>
- <file>${signing.properties}</file>
</files>
</configuration>
</execution>
@@ -46,70 +45,6 @@
<version>1.6</version>
<executions>
<execution>
- <id>process-update-site</id>
- <phase>install</phase>
- <configuration>
- <target>
-
- <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-
- <path id="eclipse.classpath">
- <fileset dir="${settings.localRepository}/org/eclipse/tycho/tycho-bundles-external">
- <include name="*/eclipse/plugins/org.eclipse.equinox.launcher_*.jar" />
- </fileset>
- </path>
-
- <path id="jarprocessor.classpath">
- <fileset dir="${settings.localRepository}/org/eclipse/tycho/tycho-bundles-external">
- <include name="*/eclipse/plugins/org.eclipse.equinox.p2.jarprocessor_*.jar" />
- </fileset>
- </path>
-
- <if>
- <equals arg1="${p2.sign}" arg2="true" />
- <then>
-
- <delete file="${project.build.directory}/repository/content.jar" />
- <delete file="${project.build.directory}/repository/artifacts.jar" />
-
- <copy todir="${project.build.directory}/repository" file="${project.build.directory}/../pack.properties"/>
-
- <java jvm="${java.home}/bin/java" classname="org.eclipse.equinox.internal.p2.jarprocessor.Main"
- fork="true" classpathref="jarprocessor.classpath" failonerror="true" maxmemory="256m"
- dir="${project.build.directory}/repository">
- <arg line="-verbose -processAll -repack -pack -sign ../../sign.sh" />
- <arg line="-outputDir ${project.build.directory}/repository ${project.build.directory}/repository" />
- </java>
-
- <java jvm="${java.home}/bin/java" classname="org.eclipse.equinox.launcher.Main" fork="true"
- classpathref="eclipse.classpath" failonerror="true" maxmemory="256m"
- dir="${project.build.directory}/repository">
- <arg line="-application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" />
- <arg line="-source ${project.build.directory}/repository -metadataRepository file://${project.build.directory}/repository" />
- <arg line="-artifactRepository file://${project.build.directory}/repository -metadataRepositoryName '${p2.repository.name}'" />
- <arg line="-artifactRepositoryName '${p2.repository.name}' -compress -reusePackedFiles -reusePack200Files -publishArtifacts" />
- </java>
-
- <java jvm="${java.home}/bin/java" classname="org.eclipse.equinox.launcher.Main" fork="true"
- classpathref="eclipse.classpath" failonerror="true" maxmemory="256m"
- dir="${project.build.directory}/repository">
- <arg line="-application org.eclipse.equinox.p2.publisher.CategoryPublisher" />
- <arg line="-metadataRepository file://${project.build.directory}/repository" />
- <arg line="-categoryDefinition file://${basedir}/category.xml" />
- <arg line="-compress -categoryQualifier" />
- </java>
-
- </then>
-
- </if>
-
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
<id>upload-dist</id>
<phase>deploy</phase>
<configuration>
@@ -122,7 +57,7 @@
<property name="dist.full.version" value="${unqualifiedVersion}.${buildQualifier}" />
<property name="dist.file.name" value="${dist.project}-${dist.full.version}-updatesite.zip" />
- <property name="dist.full.path" value="${site.target.dir}/site/${dist.file.name}" />
+ <property name="dist.full.path" value="${site.target.dir}/repository/${dist.file.name}" />
<delete file="${dist.full.path}" />
<zip zipfile="${dist.full.path}" filesonly="true">
@@ -1,8 +0,0 @@
-#!/bin/bash
-if [ -e "$HOME/.keytool/springsource.jks" ]
-then
- echo Signing $1
- #jarsigner -tsa https://timestamp.geotrust.com/tsa -keystore ~/.keytool/springsource.jks -keypass $KEY_PASSWORD -storepass $STORE_PASSWORD $1 vmware
- jarsigner -keystore ~/.keytool/springsource.jks -keypass $KEY_PASSWORD -storepass $STORE_PASSWORD $1 vmware
-fi
-
View
@@ -66,7 +66,6 @@
<signing.keystore>~/.keytool/springsource.jks</signing.keystore>
<signing.store.password>${STORE_PASSWORD}</signing.store.password>
<signing.key.password>${KEY_PASSWORD}</signing.key.password>
- <signing.properties>signing.properties</signing.properties>
<dist.name>VMware vFabric tc Server Integration for Eclipse</dist.name>
<dist.project>eclipse-integration-tcserver</dist.project>
@@ -108,6 +107,7 @@
</properties>
<profiles>
+
<profile>
<id>e37</id>
<activation>
@@ -139,6 +139,7 @@
</repository>
</repositories>
</profile>
+
<profile>
<id>build.springsource.com</id>
<activation>
@@ -152,6 +153,7 @@
<p2.replaceQualifier>true</p2.replaceQualifier>
</properties>
</profile>
+
<profile>
<id>osx</id>
<activation>
@@ -164,6 +166,15 @@
<test.osvmargs>-Dosgi.ws=cocoa -XstartOnFirstThread</test.osvmargs>
</properties>
</profile>
+
+ <profile>
+ <id>bamboo-signing</id>
+ <properties>
+ <signing.store.password>${env.bamboo_signing_store_password}</signing.store.password>
+ <signing.key.password>${env.bamboo_signing_key_password}</signing.key.password>
+ </properties>
+ </profile>
+
</profiles>
<repositories>
@@ -271,7 +282,6 @@
<configuration>
<files>
<file>${project.build.directory}/git.properties</file>
- <file>${signing.properties}</file>
</files>
<!-- do not fail if properties file does not exist to support, required to build eclipse-repository projects -->
<quiet>true</quiet>

0 comments on commit e7a1328

Please sign in to comment.