1 files changed, 37 insertions, 22 deletions
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/plugin/build.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/plugin/build.xtend
index c5546794ee2..ee9b3579c22 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/plugin/build.xtend
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/plugin/build.xtend
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2020 Borland Software Corporation, CEA LIST, Artal and others
+ * Copyright (c) 2013, 2020, 2021 Borland Software Corporation, CEA LIST, Artal and others
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -11,32 +11,47 @@
  * Contributors: 
  *   Michael Golubev (Montages) - initial API and implementation
  *   Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
+ *   Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Bug 574258: [Toolsmiths] Improve GMF generation for manifest.MF and build.properties
  *****************************************************************************/
 package xpt.plugin
 
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenPlugin
+import org.eclipse.papyrus.gmf.codegen.util.AbstractBuild
 
-@com.google.inject.Singleton class build {
+@com.google.inject.Singleton class build extends AbstractBuild{
 
-def qualifiedClassName(GenPlugin it) '''build.properties'''
-def fullPath(GenPlugin it) '''«qualifiedClassName(it)»'''
+	def qualifiedClassName(GenPlugin it) '''build.properties'''
+	def fullPath(GenPlugin it) '''«qualifiedClassName(it)»'''
 
-def build(GenPlugin it)'''
-«includes»
-«compileOrders»
-'''
+	def build(GenPlugin it)'''
+		«init(ID)»
+		«license»
+		«includes»
+		«compileOrders»
+		«declareSourceFolder»
+		«declareOutputFolders»
+	'''
+	
+	def declareOutputFolders(GenPlugin it) '''
+		output.. = bin/
+	'''
+	def includes(GenPlugin it)
+		'''
+		«buildBinaryIncludes»
+		«buildSourceIncludes»
+	'''
 
-def includes(GenPlugin it)'''
-bin.includes = .,\
-               icons/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               messages.properties,\
-               .options
-'''
-def compileOrders(GenPlugin it)'''
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-'''}
-\ No newline at end of file
+	def compileOrders(GenPlugin it)'''
+		jars.compile.order = .
+	'''
+	
+	def declareSourceFolder(GenPlugin it)'''
+		«buildSourceFolder»
+	'''
+	
+	def license(GenPlugin it)'''
+		«buildLicense(it.editorGen.copyrightText)»
+	'''
+	
+	
+}
+\ No newline at end of file