switching to buckminster

diff --git a/.gitattributes b/.gitattributes
index 41364b601e86911ae209c3e6122f47a9e2c28282..47ae9aaa9a884f1e2a11bc214c4dddb73f32a46e 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -978,6 +978,16 @@ taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/Perspective.java -t
 taxeditor-feature-dependencies/.project -text
 taxeditor-feature-dependencies/build.properties -text
 taxeditor-feature-dependencies/feature.xml -text
+taxeditor-feature-product/.project -text
+taxeditor-feature-product/buckminster.cspex -text
+taxeditor-feature-product/buckminster_product.properties -text
+taxeditor-feature-product/buckminster_updateSite.properties -text
+taxeditor-feature-product/build.properties -text
+taxeditor-feature-product/build/product.ant -text
+taxeditor-feature-product/feature.properties -text
+taxeditor-feature-product/feature.xml -text
+taxeditor-feature-product/plugin_customization.ini -text
+taxeditor-feature-product/taxeditor.product -text
 taxeditor-feature/.project -text
 taxeditor-feature/build.properties -text
 taxeditor-feature/feature.xml -text

diff --git a/.gitignore b/.gitignore
index 5793bc9f2e2eedd128445d0fd9fbd0a23568bd61..3c444bfa50a27d600e21346dd3ed625796d1b823 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ taxeditor-editor/.classpath
 taxeditor-editor/.project
 taxeditor-editor/.settings
 taxeditor-editor/target
+taxeditor-feature-product/workspace
 taxeditor-feature/.project
 taxeditor-navigation/.classpath
 taxeditor-navigation/.project

diff --git a/taxeditor-feature-product/.project b/taxeditor-feature-product/.project
new file mode 100644 (file)
index 0000000..e98d0dc
--- /dev/null
+++ b/taxeditor-feature-product/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>taxeditor-feature-product</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.FeatureBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.FeatureNature</nature>
+       </natures>
+</projectDescription>

diff --git a/taxeditor-feature-product/buckminster.cspex b/taxeditor-feature-product/buckminster.cspex
new file mode 100644 (file)
index 0000000..a7065ee
--- /dev/null
+++ b/taxeditor-feature-product/buckminster.cspex
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cspecExtension
+       xmlns:com="http://www.eclipse.org/buckminster/Common-1.0"
+       xmlns="http://www.eclipse.org/buckminster/CSpec-1.0">
+
+       <actions>
+               <public name="create.product" actor="ant">
+            <actorProperties>
+                <property key="buildFile" value="build/product.ant"/>
+                <property key="targets" value="create.product"/>
+            </actorProperties>
+            <properties>
+                <property key="profile" value="TaxonomicEditorProfile"/>
+                <property key="iu" value="eu.etaxonomy.taxeditor.application.product"/>
+            </properties>
+                       <prerequisites alias="repository">
+                               <attribute name="site.p2"/>
+                       </prerequisites>
+            <products alias="destination" base="${buckminster.output}">
+               <path path="TaxonomicEditor/"/>
+            </products>
+               </public>
+               <public name="create.product.zip" actor="ant">
+            <actorProperties>
+                <property key="buildFileId" value="buckminster.pdetasks"/>
+                <property key="targets" value="create.zip"/>
+            </actorProperties>
+                       <prerequisites alias="action.requirements">
+                               <attribute name="create.product"/>
+                       </prerequisites>
+            <products alias="action.output" base="${buckminster.output}">
+               <path path="TaxonomicEditor.zip"/>
+            </products>
+               </public>
+       </actions>
+</cspecExtension>

