Add Solaris 9 support.

Author: wangzhengbo

ChangeLog.txt

@@ -1,3 +1,6 @@
+07/06/2014 - 0.3
+  1. Load libgcc_s.so.1 if it exists in tcc lib path.
+  
 06/14/2014 - 0.2
   1. Fixed libtcc.dylib and libtcc1.a error for Mac OS X.
   2. Add Solaris x86 support.

build.properties

@@ -1,5 +1,5 @@
 project.name      = TCC4Java
-project.version   = 0.2
+project.version   = 0.3
 project.encoding  = UTF-8
 
 lib.dir           = lib

readme.txt

@@ -28,7 +28,7 @@ What is TCC4Java?
      FreeBSD 9.0 x86/x64 (The FreeBSD based os such as GhostBSD, PC-BSD, ArchBSD, MidnightBSD are also supported)
      NetBSD 6.1.4 x86/x64
      DragonFlyBSD 3.6.2 x86/x64
-     Solaris 10/11 x86
+     Solaris 9/10/11 x86
   4. Supported jdk:
      jdk 1.5 or later
   5. TCC4Java is released under Apache License 2.0.

runTest.bat

@@ -1,13 +1,15 @@
 @echo off
 
+set TCC4JAVA_VERSION=0.3
+
 set CLASSPATH=.\lib\commons-io-2.2.jar
 set CLASSPATH=%CLASSPATH%;.\lib\hamcrest-core-1.3.jar
 set CLASSPATH=%CLASSPATH%;.\lib\jna-4.1.0.jar
 set CLASSPATH=%CLASSPATH%;.\lib\junit-4.11.jar
 set CLASSPATH=%CLASSPATH%;.\lib\slf4j-api-1.7.7.jar
 set CLASSPATH=%CLASSPATH%;.\lib\slf4j-simple-1.7.7.jar
