Bug 433984 - [QDesginer] Refactoring - move C++ project generation to "standard" code generation (correct broken build, since intermediate changes had been pushed unintentionnaly)

2 files changed, 105 insertions, 50 deletions

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml
index cccbcf146e4..356fd735dcd 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml
@@ -1,43 +1,105 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.cpp.feature" label="%featureName" provider-name="%providerName" version="1.0.0.qualifier">

-

-   <description url="http://www.example.com/description">

-      C++ code generation from Papyrus. The feature includes

-- A C++ profile, enabling the specification for C++ features, for instance: pointers, friends, constructor initializers

-- A code generator from UML enriched with the C++ profile

-- A C++ view allowing simple editing of opaque behaviors and manipulation of C++ profile attributes

-   </description>

-

-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      Copyright (c) 2012 CEA LIST

-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

-   </copyright>

-

-   <license url="%licenseURL">

-      %license

-   </license>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.cpp.codegen" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.cpp.codegen.ui" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.cpp.profile" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.views.cpp" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.acceleo" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.acceleo.debug" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.acceleo.ui" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.texteditor.cdt" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.texteditor.model" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.texteditor.modelexplorer" install-size="0" unpack="false" version="0.0.0"/>

-

-</feature>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.extra.cpp.feature"
+      label="%featureName"
+      version="1.0.0.qualifier"
+      provider-name="%providerName">
+
+   <description url="http://www.example.com/description">
+      C++ code generation from Papyrus. The feature includes
+- A C++ profile, enabling the specification for C++ features, for instance: pointers, friends, constructor initializers
+- A code generator from UML enriched with the C++ profile
+- A C++ view allowing simple editing of opaque behaviors and manipulation of C++ profile attributes
+   </description>
+
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2012 CEA LIST
+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
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.papyrus.cpp.codegen"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.cpp.codegen.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.cpp.profile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.views.cpp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.acceleo"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.acceleo.debug"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.acceleo.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.texteditor.cdt"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.texteditor.model"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.texteditor.modelexplorer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.cpp.cdtproject"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.xml
index afd65712d26..c8d81b9e394 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.xml
@@ -105,13 +105,6 @@ http://www.eclipse.org/legal/epl-v10.html
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.papyrus.qompass.designer.cpp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.papyrus.qompass.designer.validation"
          download-size="0"
          install-size="0"