diff --git a/taxeditor-feature-product/buckminster_product.properties b/taxeditor-feature-product/buckminster_product.properties
new file mode 100644 (file)
index 0000000..8a875c0
--- /dev/null
+++ b/taxeditor-feature-product/buckminster_product.properties
@@ -0,0 +1,38 @@
+# buckminster.properties
+# ----------------------
+# These properties control how buckminster performs a build, where output should be placed,
+# where temporary files should be kept, and where options for signing, packing, and
+# platforms are stated.
+#
+
+# Where all the output should go
+buckminster.output.root=${user.home}/taxeditor
+
+# Where the temp files should go
+buckminster.temp.root=${user.home}/tmp/taxeditor.tmp
+
+# How .qualifier in versions should be replaced
+qualifier.replacement.*=generator:lastRevision
+
+# How the qualifier (last revision) should be formatted
+generator.lastRevision.format=r{0,number,00000}
+
+# If a site should use pack200, turn off for faster build
+# site.pack200=true
+
+# If a site should be signed
+# site.signing=true
+
+# If a site should be signed locally, or remotely at Eclipse
+# signing.type=eclipse.remote
+
+# Should local signing be performed
+# local.sign=true
+
+# Should source bundles be built and included
+cbi.include.source=false
+
+# What platforms should be built, * for "all"
+#target.os=*
+#target.ws=*
+#target.arch=*

diff --git a/taxeditor-feature-product/buckminster_updateSite.properties b/taxeditor-feature-product/buckminster_updateSite.properties
new file mode 100644 (file)
index 0000000..8c5f6eb
--- /dev/null
+++ b/taxeditor-feature-product/buckminster_updateSite.properties
@@ -0,0 +1,38 @@
+# buckminster.properties
+# ----------------------
+# These properties control how buckminster performs a build, where output should be placed,
+# where temporary files should be kept, and where options for signing, packing, and
+# platforms are stated.
+#
+
+# Where all the output should go
+buckminster.output.root=${user.home}/taxeditor
+
+# Where the temp files should go
+buckminster.temp.root=${user.home}/tmp/taxeditor.tmp
+
+# How .qualifier in versions should be replaced
+qualifier.replacement.*=generator:lastRevision
+
+# How the qualifier (last revision) should be formatted
+generator.lastRevision.format=r{0,number,00000}
+
+# If a site should use pack200, turn off for faster build
+# site.pack200=true
+
+# If a site should be signed
+# site.signing=true
+
+# If a site should be signed locally, or remotely at Eclipse
+# signing.type=eclipse.remote
+
+# Should local signing be performed
+# local.sign=true
+
+# Should source bundles be built and included
+cbi.include.source=false
+
+# What platforms should be built, * for "all"
+target.os=*
+target.ws=*
+target.arch=*

diff --git a/taxeditor-feature-product/build.properties b/taxeditor-feature-product/build.properties
new file mode 100644 (file)
index 0000000..af8c33a
--- /dev/null
+++ b/taxeditor-feature-product/build.properties
@@ -0,0 +1,5 @@
+bin.includes = feature.xml,\
+               plugin_customization.ini
+category.members.taxeditor = eu.etaxonomy.taxeditor.feature
+category.id.taxeditor = Taxonomic Editor
+category.description.taxeditor = Demo build of RCP taxeditor with p2 managment

diff --git a/taxeditor-feature-product/build/product.ant b/taxeditor-feature-product/build/product.ant
new file mode 100644 (file)
index 0000000..55cc2a5
--- /dev/null
+++ b/taxeditor-feature-product/build/product.ant
@@ -0,0 +1,50 @@
+<project>
+        <pathconvert property="equinox.launcher.jar">
+          <first count="1">
+            <sort>
+              <fileset dir="${eclipse.home}/plugins" includes="**/org.eclipse.equinox.launcher_*.jar"/>
+              <reverse xmlns="antlib:org.apache.tools.ant.types.resources.comparators">
+                <date/>
+              </reverse>
+            </sort>
+          </first>
+        </pathconvert>
+
+       <target name="create.product">
+               <property name="destination" location="${sp:destination}"/>
+               <delete dir="${destination}"></delete>
+               <makeurl property="repository" file="${sp:repository}"/>
+               <mkdir dir="${destination}"/>
+               <echoproperties ></echoproperties>
+               <echo message="${equinox.launcher.jar}"/>
+               <echo message="${repository}"/>
+               <echo message="${destination}"/>
+               <java jar="${equinox.launcher.jar}" fork="true" failonerror="true" >
+                       <arg value="-application"/>
+                       <arg value="org.eclipse.equinox.p2.director"/>
+                       <arg value="-artifactRepository"/>
+                       <arg value="file:${repository}"/>
+                       <arg value="-metadataRepository"/>
+                       <arg value="file:${repository}"/>
+                       <arg value="-destination"/>
+                       <arg value="${destination}"/>
+                       <arg value="-bundlepool"/>
+                       <arg value="${destination}"/>
+                       <arg value="-profile"/>
+                       <arg value="${profile}"/>
+                       <arg value="-profileProperties" />
+                       <arg value="org.eclipse.update.install.features=true" />
+                       <arg value="-installIU"/>
+                       <arg value="${iu}"/>
+                       <arg value="-p2.os" />
+                       <arg value="${target.os}" />
+                       <arg value="-p2.ws" />
+                       <arg value="${target.ws}" />
+                       <arg value="-p2.arch" />
+                       <arg value="${target.arch}" />
+                       <arg value="-consoleLog"/>
+                       <jvmarg value="-Declipse.p2.data.area=${destination}/p2"/>
+                       <jvmarg value="-Declipse.p2.profile=${profile}"/>
+               </java>
+       </target>
+</project>
\ No newline at end of file

