summaryrefslogtreecommitdiffstats
authorRemko Tronçon2010-08-24 16:26:50 (GMT)
committer Remko Tronçon2010-08-24 16:26:50 (GMT)
commitdca422f55e12350faf24f90abf466df337a2578d (patch) (unidiff)
tree3550f6f311d0137333304a094c98ce3844907afd
downloadecppunit-master.zip
ecppunit-master.tar.gz
ecppunit-master.tar.bz2
Import.HEADmaster
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--.gitignore3
-rw-r--r--be.el_tramo.ecppunit.builder/.gitignore1
-rw-r--r--be.el_tramo.ecppunit.builder/.project11
-rw-r--r--be.el_tramo.ecppunit.builder/Build ECPPUnit.launch18
-rw-r--r--be.el_tramo.ecppunit.builder/build.properties83
-rw-r--r--be.el_tramo.ecppunit.builder/build.sh6
-rw-r--r--be.el_tramo.ecppunit.builder/build.xml43
-rw-r--r--be.el_tramo.ecppunit.feature/.project17
-rw-r--r--be.el_tramo.ecppunit.feature/build.properties1
-rw-r--r--be.el_tramo.ecppunit.feature/category.xml11
-rw-r--r--be.el_tramo.ecppunit.feature/feature.xml48
-rw-r--r--be.el_tramo.ecppunit/.classpath7
-rw-r--r--be.el_tramo.ecppunit/.project28
-rw-r--r--be.el_tramo.ecppunit/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--be.el_tramo.ecppunit/META-INF/MANIFEST.MF8
-rw-r--r--be.el_tramo.ecppunit/build.properties5
-rw-r--r--be.el_tramo.ecppunit/plugin.xml13
-rw-r--r--be.el_tramo.ecppunit/src/be/el_tramo/ecppunit/CPPUnitErrorParser.java28
18 files changed, 339 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7277e72
--- a/dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
1bin/
2.metadata
3*~
diff --git a/be.el_tramo.ecppunit.builder/.gitignore b/be.el_tramo.ecppunit.builder/.gitignore
new file mode 100644
index 0000000..567609b
--- a/dev/null
+++ b/be.el_tramo.ecppunit.builder/.gitignore
@@ -0,0 +1 @@
build/
diff --git a/be.el_tramo.ecppunit.builder/.project b/be.el_tramo.ecppunit.builder/.project
new file mode 100644
index 0000000..139afd4
--- a/dev/null
+++ b/be.el_tramo.ecppunit.builder/.project
@@ -0,0 +1,11 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<projectDescription>
3 <name>be.el_tramo.ecppunit.builder</name>
4 <comment></comment>
5 <projects>
6 </projects>
7 <buildSpec>
8 </buildSpec>
9 <natures>
10 </natures>
11</projectDescription>
diff --git a/be.el_tramo.ecppunit.builder/Build ECPPUnit.launch b/be.el_tramo.ecppunit.builder/Build ECPPUnit.launch
new file mode 100644
index 0000000..c87c9a1
--- a/dev/null
+++ b/be.el_tramo.ecppunit.builder/Build ECPPUnit.launch
@@ -0,0 +1,18 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
3<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
4<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
5<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
6<listEntry value="/be.el_tramo.ecppunit.builder/build.xml"/>
7</listAttribute>
8<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
9<listEntry value="1"/>
10</listAttribute>
11<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
12<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="be.el_tramo.ecppunit.builder"/>
13<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
14<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="clean,main,"/>
15<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
16<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/be.el_tramo.ecppunit.builder/build.xml}"/>
17<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
18</launchConfiguration>
diff --git a/be.el_tramo.ecppunit.builder/build.properties b/be.el_tramo.ecppunit.builder/build.properties
new file mode 100644
index 0000000..24e92ae
--- a/dev/null
+++ b/be.el_tramo.ecppunit.builder/build.properties
@@ -0,0 +1,83 @@
1topLevelElementType = feature
2topLevelElementId = be.el_tramo.ecppunit.feature
3runPackager=true
4archivePrefix=ecppunit
5collectingFolder=${archivePrefix}
6configs = *, *, *
7#groupConfigurations=true
8allowBinaryCycles = true
9
10p2.gathering=true
11# None of these seem to actually do something
12p2.metadata.repo.name=ECPPUnit Repository
13p2.artifact.repo.name=ECPPUnit Repository
14
15baseos=win32
16basews=win32
17basearch=x86
18
19#buildDirectory=set from ant
20buildType=I
21buildId=TestBuild
22buildLabel=${buildType}.${buildId}
23timestamp=007
24
25#The value to be used for the qualifier of a plugin or feature when you want to override the value computed by pde.
26#The value will only be applied to plugin or features indicating build.properties, qualifier = context
27#forceContextQualifier=<the value for the qualifier>
28
29#Enable / disable the generation of a suffix for the features that use .qualifier.
30#The generated suffix is computed according to the content of the feature
31#generateFeatureVersionSuffix=true
32
33############# BASE CONTROL #############
34#baseLocation=${base}/eclipse (set from build.xml)
35#Folder containing repositories whose content is needed to compile against
36#repoBaseLocation=${base}/repos
37#Folder where the content of the repositories from ${repoBaseLocation} will be made available as a form suitable to be compiled against
38#transformedRepoLocation=${base}/transformedRepos
39
40#Os/Ws/Arch/nl of the eclipse specified by baseLocation
41
42#this property indicates whether you want the set of plug-ins and features to be considered during the build to be limited to the ones reachable from the features / plugins being built
43filteredDependencyCheck=false
44
45#this property indicates whether the resolution should be done in development mode (i.e. ignore multiple bundles with singletons)
46resolution.devMode=false
47#pluginPath=
48
49skipBase=true
50eclipseURL=<url for eclipse download site>
51eclipseBuildId=<Id of Eclipse build to get>
52eclipseBaseURL=${eclipseURL}/eclipse-platform-${eclipseBuildId}-win32.zip
53
54
55############# MAP FILE CONTROL ################
56# This section defines CVS tags to use when fetching the map files from the repository.
57# If you want to fetch the map file from repository / location, change the getMapFiles target in the customTargets.xml
58
59skipMaps=true
60mapsRepo=:pserver:anonymous@example.com/path/to/repo
61mapsRoot=path/to/maps
62mapsCheckoutTag=HEAD
63
64#tagMaps=true
65mapsTagTag=v${buildId}
66
67
68############ REPOSITORY CONTROL ###############
69# The tags to use when fetching elements to build.
70# By default thebuilder will use whatever is in the maps.
71# This value takes the form of a comma separated list of repository identifier (like used in the map files) and the
72# overriding value
73# For example fetchTag=CVS=HEAD, SVN=v20050101
74# fetchTag=HEAD
75skipFetch=true
76
77# Java Compiler options
78logExtension=.log
79javacDebugInfo=false
80javacFailOnError=true
81javacVerbose=false
82javacSource=1.6
83javacTarget=1.6
diff --git a/be.el_tramo.ecppunit.builder/build.sh b/be.el_tramo.ecppunit.builder/build.sh
new file mode 100644
index 0000000..b8003e6
--- a/dev/null
+++ b/be.el_tramo.ecppunit.builder/build.sh
@@ -0,0 +1,6 @@
1eclipse_path=`which eclipse`
2eclipse_dir=`dirname $eclipse_path`
3launchers=($eclipse_dir/plugins/org.eclipse.equinox.launcher_*)
4launcher=${launchers[0]}
5
6java -jar ${launcher} -application org.eclipse.ant.core.antRunner -buildfile build.xml
diff --git a/be.el_tramo.ecppunit.builder/build.xml b/be.el_tramo.ecppunit.builder/build.xml
new file mode 100644
index 0000000..d107be9
--- a/dev/null
+++ b/be.el_tramo.ecppunit.builder/build.xml
@@ -0,0 +1,43 @@
1<project default="main">
2 <property file="build.properties"/>
3 <property name="buildDirectory" value="${basedir}/build"/>
4
5 <target name="main" depends="clean">
6 <property name="baseLocation" value="${eclipse.home}"/>
7 <property name="builder" value="${basedir}" />
8 <property name="buildTempFolder" value="${buildDirectory}" />
9 <property name="sourceDirectory" value="${basedir}/.." />
10 <property name="p2.category.definition" value="file:${buildDirectory}/features/be.el_tramo.ecppunit.feature/category.xml"/>
11
12 <!-- Set up the build directory -->
13 <mkdir dir="${buildDirectory}/features"/>
14 <mkdir dir="${buildDirectory}/plugins"/>
15 <copy todir="${buildDirectory}/features">
16 <fileset dir="${sourceDirectory}" includes="*.feature/**/*"/>
17 </copy>
18 <copy todir="${buildDirectory}/plugins">
19 <fileset dir="${sourceDirectory}">
20 <exclude name="**/bin/**/*"/>
21 <exclude name="**/bin"/>
22 <exclude name="*.feature/**/*"/>
23 <exclude name="*.feature"/>
24 <exclude name="*.builder/**/*"/>
25 <exclude name="*.builder"/>
26 </fileset>
27 </copy>
28
29 <ant antfile="${eclipse.pdebuild.scripts}/build.xml"/>
30
31 <!--<move todir="${basedir}">
32 <fileset dir="${buildDirectory}/${buildLabel}" includes="*.zip"/>
33 </move>-->
34
35 <!-- refresh the workspace -->
36 <!--<eclipse.convertPath fileSystemPath="${basedir}" property="resourcePath"/>
37 <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>-->
38 </target>
39
40 <target name="clean">
41 <delete dir="${buildDirectory}"/>
42 </target>
43</project>
diff --git a/be.el_tramo.ecppunit.feature/.project b/be.el_tramo.ecppunit.feature/.project
new file mode 100644
index 0000000..c49303c
--- a/dev/null
+++ b/be.el_tramo.ecppunit.feature/.project
@@ -0,0 +1,17 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<projectDescription>
3 <name>be.el_tramo.ecppunit.feature</name>
4 <comment></comment>
5 <projects>
6 </projects>
7 <buildSpec>
8 <buildCommand>
9 <name>org.eclipse.pde.FeatureBuilder</name>
10 <arguments>
11 </arguments>
12 </buildCommand>
13 </buildSpec>
14 <natures>
15 <nature>org.eclipse.pde.FeatureNature</nature>
16 </natures>
17</projectDescription>
diff --git a/be.el_tramo.ecppunit.feature/build.properties b/be.el_tramo.ecppunit.feature/build.properties
new file mode 100644
index 0000000..64f93a9
--- a/dev/null
+++ b/be.el_tramo.ecppunit.feature/build.properties
@@ -0,0 +1 @@
bin.includes = feature.xml
diff --git a/be.el_tramo.ecppunit.feature/category.xml b/be.el_tramo.ecppunit.feature/category.xml
new file mode 100644
index 0000000..c300925
--- a/dev/null
+++ b/be.el_tramo.ecppunit.feature/category.xml
@@ -0,0 +1,11 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<site>
3 <feature url="features/be.el_tramo.ecppunit.feature_1.0.0.qualifier.jar" id="be.el_tramo.ecppunit.feature" version="1.0.0.qualifier">
4 <category name="ecppunit"/>
5 </feature>
6 <category-def name="ecppunit" label="ECPPUnit">
7 <description>
8 Eclipse CPPUnit support
9 </description>
10 </category-def>
11</site>
diff --git a/be.el_tramo.ecppunit.feature/feature.xml b/be.el_tramo.ecppunit.feature/feature.xml
new file mode 100644
index 0000000..f993885
--- a/dev/null
+++ b/be.el_tramo.ecppunit.feature/feature.xml
@@ -0,0 +1,48 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<feature
3 id="be.el_tramo.ecppunit.feature"
4 label="ECPPUnit"
5 version="1.0.0.qualifier"
6 provider-name="el-tramo.be">
7
8 <description url="http://el-tramo.be/software/ecppunit">
9 Eclipse CPPUnit support
10 </description>
11
12 <copyright>Copyright (c) 2010 Remko Tronçon
13All rights reserved.</copyright>
14
15 <license>Redistribution and use in source and binary forms, with or without
16modification, are permitted provided that the following conditions are met:
17 * Redistributions of source code must retain the above copyright
18 notice, this list of conditions and the following disclaimer.
19 * Redistributions in binary form must reproduce the above copyright
20 notice, this list of conditions and the following disclaimer in the
21 documentation and/or other materials provided with the distribution.
22 * Neither the name of Remko Tronçon nor the
23 names of its contributors may be used to endorse or promote products
24 derived from this software without specific prior written permission.
25
26THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
27ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
28WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
29DISCLAIMED. IN NO EVENT SHALL REMKO TRONÇON BE LIABLE FOR ANY
30DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
31(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
32LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
33ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
34(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
35SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</license>
36
37 <url>
38 <update label="El Tramo" url="http://el-tramo.be/eclipse"/>
39 </url>
40
41 <plugin
42 id="be.el_tramo.ecppunit"
43 download-size="0"
44 install-size="0"
45 version="0.0.0"
46 unpack="false"/>
47
48</feature>
diff --git a/be.el_tramo.ecppunit/.classpath b/be.el_tramo.ecppunit/.classpath
new file mode 100644
index 0000000..ad32c83
--- a/dev/null
+++ b/be.el_tramo.ecppunit/.classpath
@@ -0,0 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<classpath>
3 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4 <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5 <classpathentry kind="src" path="src"/>
6 <classpathentry kind="output" path="bin"/>
7</classpath>
diff --git a/be.el_tramo.ecppunit/.project b/be.el_tramo.ecppunit/.project
new file mode 100644
index 0000000..5a4892e
--- a/dev/null
+++ b/be.el_tramo.ecppunit/.project
@@ -0,0 +1,28 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<projectDescription>
3 <name>be.el_tramo.ecppunit</name>
4 <comment></comment>
5 <projects>
6 </projects>
7 <buildSpec>
8 <buildCommand>
9 <name>org.eclipse.jdt.core.javabuilder</name>
10 <arguments>
11 </arguments>
12 </buildCommand>
13 <buildCommand>
14 <name>org.eclipse.pde.ManifestBuilder</name>
15 <arguments>
16 </arguments>
17 </buildCommand>
18 <buildCommand>
19 <name>org.eclipse.pde.SchemaBuilder</name>
20 <arguments>
21 </arguments>
22 </buildCommand>
23 </buildSpec>
24 <natures>
25 <nature>org.eclipse.pde.PluginNature</nature>
26 <nature>org.eclipse.jdt.core.javanature</nature>
27 </natures>
28</projectDescription>
diff --git a/be.el_tramo.ecppunit/.settings/org.eclipse.jdt.core.prefs b/be.el_tramo.ecppunit/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..e3d7e28
--- a/dev/null
+++ b/be.el_tramo.ecppunit/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
1#Mon Aug 23 11:44:35 CEST 2010
2eclipse.preferences.version=1
3org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
4org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
5org.eclipse.jdt.core.compiler.compliance=1.6
6org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
7org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
8org.eclipse.jdt.core.compiler.source=1.6
diff --git a/be.el_tramo.ecppunit/META-INF/MANIFEST.MF b/be.el_tramo.ecppunit/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..fd53af3
--- a/dev/null
+++ b/be.el_tramo.ecppunit/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
1Manifest-Version: 1.0
2Bundle-ManifestVersion: 2
3Bundle-Name: ECPPUnit
4Bundle-SymbolicName: be.el_tramo.ecppunit;singleton:=true
5Bundle-Version: 1.0.0.qualifier
6Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7Require-Bundle: org.eclipse.cdt.core
8Bundle-Vendor: el-tramo.be
diff --git a/be.el_tramo.ecppunit/build.properties b/be.el_tramo.ecppunit/build.properties
new file mode 100644
index 0000000..e9863e2
--- a/dev/null
+++ b/be.el_tramo.ecppunit/build.properties
@@ -0,0 +1,5 @@
1source.. = src/
2output.. = bin/
3bin.includes = META-INF/,\
4 .,\
5 plugin.xml
diff --git a/be.el_tramo.ecppunit/plugin.xml b/be.el_tramo.ecppunit/plugin.xml
new file mode 100644
index 0000000..078bf10
--- a/dev/null
+++ b/be.el_tramo.ecppunit/plugin.xml
@@ -0,0 +1,13 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<?eclipse version="3.4"?>
3<plugin>
4 <extension
5 id="CPPUnitErrorParser"
6 name="CPPUnit Error Parser"
7 point="org.eclipse.cdt.core.ErrorParser">
8 <errorparser
9 class="be.el_tramo.ecppunit.CPPUnitErrorParser">
10 </errorparser>
11 </extension>
12
13</plugin>
diff --git a/be.el_tramo.ecppunit/src/be/el_tramo/ecppunit/CPPUnitErrorParser.java b/be.el_tramo.ecppunit/src/be/el_tramo/ecppunit/CPPUnitErrorParser.java
new file mode 100644
index 0000000..371903f
--- a/dev/null
+++ b/be.el_tramo.ecppunit/src/be/el_tramo/ecppunit/CPPUnitErrorParser.java
@@ -0,0 +1,28 @@
1package be.el_tramo.ecppunit;
2
3import java.util.regex.Matcher;
4
5import org.eclipse.cdt.core.IMarkerGenerator;
6import org.eclipse.cdt.core.errorparsers.AbstractErrorParser;
7import org.eclipse.cdt.core.errorparsers.ErrorPattern;
8
9// Note: http://eclipse-cdt.sourcearchive.com/documentation/3.1.2-1/ErrorPattern_8java-source.html
10public class CPPUnitErrorParser extends AbstractErrorParser {
11 private static final ErrorPattern[] patterns = {
12 new ErrorPattern(".* line: (\\d+) (.*)", 2, 1, 0, 0, 0) {
13 @Override
14 public int getSeverity(Matcher matcher) {
15 return IMarkerGenerator.SEVERITY_ERROR_RESOURCE;
16 }
17
18 @Override
19 public String getDesc(Matcher matcher) {
20 return "Assertion failed";
21 }
22 }
23 };
24
25 public CPPUnitErrorParser() {
26 super(patterns);
27 }
28}