Merge pull request #42 from MichaelRueegg/master

Preparations for new release 1.0.0
IFS-HSR · Apr 8, 2016 · f463161 · f463161
2 parents 7617c3c + b2db8bf
commit f463161
Show file tree

Hide file tree

Showing 21 changed files with 39 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ junit-workspace/
 ch.hsr.ifs.sconsolidator.swtbottests/screenshots/
 gartenbau_tests
 *.pydevproject
+.DS_Store
diff --git a/ch.hsr.ifs.sconsolidator.core.tests/META-INF/MANIFEST.MF b/ch.hsr.ifs.sconsolidator.core.tests/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SConsolidator Core Test Plugin
 Bundle-SymbolicName: ch.hsr.ifs.sconsolidator.core.tests;singleton:=true
-Bundle-Version: 0.6.0.qualifier
-Fragment-Host: ch.hsr.ifs.sconsolidator.core;bundle-version="0.6.0"
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: ch.hsr.ifs.sconsolidator.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: IFS
 Require-Bundle: org.junit;bundle-version="4.8.1"

diff --git a/ch.hsr.ifs.sconsolidator.core.tests/pom.xml b/ch.hsr.ifs.sconsolidator.core.tests/pom.xml
@@ -3,11 +3,11 @@
 	<parent>
 		<groupId>ch.hsr.ifs.sconsolidator</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.6.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>ch.hsr.ifs.sconsolidator.core.tests</artifactId>
-	<version>0.6.0-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<name>SConsolidator - Core plugin tests</name>
 	<build>

diff --git a/ch.hsr.ifs.sconsolidator.core.tests/scons_files/test_projects/gartenbau/SConstruct b/ch.hsr.ifs.sconsolidator.core.tests/scons_files/test_projects/gartenbau/SConstruct
@@ -2,5 +2,6 @@ env = Environment()
 env.Append(CPPDEFINES={'Foo': 42,  'Bar': 'YES'})
 env.Append(CPPPATH=['cute/', 'src/shapes', '/usr/include/xorg'])
 env.Append(CCFLAGS='-O3')
+env.Append(CXXFLAGS='-O3 -std=c++11')
 env.StaticLibrary('gartenbau', Glob('src/shapes/*.cpp'))
 env.Program('test/gartenbau_tests.cpp', LIBS=['gartenbau'], LIBPATH='.')
diff --git a/ch.hsr.ifs.sconsolidator.core.tests/scons_files/test_projects/gartenbau/src/shapes/Shape.h b/ch.hsr.ifs.sconsolidator.core.tests/scons_files/test_projects/gartenbau/src/shapes/Shape.h
@@ -13,7 +13,7 @@ class Shape {
 	virtual double seeds() const =0;
 	virtual std::string name() const =0;
 
-	static const double seedRatio = 0.1;
+	static constexpr double seedRatio = 0.1;
 	static const double PI;
 };
 

diff --git a/ch.hsr.ifs.sconsolidator.core/META-INF/MANIFEST.MF b/ch.hsr.ifs.sconsolidator.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %CoreBundleName
 Bundle-SymbolicName: ch.hsr.ifs.sconsolidator.core;singleton:=true
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.cdt.core;bundle-version="5.0.0",
  org.eclipse.cdt.managedbuilder.gnu.ui;bundle-version="7.0.0",

diff --git a/ch.hsr.ifs.sconsolidator.core/pom.xml b/ch.hsr.ifs.sconsolidator.core/pom.xml
@@ -3,11 +3,11 @@
 	<parent>
 		<groupId>ch.hsr.ifs.sconsolidator</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.6.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>ch.hsr.ifs.sconsolidator.core</artifactId>
-	<version>0.6.0-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>SConsolidator - Core plugin</name>
 </project>
diff --git a/ch.hsr.ifs.sconsolidator.depviz.feature/feature.xml b/ch.hsr.ifs.sconsolidator.depviz.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="ch.hsr.ifs.sconsolidator.depviz.feature"
       label="%featureName"
-      version="0.6.0.qualifier"
+      version="1.0.0.qualifier"
       provider-name="%providerName"
       plugin="ch.hsr.ifs.sconsolidator.depviz">
 

diff --git a/ch.hsr.ifs.sconsolidator.depviz.feature/pom.xml b/ch.hsr.ifs.sconsolidator.depviz.feature/pom.xml
@@ -6,10 +6,10 @@
 	<parent>
 		<groupId>ch.hsr.ifs.sconsolidator</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.6.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>ch.hsr.ifs.sconsolidator.depviz.feature</artifactId>
-	<version>0.6.0-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	<name>SConsolidator - Dependency Visualization feature</name>
 </project>
diff --git a/ch.hsr.ifs.sconsolidator.depviz/META-INF/MANIFEST.MF b/ch.hsr.ifs.sconsolidator.depviz/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %DepVizBundleName
 Bundle-SymbolicName: ch.hsr.ifs.sconsolidator.depviz;singleton:=true
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: ch.hsr.ifs.sconsolidator.depviz.DependencyVisualizationPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/ch.hsr.ifs.sconsolidator.depviz/pom.xml b/ch.hsr.ifs.sconsolidator.depviz/pom.xml
@@ -3,11 +3,11 @@
 	<parent>
 		<groupId>ch.hsr.ifs.sconsolidator</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.6.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>ch.hsr.ifs.sconsolidator.depviz</artifactId>
