[CIShell-SVN] SF.net SVN: cishell: [604] trunk/templates/org.cishell.templates/src/org/ cishell/templates/staticexecutable/StaticExecutableAlgorithmFactory.java

[<bh...@us...>]

Revision: 604
          http://cishell.svn.sourceforge.net/cishell/?rev=604&view=rev
Author:   bh2
Date:     2008-01-24 10:35:08 -0800 (Thu, 24 Jan 2008)

Log Message:
-----------
Added fallback code such that on a 64-bit linux machine, a 32-bit linux static executable will be called if there is no 64-bit linux static executable.

Modified Paths:
--------------
    trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableAlgorithmFactory.java

Modified: trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableAlgorithmFactory.java
===================================================================
--- trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableAlgorithmFactory.java	2008-01-23 20:54:25 UTC (rev 603)
+++ trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableAlgorithmFactory.java	2008-01-24 18:35:08 UTC (rev 604)
@@ -79,6 +79,8 @@
 		private String MACOSX;
 		private String ALGORITHM_WIN32;
 		private String WIN32;
+		private String ALGORITHM_LINUX_X86;
+		private String LINUX;
 		private String ALGORITHM_DEFAULT;
 		Data[] data;
         Dictionary parameters;
@@ -96,8 +98,9 @@
     		MACOSX = "macosx";
     		ALGORITHM_WIN32 = ALGORITHM + "win32/";
     		WIN32 = "win32";
+    		ALGORITHM_LINUX_X86 = ALGORITHM + "linux.x86/";
+    		LINUX = "linux";
     		ALGORITHM_DEFAULT = ALGORITHM + "default/";
-            
         }
 
         public Data[] execute() {
@@ -154,6 +157,8 @@
             	path = ALGORITHM_WIN32;
             } else if(os.equals(MACOSX) && entries.contains(ALGORITHM_MACOSX_PPC)) {
             	path = ALGORITHM_MACOSX_PPC;
+            } else if(os.equals(LINUX) && entries.contains(ALGORITHM_LINUX_X86)) {
+            	path = ALGORITHM_LINUX_X86;
             }
             
             String platform_path = ALGORITHM + os + "." + arch + "/";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.