-set CLASSPATH=%CLASSPATH%;.\dist\0.2\TCC4Java-0.2.jar
-set CLASSPATH=%CLASSPATH%;.\dist\0.2\TCC4Java-0.2-test.jar
+set CLASSPATH=%CLASSPATH%;.\dist\%TCC4JAVA_VERSION%\TCC4Java-%TCC4JAVA_VERSION%.jar
+set CLASSPATH=%CLASSPATH%;.\dist\%TCC4JAVA_VERSION%\TCC4Java-%TCC4JAVA_VERSION%-test.jar
 
 set TESTS=AllTests
 IF NOT "%1"=="" (

runTest.sh

@@ -1,12 +1,14 @@
 #!/usr/bin/env bash
 
+TCC4JAVA_VERSION=0.3
+
 CLASSPATH=./lib/commons-io-2.2.jar
 CLASSPATH=$CLASSPATH:./lib/hamcrest-core-1.3.jar
 CLASSPATH=$CLASSPATH:./lib/junit-4.11.jar
 CLASSPATH=$CLASSPATH:./lib/slf4j-api-1.7.7.jar
 CLASSPATH=$CLASSPATH:./lib/slf4j-simple-1.7.7.jar
-CLASSPATH=$CLASSPATH:./dist/0.2/TCC4Java-0.2.jar
-CLASSPATH=$CLASSPATH:./dist/0.2/TCC4Java-0.2-test.jar
+CLASSPATH=$CLASSPATH:./dist/$TCC4JAVA_VERSION/TCC4Java-$TCC4JAVA_VERSION.jar
+CLASSPATH=$CLASSPATH:./dist/$TCC4JAVA_VERSION/TCC4Java-$TCC4JAVA_VERSION-test.jar
 
 if [ "$(uname -s)" == "GNU/kFreeBSD" ]; then
   LIB_JNA=./lib/kFreeBSD/jna-3.2.7.jar

src/cn/com/tcc/State.java

@@ -141,7 +141,8 @@ public boolean setOptions(String options) {
 	public boolean addIncludePath(String includePath) {
 		logger.debug(String.format("Add include path %s.", includePath));
 		checkStatus();
-		return (tcc.tcc_add_include_path(tccState, includePath) != ERROR_RETURN_VALUE);
+		return (tcc.tcc_add_include_path(tccState,
+				new File(includePath).getAbsolutePath()) != ERROR_RETURN_VALUE);
 	}
 
 	/**
@@ -153,7 +154,8 @@ public boolean addIncludePath(String includePath) {
 	public boolean addSysIncludePath(String includePath) {
 		logger.debug(String.format("Add system include path %s.", includePath));
 		checkStatus();
-		return (tcc.tcc_add_sysinclude_path(tccState, includePath) != ERROR_RETURN_VALUE);
+		return (tcc.tcc_add_sysinclude_path(tccState,
+				new File(includePath).getAbsolutePath()) != ERROR_RETURN_VALUE);
 	}
 
 	/**
@@ -206,7 +208,8 @@ public void undefineSymbol(String sym) {
 	public boolean addFile(String filePath) {
 		logger.debug(String.format("Add file %s.", filePath));
 		checkStatus();
-		return (tcc.tcc_add_file(tccState, filePath) != ERROR_RETURN_VALUE);
+		return (tcc
+				.tcc_add_file(tccState, new File(filePath).getAbsolutePath()) != ERROR_RETURN_VALUE);
 	}
 
 	/**

src/cn/com/tcc/TCC.java

@@ -24,7 +24,10 @@ public final class TCC {
 	protected static String tccPath = "";
 
 	/* TCC library name */
-	private static final String DLL_LIB_NAME = "tcc";
+	private static final String LIB_TCC = "tcc";
+
+	/* GCC library name */
+	private static final String LIB_GCC = "libgcc_s.so.1";
 
 	private static final String ENV_CONFIG_TCC_DIR = "CONFIG_TCCDIR";
 	private static final String ENV_CONFIG_OS = "CONFIG_OS";
@@ -59,7 +62,14 @@ public static void init(String tccPath) {
 		if ((tccPath != null) && (tccPath.trim().length() > 0)
 				&& !tccPath.equals(TCC.tccPath)) {
 			TCC.tccPath = tccPath;
-			logger.info(String.format("Set tccPath to %s.", tccPath));
+			logger.debug(String.format("Set tccPath to %s.", tccPath));
+
+			File libGcc = new File(TCC.getSharedLibPath(), LIB_GCC);
+			if (libGcc.isFile() && libGcc.exists()) {
+				System.load(libGcc.getAbsolutePath());
+				logger.debug(String.format("Load library %s successfully.",
+						LIB_GCC));
+			}
 		}
 	}
 
@@ -72,7 +82,7 @@ protected TCCLibrary initialValue() {
 			try {
 				tcc = loadNativeLibrary();
 
-				logger.info(String.format("%s initialized for thread %s.",
+				logger.debug(String.format("%s initialized for thread %s.",
 						TCC.class.getSimpleName(), Thread.currentThread()
 								.getName()));
 			} catch (Throwable e) {
@@ -134,7 +144,7 @@ protected static String getLibPath() {
 				.getAbsolutePath();
 	}
 
-	protected static String getSharedLibPath() {
+	public static String getSharedLibPath() {
 		return new File(tccPath, getSharedLibPath(getOSName()))
 				.getAbsolutePath();
 	}
@@ -269,7 +279,7 @@ protected static String getNativeLibraryResourcePrefix(OS osType,
 	private static TCCLibrary loadNativeLibrary() {
 		try {
 			// Get what the system "thinks" the library name should be.
-			String libName = DLL_LIB_NAME;
+			String libName = LIB_TCC;
 			String libNativeName = System.mapLibraryName(libName);
 
 			// Slice up the library name.

tcc/sunos/x86/libgcc_s.so.1

@@ -4,11 +4,11 @@
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({ AddFileTest.class, AddFunctionTest.class, AddIncludePathTest.class,
-		AddSysIncludePathTest.class, CompileStringTest.class,
-		DefineSymbolTest.class, DeleteTest.class, GetVarTest.class,
-		OutputFileTest.class, RunTest.class, SetErrorFuncTest.class,
-		SetLibPathTest.class, SetOptionsTest.class, SetOutputTypeTest.class,
-		UndefineSymbolTest.class })
+@Suite.SuiteClasses({ AddFileTest.class, AddFunctionTest.class,
+		AddIncludePathTest.class, AddSysIncludePathTest.class,
+		CompileStringTest.class, DefineSymbolTest.class, DeleteTest.class,
+		GetVarTest.class, OutputFileTest.class, RunTest.class,
+		SetErrorFuncTest.class, SetLibPathTest.class, SetOptionsTest.class,
+		SetOutputTypeTest.class, UndefineSymbolTest.class })
 public class AllTests {
 }