diff --git a/taxeditor-feature-product/feature.properties b/taxeditor-feature-product/feature.properties
new file mode 100644 (file)
index 0000000..173cefc
--- /dev/null
+++ b/taxeditor-feature-product/feature.properties
@@ -0,0 +1,2 @@
+productName=EDIT Taxonomic Editor\r
+productBlurb=EDIT Taxonomic Editor\n\Version: {productVersion}\n\n\Copyright (C) 2009 EDIT\n\European Distributed Institute of Taxonomy\n\http://www.e-taxonomy.eu\r

diff --git a/taxeditor-feature-product/feature.xml b/taxeditor-feature-product/feature.xml
new file mode 100644 (file)
index 0000000..8228a0e
--- /dev/null
+++ b/taxeditor-feature-product/feature.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="eu.etaxonomy.taxeditor.product.feature"
+      label="Taxonomic Editor"
+      version="2.1.0.qualifier"
+      plugin="eu.etaxonomy.taxeditor.application">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <includes
+         id="eu.etaxonomy.taxeditor.feature.dependencies"
+         version="0.0.0"/>
+
+   <plugin
+         id="eu.etaxonomy.cdmlib"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="eu.etaxonomy.taxeditor.application"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="eu.etaxonomy.taxeditor.bulkeditor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="eu.etaxonomy.taxeditor.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="eu.etaxonomy.taxeditor.navigation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="eu.etaxonomy.taxeditor.store"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

diff --git a/taxeditor-feature-product/plugin_customization.ini b/taxeditor-feature-product/plugin_customization.ini
new file mode 100644 (file)
index 0000000..333fab9
--- /dev/null
+++ b/taxeditor-feature-product/plugin_customization.ini
@@ -0,0 +1 @@
+org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true

diff --git a/taxeditor-feature-product/taxeditor.product b/taxeditor-feature-product/taxeditor.product
new file mode 100644 (file)
index 0000000..b67b2cf
--- /dev/null
+++ b/taxeditor-feature-product/taxeditor.product
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="%productName" id="eu.etaxonomy.taxeditor.application.product" application="eu.etaxonomy.taxeditor.application.application" version="2.1.0.qualifier" useFeatures="true" includeLaunchers="false">
+
+   <aboutInfo>
+      <text>
+         %productBlurb
+      </text>
+   </aboutInfo>
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <vmArgs>-Xmx256M</vmArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+   </launcherArgs>
+
+   <windowImages i16="/taxeditor-application/icons/256color_16x16.gif" i32="/taxeditor-application/icons/256color_32x32.gif" i48="/taxeditor-application/icons/256color_48x48.gif"/>
+
+   <splash
+      location="eu.etaxonomy.taxeditor.application"
+      startupProgressRect="5,447,366,15"
+      startupMessageRect="7,432,360,20"
+      startupForegroundColor="000000" />
+   <launcher name="Taxonomic Editor">
+      <solaris/>
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+
+   <vm>
+   </vm>
+
+
+   <plugins>
+   </plugins>
+
+   <features>
+      <feature id="eu.etaxonomy.taxeditor.product.feature" version="2.1.0.qualifier"/>
+   </features>
+
+   <configurations>
+      <plugin id="eu.etaxonomy.taxeditor.application" autoStart="true" startLevel="4" />
+   </configurations>
+
+</product>