-	<version>0.6.0-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>SConsolidator - Dependency Visualization plugin</name>
 </project>
diff --git a/ch.hsr.ifs.sconsolidator.feature/feature.xml b/ch.hsr.ifs.sconsolidator.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="ch.hsr.ifs.sconsolidator.feature"
       label="%featureName"
-      version="0.6.0.qualifier"
+      version="1.0.0.qualifier"
       provider-name="%providerName"
       plugin="ch.hsr.ifs.sconsolidator.core">
 

diff --git a/ch.hsr.ifs.sconsolidator.feature/pom.xml b/ch.hsr.ifs.sconsolidator.feature/pom.xml
@@ -6,10 +6,10 @@
 	<parent>
 		<groupId>ch.hsr.ifs.sconsolidator</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.6.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>ch.hsr.ifs.sconsolidator.feature</artifactId>
-	<version>0.6.0-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	<name>SConsolidator - Core Feature</name>
 </project>
diff --git a/ch.hsr.ifs.sconsolidator.help/META-INF/MANIFEST.MF b/ch.hsr.ifs.sconsolidator.help/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: ch.hsr.ifs.sconsolidator.help; singleton:=true
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: %bundleVendor
diff --git a/ch.hsr.ifs.sconsolidator.help/html/whatsnew.html b/ch.hsr.ifs.sconsolidator.help/html/whatsnew.html
@@ -10,6 +10,14 @@
 <h1>What's new in SConsolidator</h1>
 <p><b>Changelog</b></p>
 
+<ul>
+<li><b>1.0.0</b>
+<ul>
+<li>Fixed issues with ignoring CXXFlags resulting in the CDT indexer not being able to parse C++11/14 code properly</li>
+<li>Use colors of CDT console settings in SConsolidator build console</li>
+</ul>
+</ul>
+
 <ul>
 <li><b>0.6.0</b>
 <ul>

diff --git a/ch.hsr.ifs.sconsolidator.help/pom.xml b/ch.hsr.ifs.sconsolidator.help/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <groupId>ch.hsr.ifs.sconsolidator</groupId>
     <artifactId>parent</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>ch.hsr.ifs.sconsolidator.help</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <name>SConsolidator - Help plugin</name>
 </project>
diff --git a/ch.hsr.ifs.sconsolidator.swtbottests/META-INF/MANIFEST.MF b/ch.hsr.ifs.sconsolidator.swtbottests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: ch.hsr.ifs.sconsolidator.swtbottests
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: ch.hsr.ifs.sconsolidator.swtbottests.SWTTestPlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.swtbot.junit4_x;bundle-version="2.0.4",
  org.apache.log4j;bundle-version="1.2.13",
  org.eclipse.ui;bundle-version="3.7.0",
- ch.hsr.ifs.sconsolidator.core;bundle-version="0.6.0",
+ ch.hsr.ifs.sconsolidator.core;bundle-version="1.0.0",
  org.eclipse.swtbot.eclipse.finder;bundle-version="2.2.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/ch.hsr.ifs.sconsolidator.swtbottests/pom.xml b/ch.hsr.ifs.sconsolidator.swtbottests/pom.xml
@@ -3,12 +3,12 @@
 	<parent>
 		<groupId>ch.hsr.ifs.sconsolidator</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.6.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.hsr.ifs.sconsolidator</groupId>
 	<artifactId>swtbottests</artifactId>
-	<version>0.6.0-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<name>SConsolidator - SWTBot Tests</name>
 	<build>

diff --git a/ch.hsr.ifs.sconsolidator.updates/category.xml b/ch.hsr.ifs.sconsolidator.updates/category.xml
@@ -3,10 +3,10 @@
    <description name="SConsolidator" url="http://sconsolidator.com/update">
       Eclipse plug-in for SCons
    </description>
-   <feature url="features/ch.hsr.ifs.sconsolidator.feature_0.6.0.qualifier.jar" id="ch.hsr.ifs.sconsolidator.feature" version="0.6.0.qualifier">
+   <feature url="features/ch.hsr.ifs.sconsolidator.feature_1.0.0.qualifier.jar" id="ch.hsr.ifs.sconsolidator.feature" version="1.0.0.qualifier">
       <category name="SConsolidator"/>
    </feature>
-   <feature url="features/ch.hsr.ifs.sconsolidator.depviz.feature_0.6.0.qualifier.jar" id="ch.hsr.ifs.sconsolidator.depviz.feature" version="0.6.0.qualifier">
+   <feature url="features/ch.hsr.ifs.sconsolidator.depviz.feature_1.0.0.qualifier.jar" id="ch.hsr.ifs.sconsolidator.depviz.feature" version="1.0.0.qualifier">
       <category name="SConsolidator"/>
    </feature>
    <category-def name="SConsolidator" label="Eclipse plug-in for SCons">

diff --git a/ch.hsr.ifs.sconsolidator.updates/pom.xml b/ch.hsr.ifs.sconsolidator.updates/pom.xml
@@ -6,10 +6,10 @@
 	<parent>
 		<groupId>ch.hsr.ifs.sconsolidator</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.6.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>ch.hsr.ifs.sconsolidator.updates</artifactId>
-	<version>0.6.0-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	<name>SConsolidator - Update site</name>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.hsr.ifs.sconsolidator</groupId>
 	<artifactId>parent</artifactId>
-	<version>0.6.0-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>SConsolidator</name>
 	<prerequisites>