Windows port with mingw-w64 and msys.

asfernandes · asfernandes · commit a20e3c319d0b · 2016-05-16T16:29:32.000-03:00
diff --git a/Makefile b/Makefile
@@ -8,7 +8,12 @@ LD	:= $(CXX)
 SRC_DIR		:= src/native
 BUILD_DIR	:= build
 OUT_DIR		:= output
+
+ifeq ($(OS),Windows_NT)
+SHRLIB_EXT	:= dll
+else
 SHRLIB_EXT	:= so
+endif
 
 OBJ_DIR := $(BUILD_DIR)/$(TARGET)
 BIN_DIR := $(OUT_DIR)/$(TARGET)/bin
@@ -20,7 +25,11 @@ OBJ_DIRS := $(addprefix $(OBJ_DIR)/,$(MODULES))
 SRCS := $(foreach sdir,$(SRC_DIRS),$(wildcard $(sdir)/*.cpp))
 OBJS := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS))
 
-CXX_FLAGS := -ggdb -fPIC -MMD -MP
+CXX_FLAGS := -ggdb -MMD -MP
+
+ifneq ($(OS),Windows_NT)
+CXX_FLAGS += -fPIC
+endif
 
 ifeq ($(TARGET),release)
 	CXX_FLAGS += -O3
@@ -45,7 +54,7 @@ all: mkdirs \
 mkdirs: $(OBJ_DIRS) $(BIN_DIR) $(LIB_DIR)
 
 $(OBJ_DIRS) $(BIN_DIR) $(LIB_DIR):
-	@mkdir -p $@
+	@"mkdir" -p $@
 
 clean:
 	@rm -rf $(BUILD_DIR) $(OUT_DIR)
diff --git a/src/etc/bin/create-package.sh b/src/etc/bin/create-package.sh
@@ -3,10 +3,22 @@
 THIS_DIR=`readlink -f $0`
 THIS_DIR=`dirname $THIS_DIR`
 
+if [ "$OS" = "Windows_NT" ]; then
+	THIS_DIR=`echo "$THIS_DIR" | tr \\\\ /`
+fi
+
 BASE_DIR=$THIS_DIR/../../..
 TARGET_DIR=`readlink -f $1`
 CONFIG=release
 
+if [ "$OS" = "Windows_NT" ]; then
+	SHRLIB_EXT=dll
+	SHELL_EXT=bat
+else
+	SHRLIB_EXT=so
+	SHELL_EXT=sh
+fi
+
 cd $BASE_DIR
 make TARGET=$CONFIG
 
@@ -20,18 +32,24 @@ mkdir -p \
 	$TARGET_DIR/lib \
 	$TARGET_DIR/scripts
 
-cp $BASE_DIR/src/etc/bin/setenv.sh $TARGET_DIR/bin
-cp $BASE_DIR/src/etc/bin/fbjava-deployer.sh $TARGET_DIR/bin
+cp $BASE_DIR/src/etc/bin/setenv.$SHELL_EXT $TARGET_DIR/bin
+cp $BASE_DIR/src/etc/bin/fbjava-deployer.$SHELL_EXT $TARGET_DIR/bin
 cp $BASE_DIR/src/fbjava/target/*.jar $TARGET_DIR/jar
 cp $BASE_DIR/src/fbjava/target/dependency/*.jar $TARGET_DIR/jar
-cp $BASE_DIR/output/$CONFIG/lib/libfbjava.so $TARGET_DIR/lib
+cp $BASE_DIR/output/$CONFIG/lib/libfbjava.$SHRLIB_EXT $TARGET_DIR/lib
 cp $BASE_DIR/src/fbjava/src/main/resources/org/firebirdsql/fbjava/*.sql $TARGET_DIR/scripts
 cp $BASE_DIR/src/etc/conf/fbjava.conf $TARGET_DIR/conf
 cp $BASE_DIR/src/etc/scripts/java-security.sql $TARGET_DIR/scripts
 
-if [ -f $TARGET_DIR/conf/java-security.fdb ]; then
-	rm $TARGET_DIR/conf/java-security.fdb
+cd $TARGET_DIR/conf/
+
+if [ -f java-security.fdb ]; then
+	rm java-security.fdb
 fi
 
-echo "create database '$TARGET_DIR/conf/java-security.fdb' default character set utf8;" | isql -q
+echo "create database 'java-security.fdb' default character set utf8;" | isql -q
 isql $TARGET_DIR/conf/java-security.fdb -q -i $TARGET_DIR/scripts/java-security.sql
+
+# Transform file name to lower case in Windows
+mv java-security.fdb java-security.tmp
+mv java-security.tmp java-security.fdb
diff --git a/src/etc/bin/fbjava-deployer.bat b/src/etc/bin/fbjava-deployer.bat
@@ -0,0 +1,12 @@
+@echo off
+setlocal
+
+set THIS_DIR=%~dp0
+
+call "%THIS_DIR%\setenv.bat"
+
+set PATH=%FB_DIR%\bin;%PATH%
+
+"%JAVA_HOME%\bin\java" -cp "%JAR_DIR%\*" ^
+	"-Djava.library.path=%NATIVE_DIR%" ^
+	org.firebirdsql.fbjava.Deployer %*
diff --git a/src/etc/bin/setenv.bat b/src/etc/bin/setenv.bat
@@ -0,0 +1,2 @@
+set BIN_DIR=%THIS_DIR%
+set JAR_DIR=%THIS_DIR%\..\jar
diff --git a/src/etc/conf/fbjava.conf b/src/etc/conf/fbjava.conf
@@ -1,5 +1,5 @@
 Plugin = JAVA {
-	Module = $(this)/../lib/libfbjava.so
+	Module = $(this)/../lib/libfbjava
 	Config = JAVA_config
 }
 
diff --git a/src/native/fbjava/fbjava.cpp b/src/native/fbjava/fbjava.cpp
@@ -30,7 +30,13 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <dirent.h>
+
+#ifdef WIN32
+#include <windows.h>
+#else
 #include <dlfcn.h>
+#endif
+
 #include "jni.h"
 
 using namespace Firebird;
@@ -44,34 +50,62 @@ using std::vector;
 //------------------------------------------------------------------------------
 
 
-class DynLibrary	//// TODO: Windows port
+#ifdef WIN32
+static const char DEFAULT_PATH_SEP = '\\';
+static HMODULE hDllInstance = NULL;
+#else
+static const char DEFAULT_PATH_SEP = '/';
+#endif
+
+
+//------------------------------------------------------------------------------
+
+
+class DynLibrary
 {
 public:
 	DynLibrary(const string& filename)
 		: filename(filename)
 	{
+#ifdef WIN32
+		module = LoadLibrary(filename.c_str());
+#else
 		module = dlopen(filename.c_str(), RTLD_NOW);
+#endif
 	}
 
 	~DynLibrary()
 	{
+#ifdef WIN32
+		FreeLibrary(module);
+#else
 		dlclose(module);
+#endif
 	}
 
 public:
 	// Lookup a library symbol. Throw exception in case of error.
 	template <typename T>
 	void findSymbol(const char* name, T& ptr)
 	{
+#ifdef WIN32
+		ptr = reinterpret_cast<T>(GetProcAddress(module, name));
+#else
 		ptr = reinterpret_cast<T>(dlsym(module, name));
+#endif
 
 		if (!ptr)
 			throw runtime_error(string("Symbol '") + name + "' not found in '" + filename + "'.");
 	}
 
 private:
 	string filename;
+
+#ifdef WIN32
+	HMODULE module;
+#else
 	void* module;
+#endif
 };
 
 
@@ -100,8 +134,8 @@ static string findJvmLibrary(const char* javaHome)
 {
 #ifdef WIN32
 	static const char* const DEFAULT_PLACES[] = {
-		"\\jre\\bin\\\\server\\jvm.dll",
-		"\\jre\\lib\\\\client\\jvm.dll"
+		"\\jre\\bin\\server\\jvm.dll",
+		"\\jre\\lib\\client\\jvm.dll"
 	};
 #else
 #ifdef __amd64
@@ -227,10 +261,26 @@ static jmethodID getMethodID(JNIEnv* env, jclass cls, const char* name, const ch
 
 static void init()
 {
+#ifdef WIN32
+	string libFile;
+
+	{	// scope
+		char buffer[MAX_PATH];
+		GetModuleFileName(hDllInstance, buffer, sizeof(buffer));
+		libFile = buffer;
+	}
+#else
 	Dl_info dlInfo;
 	if (dladdr((void*) init, &dlInfo) == 0)
 		throw runtime_error("Cannot get the plugin library path.");
 
+	string libFile(dlInfo.dli_fname);
+#endif
+
+	string libDir(libFile.substr(0, strrchr(libFile.c_str(), DEFAULT_PATH_SEP) - libFile.c_str()));
+	libDir += DEFAULT_PATH_SEP;
+	libDir += "../jar";
+
 	const char* javaHome = getenv("JAVA_HOME");
 
 	if (!javaHome)
@@ -296,16 +346,6 @@ static void init()
 	jmethodID urlClassLoaderLoadClassId = getMethodID(env, urlClassLoaderCls, "loadClass",
 		"(Ljava/lang/String;Z)Ljava/lang/Class;");
 
-#ifdef WIN32
-	static const char DEFAULT_PATH_SEP = '\\';
-#else
-	static const char DEFAULT_PATH_SEP = '/';
-#endif
-
-	string libDir(dlInfo.dli_fname, strrchr(dlInfo.dli_fname, DEFAULT_PATH_SEP) - dlInfo.dli_fname);
-	libDir += DEFAULT_PATH_SEP;
-	libDir += "../jar";
-
 	vector<string> classPathEntries;
 
 	DIR* dir = opendir(libDir.c_str());
@@ -317,12 +357,24 @@ static void init()
 
 	while ((dent = readdir(dir)))
 	{
+		string name(dent->d_name);
+
+#ifdef WIN32
+		if (name != "." && name != "..")
+#else
 		if (dent->d_type == DT_REG || dent->d_type == DT_LNK)
+#endif
 		{
-			string name(dent->d_name);
-
 			if (name.length() > 4 && name.substr(name.length() - 4) == ".jar")
-				classPathEntries.push_back("file://" + libDir + DEFAULT_PATH_SEP + dent->d_name);
+			{
+				string protocol("file://");
+
+#ifdef WIN32
+				protocol += "/";
+#endif
+
+				classPathEntries.push_back(protocol + libDir + DEFAULT_PATH_SEP + dent->d_name);
+			}
 		}
 	}
 
@@ -364,7 +416,7 @@ static void init()
 	jmethodID mainInitializeId = getStaticMethodID(env, mainCls, "initialize", "(Ljava/lang/String;)V");
 	checkJavaException(env);
 
-	jstring nativeLibrary = env->NewStringUTF(dlInfo.dli_fname);
+	jstring nativeLibrary = env->NewStringUTF(libFile.c_str());
 	if (!nativeLibrary)
 		checkJavaException(env);
 
@@ -387,3 +439,14 @@ extern "C" void /*FB_EXPORTED*/ FB_PLUGIN_ENTRY_POINT(IMaster* master)
 		fprintf(stderr, "%s\n", e.what());
 	}
 }
+
+
+#ifdef WIN32
+BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, void*)
+{
+	if (dwReason == DLL_PROCESS_ATTACH)
+		hDllInstance = hInstance;
+
+	return TRUE;
+}
+#endif

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+set BIN_DIR=%THIS_DIR%`
	`2`	`+set JAR_DIR=%THIS_DIR%\..\jar`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`Plugin = JAVA {`
`2`		`- Module = $(this)/../lib/libfbjava.so`
	`2`	`+ Module = $(this)/../lib/libfbjava`
`3`	`3`	`Config = JAVA_config`
`4`	`4`	`}`
`5`	`5`