Merge branch 'develop' into 'master'

Develop

See merge request !6

bundles/fr.irisa.cairn.jnimap.generator/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: fr.irisa.cairn.jnimap.generator
 Bundle-Vendor: University of Rennes 1
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-SymbolicName: fr.irisa.cairn.jnimap.generator;singleton:=true
 Require-Bundle: org.eclipse.xpand;visibility:=reexport,
  org.eclipse.xtend;visibility:=reexport,

bundles/fr.irisa.cairn.jnimap.generator/xtend-gen/fr/irisa/cairn/jnimap/generator/build/JNIMakefileTemplate.java

@@ -78,6 +78,17 @@ public class JNIMakefileTemplate {
     }
   }
   
+  public int checkHostTypeSupport(final Mapping m, final HostType t) {
+    int _xifexpression = (int) 0;
+    boolean _contains = m.getHosts().contains(t);
+    if (_contains) {
+      _xifexpression = 1;
+    } else {
+      _xifexpression = 0;
+    }
+    return _xifexpression;
+  }
+  
   public CharSequence launcherContent(final Mapping m) {
     StringConcatenation _builder = new StringConcatenation();
     _builder.append(".PHONY: ");
@@ -107,8 +118,10 @@ public class JNIMakefileTemplate {
     _builder.append("ARCH=64");
     _builder.newLine();
     _builder.append("\t\t");
-    _builder.append("AUTODETECT=1");
-    _builder.newLine();
+    _builder.append("AUTODETECT=");
+    int _checkHostTypeSupport = this.checkHostTypeSupport(m, HostType.MACOSX64);
+    _builder.append(_checkHostTypeSupport, "\t\t");
+    _builder.newLineIfNotEmpty();
     _builder.append("\t");
     _builder.append("else ");
     _builder.newLine();
@@ -116,8 +129,10 @@ public class JNIMakefileTemplate {
     _builder.append("ARCH=32");
     _builder.newLine();
     _builder.append("\t\t");
-    _builder.append("AUTODETECT=1");
-    _builder.newLine();
+    _builder.append("AUTODETECT=");
+    int _checkHostTypeSupport_1 = this.checkHostTypeSupport(m, HostType.MACOSX32);
+    _builder.append(_checkHostTypeSupport_1, "\t\t");
+    _builder.newLineIfNotEmpty();
     _builder.append("\t");
     _builder.append("endif");
     _builder.newLine();
@@ -139,17 +154,21 @@ public class JNIMakefileTemplate {
     _builder.append("ARCH=64");
     _builder.newLine();
     _builder.append("\t\t\t");
-    _builder.append("AUTODETECT=1");
-    _builder.newLine();
+    _builder.append("AUTODETECT=");
+    int _checkHostTypeSupport_2 = this.checkHostTypeSupport(m, HostType.LINUX64);
+    _builder.append(_checkHostTypeSupport_2, "\t\t\t");
+    _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
     _builder.append("else ");
     _builder.newLine();
-    _builder.append("\t\t");
+    _builder.append("\t\t\t");
     _builder.append("ARCH=32");
     _builder.newLine();
-    _builder.append("\t\t");
-    _builder.append("AUTODETECT=1");
-    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("AUTODETECT=");
+    int _checkHostTypeSupport_3 = this.checkHostTypeSupport(m, HostType.LINUX32);
+    _builder.append(_checkHostTypeSupport_3, "\t\t\t");
+    _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
     _builder.append("endif");
     _builder.newLine();
@@ -181,7 +200,7 @@ public class JNIMakefileTemplate {
     _builder.append("else");
     _builder.newLine();
     _builder.append("\t");
-    _builder.append("@echo \"Cannot detect host machine. Please use one of the following :\"");
+    _builder.append("@echo \"Cannot detect host machine, or the host machine is unsupported. Please use one of the following :\"");
     _builder.newLine();
     {
       EList<HostType> _hosts = m.getHosts();
@@ -210,7 +229,7 @@ public class JNIMakefileTemplate {
     _builder.append("else");
     _builder.newLine();
     _builder.append("\t");
-    _builder.append("@echo \"Cannot detect host machine. Please use one of the following :\"");
+    _builder.append("@echo \"Cannot detect host machine, or the host machine is unsupported. Please use one of the following :\"");
     _builder.newLine();
     {
       EList<HostType> _hosts_1 = m.getHosts();

bundles/fr.irisa.cairn.jnimap.generator/xtend-gen/fr/irisa/cairn/jnimap/generator/java/JNIJavaTemplate.java

@@ -26,6 +26,7 @@ import org.eclipse.xtext.generator.IFileSystemAccess;
 import org.eclipse.xtext.xbase.lib.Extension;
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.StringExtensions;
 
 /**
  * This class is responsible for the interface to C and library loading.
@@ -349,6 +350,35 @@ public class JNIJavaTemplate {
     return _builder;
   }
   
+  public CharSequence checkHostTypeSupport(final Mapping m, final HostType t) {
+    CharSequence _xblockexpression = null;
+    {
+      StringConcatenation _builder = new StringConcatenation();
+      String _firstUpper = StringExtensions.toFirstUpper(t.getLiteral());
+      _builder.append(_firstUpper);
+      final String platformName = _builder.toString();
+      CharSequence _xifexpression = null;
+      boolean _contains = m.getHosts().contains(t);
+      if (_contains) {
+        StringConcatenation _builder_1 = new StringConcatenation();
+        _builder_1.append("loader = new JNI");
+        String _ID = this._commonExtensions.ID(m);
+        _builder_1.append(_ID);
+        _builder_1.append(platformName);
+        _builder_1.append("();");
+        _xifexpression = _builder_1;
+      } else {
+        StringConcatenation _builder_2 = new StringConcatenation();
+        _builder_2.append("throw new RuntimeException(\"");
+        _builder_2.append(platformName);
+        _builder_2.append(" is not supported.\");");
+        _xifexpression = _builder_2;
+      }
+      _xblockexpression = _xifexpression;
+    }
+    return _xblockexpression;
+  }
+  
   public String nativeInterfaceContent(final Mapping m) {
     final Set<Mapping> extMaps = new LinkedHashSet<Mapping>();
     final Consumer<ExternalLibrary> _function = (ExternalLibrary e) -> {
@@ -428,19 +458,15 @@ public class JNIJavaTemplate {
     _builder.append("if (arch.equals(\"32\")) {");
     _builder.newLine();
     _builder.append("\t\t\t\t");
-    _builder.append("loader = new JNI");
-    String _ID_4 = this._commonExtensions.ID(m);
-    _builder.append(_ID_4, "\t\t\t\t");
-    _builder.append("Linux_32();");
+    CharSequence _checkHostTypeSupport = this.checkHostTypeSupport(m, HostType.LINUX32);
+    _builder.append(_checkHostTypeSupport, "\t\t\t\t");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t\t");
     _builder.append("} else {");
     _builder.newLine();
     _builder.append("\t\t\t\t");
-    _builder.append("loader = new JNI");
-    String _ID_5 = this._commonExtensions.ID(m);
-    _builder.append(_ID_5, "\t\t\t\t");
-    _builder.append("Linux_64();");
+    CharSequence _checkHostTypeSupport_1 = this.checkHostTypeSupport(m, HostType.LINUX64);
+    _builder.append(_checkHostTypeSupport_1, "\t\t\t\t");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t\t");
     _builder.append("}");
@@ -449,10 +475,8 @@ public class JNIJavaTemplate {
     _builder.append("} else if (osName.equals(\"Windows XP\")) {");
     _builder.newLine();
     _builder.append("\t\t\t");
-    _builder.append("loader = new JNI");
-    String _ID_6 = this._commonExtensions.ID(m);
-    _builder.append(_ID_6, "\t\t\t");
-    _builder.append("Cygwin_32();");
+    CharSequence _checkHostTypeSupport_2 = this.checkHostTypeSupport(m, HostType.CYGWIN32);
+    _builder.append(_checkHostTypeSupport_2, "\t\t\t");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
     _builder.append("} else if (osName.equals(\"Mac OS X\")) {");
@@ -461,19 +485,15 @@ public class JNIJavaTemplate {
     _builder.append("if (arch.equals(\"32\")) {");
     _builder.newLine();
     _builder.append("\t\t\t\t");
-    _builder.append("loader = new JNI");
-    String _ID_7 = this._commonExtensions.ID(m);
-    _builder.append(_ID_7, "\t\t\t\t");
-    _builder.append("Macosx_32();");
+    CharSequence _checkHostTypeSupport_3 = this.checkHostTypeSupport(m, HostType.MACOSX32);
+    _builder.append(_checkHostTypeSupport_3, "\t\t\t\t");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t\t");
     _builder.append("} else {");
     _builder.newLine();
     _builder.append("\t\t\t\t");
-    _builder.append("loader = new JNI");
-    String _ID_8 = this._commonExtensions.ID(m);
-    _builder.append(_ID_8, "\t\t\t\t");
-    _builder.append("Macosx_64();");
+    CharSequence _checkHostTypeSupport_4 = this.checkHostTypeSupport(m, HostType.MACOSX64);
+    _builder.append(_checkHostTypeSupport_4, "\t\t\t\t");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t\t");
     _builder.append("} ");

bundles/fr.irisa.cairn.jnimap.generator/xtend-src/fr/irisa/cairn/jnimap/generator/build/JNIMakefileTemplate.xtend

@@ -33,6 +33,10 @@ class JNIMakefileTemplate {
 		}
 	}
 	
+	def checkHostTypeSupport(Mapping m, HostType t) {
+		if (m.hosts.contains(t)) 1 else 0
+	}
+	
 	//The top-level launcher that calls specialized makefiles for each host
 	def CharSequence launcherContent(Mapping m) '''
 		.PHONY: «m.hosts.join(" ", [host|host.dirname])»
@@ -44,10 +48,10 @@ class JNIMakefileTemplate {
 			ARCH=$(shell sysctl -a hw.optional.x86_64 | cut -d" " -f2)
 			ifeq ($(ARCH),1)
 				ARCH=64
-				AUTODETECT=1
+				AUTODETECT=«m.checkHostTypeSupport(HostType.MACOSX64)»
 			else 
 				ARCH=32
-				AUTODETECT=1
+				AUTODETECT=«m.checkHostTypeSupport(HostType.MACOSX32)»
 			endif
 		else
 			ifeq ($(SYSTEM),Linux)
@@ -55,10 +59,10 @@ class JNIMakefileTemplate {
 				ARCH=$(shell uname -m)
 				ifeq ($(ARCH),x86_64)
 					ARCH=64
-					AUTODETECT=1
+					AUTODETECT=«m.checkHostTypeSupport(HostType.LINUX64)»
 				else 
-				ARCH=32
-				AUTODETECT=1
+					ARCH=32
+					AUTODETECT=«m.checkHostTypeSupport(HostType.LINUX32)»
 				endif
 			else
 				AUTODETECT=0
@@ -71,7 +75,7 @@ class JNIMakefileTemplate {
 			@$(MAKE) -s -f $(HOST)_$(ARCH)/Makefile clean
 			@$(MAKE) -s -f $(HOST)_$(ARCH)/Makefile lib
 		else
-			@echo "Cannot detect host machine. Please use one of the following :"
+			@echo "Cannot detect host machine, or the host machine is unsupported. Please use one of the following :"
 			«FOR host : m.hosts»
 				@echo "    - make «host.dirname» "
 			«ENDFOR»
@@ -82,7 +86,7 @@ class JNIMakefileTemplate {
 			@echo ">> Autodetecting host machine : $(HOST)_$(ARCH)"
 			@$(MAKE) -s -f $(HOST)_$(ARCH)/Makefile clean
 		else
-			@echo "Cannot detect host machine. Please use one of the following :"
+			@echo "Cannot detect host machine, or the host machine is unsupported. Please use one of the following :"
 			«FOR host : m.hosts»
 				@echo "    - make -s -f «host.dirname»/Makefile clean "
 			«ENDFOR»

bundles/fr.irisa.cairn.jnimap.generator/xtend-src/fr/irisa/cairn/jnimap/generator/java/JNIJavaTemplate.xtend

@@ -130,6 +130,15 @@ class JNIJavaTemplate {
 		}
 	'''
 	
+	def checkHostTypeSupport(Mapping m, HostType t) {
+		val platformName = '''«t.literal.toFirstUpper»'''
+		
+		if (m.hosts.contains(t))
+			'''loader = new JNI«m.ID»«platformName»();'''
+		else 
+			'''throw new RuntimeException("«platformName» is not supported.");'''
+	}
+	
 	def nativeInterfaceContent(Mapping m) {
 		val Set<Mapping> extMaps = new LinkedHashSet()
 		m.externalLibraries.forEach[e|extMaps.add(e.getMapping())]
@@ -157,17 +166,17 @@ class JNIJavaTemplate {
 				String arch   = System.getProperty("sun.arch.data.model");
 				if (osName.equals("Linux")) {
 					if (arch.equals("32")) {
-						loader = new JNI«m.ID»Linux_32();
+						«m.checkHostTypeSupport(HostType.LINUX32)»
 					} else {
-						loader = new JNI«m.ID»Linux_64();
+						«m.checkHostTypeSupport(HostType.LINUX64)»
 					}
 				} else if (osName.equals("Windows XP")) {
-					loader = new JNI«m.ID»Cygwin_32();
+					«m.checkHostTypeSupport(HostType.CYGWIN32)»
 				} else if (osName.equals("Mac OS X")) {
 					if (arch.equals("32")) {
-						loader = new JNI«m.ID»Macosx_32();
+						«m.checkHostTypeSupport(HostType.MACOSX32)»
 					} else {
-						loader = new JNI«m.ID»Macosx_64();
+						«m.checkHostTypeSupport(HostType.MACOSX64)»
 					} 
 				} else  {
 					throw new RuntimeException("Unsupported Operating system : " + osName+"_"+arch);

bundles/fr.irisa.cairn.jnimap.runtime/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JNIMap Runtime
 Bundle-SymbolicName: fr.irisa.cairn.jnimap.runtime
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-Vendor: IRISA
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: fr.irisa.cairn.jnimap.runtime

bundles/fr.irisa.cairn.jnimap.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: fr.irisa.cairn.jnimap.ui
 Bundle-Vendor: University of Rennes 1
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-SymbolicName: fr.irisa.cairn.jnimap.ui;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext.ui,

bundles/fr.irisa.cairn.jnimap/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: fr.irisa.cairn.jnimap
 Bundle-Vendor: University of Rennes 1
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-SymbolicName: fr.irisa.cairn.jnimap;singleton:=true
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,

bundles/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId>
     <artifactId>fr.irisa.cairn.gecos.tools.jnimapper.root</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <relativePath>..</relativePath>  
   </parent>
 

features/fr.irisa.cairn.gecos.tools.jnimapper.feature/feature.xml

-<feature id="fr.irisa.cairn.gecos.tools.jnimapper.feature" label="GeCoS JNI Mapper Tools" version="1.3.0.qualifier" provider-name="IRISA/INRIA">
+<feature id="fr.irisa.cairn.gecos.tools.jnimapper.feature" label="GeCoS JNI Mapper Tools" version="1.3.1.qualifier" provider-name="IRISA/INRIA">
 
    <description url="http://gecos.gforge.inria.fr/">
       GeCoS JNI mapper DSL (Xtext-based).

features/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId>
     <artifactId>fr.irisa.cairn.gecos.tools.jnimapper.root</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <relativePath>..</relativePath>  
   </parent>
 

gecos-buildtools @ e050ab1e

-Subproject commit fdc8ff68b5ef03ba31ad8d93420d432d44427c75
+Subproject commit e050ab1e48fc15ec02cabcbf4acdd7b95a9407f5

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId>
   <artifactId>fr.irisa.cairn.gecos.tools.jnimapper.root</artifactId>
-  <version>1.3.0</version>
+  <version>1.3.1</version>
   <packaging>pom</packaging>
 
   <parent>
@@ -16,7 +16,7 @@
   <properties>
     <target.groupId>fr.irisa.cairn.gecos.tools.jnimapper</target.groupId>
     <target.artifactId>fr.irisa.cairn.gecos.tools.jnimapper.target</target.artifactId>
-    <target.version>1.3.0</target.version>
+    <target.version>1.3.1</target.version>
   </properties>
 
   <scm>

releng/fr.irisa.cairn.gecos.tools.jnimapper.target/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId>
     <artifactId>fr.irisa.cairn.gecos.tools.jnimapper.releng</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <relativePath>..</relativePath>
   </parent>
 

releng/fr.irisa.cairn.gecos.tools.jnimapper.update/category.xml

@@ -3,11 +3,11 @@
      GeCoS JNI Mapper update site
   </description>
 
-  <feature id="fr.irisa.cairn.gecos.tools.jnimapper.feature" version="1.3.0.qualifier">
+  <feature id="fr.irisa.cairn.gecos.tools.jnimapper.feature" version="1.3.1.qualifier">
      <category name="jni"/>
   </feature>
   <!-- source features (and their bundles) are automatically generated by maven when using "release" profile -->
-  <feature id="fr.irisa.cairn.gecos.tools.jnimapper.feature.source" version="1.3.0.qualifier">
+  <feature id="fr.irisa.cairn.gecos.tools.jnimapper.feature.source" version="1.3.1.qualifier">
      <category name="jni"/>
   </feature>
 

releng/fr.irisa.cairn.gecos.tools.jnimapper.update/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId>
     <artifactId>fr.irisa.cairn.gecos.tools.jnimapper.releng</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <relativePath>..</relativePath>
   </parent>
 

releng/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId>
     <artifactId>fr.irisa.cairn.gecos.tools.jnimapper.root</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <relativePath>..</relativePath>
   </parent>
 

tests/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId>
     <artifactId>fr.irisa.cairn.gecos.tools.jnimapper.root</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <relativePath>..</relativePath>  
   </parent>