add Linux and Mac Version

fujaba · Oct 21, 2014 · 5f8b34c · 5f8b34c
1 parent 2fa67cd
commit 5f8b34c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/Adapter.xml b/Adapter.xml
@@ -26,6 +26,19 @@ Class-Path: .
 			<fileset dir="src/main/java/org/sdmlib/doc/interfaze/"/>
 			<zipfileset casesensitive="false" dir="Adapter/GraphViz/Resources" />
 		</jar>
+		<jar destfile="build/GraphViz_mac.jar" manifest="build/MANIFEST.MF">
+			<fileset dir="build/temp/" />
+			<fileset dir="Adapter/GraphViz/Java" />
+			<fileset dir="src/main/java/org/sdmlib/doc/interfaze/"/>
+		</jar>
+		<jar destfile="build/GraphViz_linux.jar" manifest="build/MANIFEST.MF">
+			<fileset dir="build/temp/" />
+			<fileset dir="Adapter/GraphViz/Java" />
+			<fileset dir="src/main/java/org/sdmlib/doc/interfaze/"/>
+		</jar>
+
+
+
 		<delete dir="build/temp"></delete>
 
 		<!-- Source-graphViz -->

diff --git a/Adapter/GraphViz/Java/org/sdmlib/doc/GraphViz.java b/Adapter/GraphViz/Java/org/sdmlib/doc/GraphViz.java
@@ -129,20 +129,19 @@ public boolean drawImg(String imgName, String context)
     	  File root = new File(".");
          String rootPath = root.getPath().replace("file:\\", "");
          String makeimageFile = rootPath + "\\win32\\makeimage.bat";
-//         String makeimageFile = rootPath + "\\Adapter\\GraphViz\\Resources\\win32\\makeimage.bat";
          command = new String[]
          { makeimageFile, "doc\\" + imgName, rootPath };
       }
-      else if ((System.getProperty("os.name").toLowerCase()).contains("mac"))
-      {
-    	  File root = new File(".");
-         String rootPath = root.getPath().replace("file:", "");
-         String makeimageFile = rootPath
-            + "/osx_lion/makeimage.command";
-
-         command = new String[]
-         { makeimageFile, imgName, rootPath };
-      }
+//      else if ((System.getProperty("os.name").toLowerCase()).contains("mac"))
+//      {
+//    	  File root = new File(".");
+//         String rootPath = root.getPath().replace("file:", "");
+//         String makeimageFile = rootPath
+//            + "/osx_lion/makeimage.command";
+//
+//         command = new String[]
+//         { makeimageFile, imgName, rootPath };
+//      }
       else
       { // let's assume it's linux'ish (works also for mac)
          command = new String[]