update makefiles

Add support for MinGW

Author: raedrizqie

builds/posix/Makefile.in

@@ -256,7 +256,11 @@ endif
 %.vers: $(ROOT)/builds/posix/%.vers
 	sh vers.sh $(firstword $@)
 
+ifeq ($(PLATFORM),win32)
+export_lists:
+else
 export_lists: $(ALLVERS)
+endif
 
 #___________________________________________________________________________
 # LibTomMath - used by cross-builds
@@ -315,7 +319,7 @@ $(RE2_LIB):	$(RE2_Objs)
 libcds:
 	mkdir -p $(LIBCDS)/lib/$(TARGET)
 	cd $(LIBCDS)/lib/$(TARGET); \
-	cmake -DCMAKE_BUILD_TYPE=$(FB_CMAKE_BUILD_TYPE) -DCMAKE_CXX_COMPILER="$(CXX)" -DCMAKE_CXX_FLAGS=-fPIC $(LIBCDS)
+	cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=$(FB_CMAKE_BUILD_TYPE) -DCMAKE_CXX_COMPILER="$(CXX)" -DCMAKE_CXX_FLAGS=-fPIC $(LIBCDS)
 	AR="$(AR)" $(MAKE) -C $(LIBCDS)/lib/$(TARGET)
 
 ifeq ($(TARGET),Debug)
@@ -547,14 +551,18 @@ $(LIBIBUTIL_SO): $(UTIL_Objects)
 # most of utilities, including network server and UDF support
 #
 
-.PHONY:	firebird_server fb_lock_print fbguard fbsvcmgr fbtracemgr gbak gfix gsec gsplit gstat isql nbackup
+.PHONY:	firebird_server fb_lock_print fbguard fbsvcmgr fbtracemgr gbak gfix gsec gsplit gstat isql nbackup instreg instsvc instclient
 
+ifeq ($(PLATFORM),win32)
+utilities: firebird_server fb_lock_print fbguard fbsvcmgr fbtracemgr gbak gfix gsec gsplit gstat isql nbackup udfsupport instreg instsvc instclient
+else
 utilities: firebird_server fb_lock_print fbguard fbsvcmgr fbtracemgr gbak gfix gsec gsplit gstat isql nbackup udfsupport
+endif
 
 firebird_server:	$(FB_DAEMON)
 
 $(FB_DAEMON):	$(Remote_Server_Objects) $(COMMON_LIB)
-	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIB_GUI) $(LINK_LIBS)
 
 fb_lock_print:	$(LOCKPRINT)
 
@@ -564,7 +572,7 @@ $(LOCKPRINT):	$(LOCKPRINT_Objects) $(COMMON_LIB)
 fbguard:		$(FBGUARD)
 
 $(FBGUARD):		$(FBGUARD_Objects) $(COMMON_LIB)
-	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIB_GUI) $(LINK_LIBS)
 
 fbsvcmgr:		$(FBSVCMGR)
 
@@ -614,6 +622,21 @@ nbackup:		$(NBACKUP)
 $(NBACKUP):		$(NBACKUP_Objects) $(COMMON_LIB)
 	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
 
+instreg:		$(INSTREG)
+
+$(INSTREG):		$(INSTREG_Objects) $(COMMON_LIB)
+	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+instsvc:		$(INSTSVC)
+
+$(INSTSVC):		$(INSTSVC_Objects) $(COMMON_LIB)
+	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+instclient:		$(INSTCLIENT)
+
+$(INSTCLIENT):		$(INSTCLIENT_Objects) $(COMMON_LIB)
+	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
 
 #___________________________________________________________________________
 # plugins - some of them are required to build examples, use separate entry for them
@@ -636,6 +659,12 @@ ifeq ($(TARGET),Debug)
 	BUILD_DEBUG:=auth_debug
 endif
 
+ifeq ($(PLATFORM),win32)
+PLUGIN_SONAME=$(notdir $@)
+else
+PLUGIN_SONAME=$(notdir $@).0
+endif
+
 plugins: udr legacy_user_management legacy_auth_server srp_user_management trace $(BUILD_DEBUG) udf_compat chacha profiler
 
 udr:	$(UDR_PLUGIN) $(PLUGINS)/udr_engine.conf
@@ -644,31 +673,31 @@ $(PLUGINS)/udr_engine.conf: $(ROOT)/src/plugins/udr_engine/udr_engine.conf
 	cp $^ $@
 
 $(UDR_PLUGIN):	$(UDRENG_Objects) $(COMMON_LIB)
-	$(LINK_UDRENG) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_UDRENG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
+	$(LINK_UDRENG) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_UDRENG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
  $(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libudr_engine.$(SHRLIB_EXT))
 
 legacy_user_management:	$(LEGACY_USER_MANAGER)
 
 $(LEGACY_USER_MANAGER):	$(LEGACY_USERS_MANAGE_Objects) $(COMMON_LIB)
-	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(RE2LIB) $(FIREBIRD_LIBRARY_LINK)\
+	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_PLUG_LIBS) $(RE2LIB) $(FIREBIRD_LIBRARY_LINK)\
  $(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libLegacy_UserManager.$(SHRLIB_EXT))
 
 chacha:	$(CHACHA)
 
 $(CHACHA):	$(Chacha_Objects) $(COMMON_LIB)
-	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
+	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
  $(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libChaCha.$(SHRLIB_EXT))
 
 legacy_auth_server:	$(LEGACY_AUTH_SERVER)
 
 $(LEGACY_AUTH_SERVER):	$(LEGACY_AUTH_SERVER_Objects) $(COMMON_LIB)
-	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
+	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
  $(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libLegacy_Auth.$(SHRLIB_EXT))
 
 profiler:	$(PROFILER)
 
 $(PROFILER):	$(Profiler_Objects) $(COMMON_LIB)
-	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
+	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
  $(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libDefault_Profiler.$(SHRLIB_EXT))
 
 trace:	$(FBTRACE)
@@ -679,13 +708,13 @@ $(FBTRACE):	$(FBTRACE_UTIL_Objects) $(COMMON_LIB)
 auth_debug:	$(AUTH_DEBUGGER)
 
 $(AUTH_DEBUGGER):	$(AUTH_DEBUGGER_Objects) $(COMMON_LIB)
-	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
+	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
  $(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libAuth_Debug.$(SHRLIB_EXT))
 
 srp_user_management: $(SRP_USER_MANAGER)
 
 $(SRP_USER_MANAGER):	$(SRP_USERS_MANAGE_Objects) $(COMMON_LIB)
-	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
+	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
  $(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libSrp.$(SHRLIB_EXT))
 
 udf_compat:	$(UDF_BACKWARD_COMPATIBILITY) $(COMPAT_SQL)

builds/posix/Makefile.in.examples

@@ -67,8 +67,16 @@ export PATH
 #endif
 GPRE_FLAGS=	-m -z -n
 
-LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),$(LIB),$(LIB)/../intl))
-LINK_DARWIN_RPATH = -Wl,-rpath,@loader_path/../$(TARGET)/firebird
+ifeq (@USE_RPATH@,1)
+    LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),$(LIB),$(LIB)/../intl))
+else
+    LIB_LINK_RPATH =
+endif
+ifeq ($(PLATFORM),DARWIN)
+    LINK_DARWIN_RPATH = -Wl,-rpath,@loader_path/../$(TARGET)/firebird
+else
+    LINK_DARWIN_RPATH =
+endif
 LIB_LINK_MAPFILE =
 
 EXAMPLES_DEST=	$(GEN_ROOT)/examples
@@ -91,7 +99,7 @@ EMPLOYEE_DB=	$(EXAMPLES_DEST)/employee.fdb
 FINAL_EMPDB=	$(EXAMPLES_FB)/empbuild/employee.fdb
 INTLEMP_DB=	$(EXAMPLES_DEST)/intlemp.fdb
 
-EXTAUTH_PLUGIN=	$(EXAMPLES_FB)/prebuilt/libfbSampleExtAuth.$(SHRLIB_EXT)
+EXTAUTH_PLUGIN=	$(EXAMPLES_FB)/prebuilt/$(LIB_PREFIX)fbSampleExtAuth.$(SHRLIB_EXT)
 
 .PHONY: all examples
 

builds/posix/Makefile.in.extauth

@@ -0,0 +1,92 @@
+#  The contents of this file are subject to the Initial
+#  Developer's Public License Version 1.0 (the "License");
+#  you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
+#  https://www.firebirdsql.org/en/initial-developer-s-public-license-version-1-0/
+#
+#  Software distributed under the License is distributed AS IS,
+#  WITHOUT WARRANTY OF ANY KIND, either express or implied.
+#  See the License for the specific language governing rights
+#  and limitations under the License.
+#
+#  The Original Code was created by Alexander Peshkoff
+#  for the Firebird Open Source RDBMS project.
+#
+#  Copyright (c) 2020 Alexander Peshkoff <peshkoff@mail.ru>
+#  and all contributors signed below.
+#
+#  All Rights Reserved.
+#  Contributor(s): ______________________________________.
+
+ifndef ROOT
+  ROOT=../..
+endif
+#ROOT=$(shell cd ../..; pwd)
+
+PLUGINS=$(ROOT)/plugins
+BIN=$(ROOT)/bin
+LIB=$(ROOT)/lib
+
+LIB_PREFIX=
+SHRLIB_EXT=@SHRLIB_EXT@
+EXEC_EXT=@EXEEXT@
+
+ifndef INTERMED
+  INTERMED=.
+endif
+
+ifdef OUT
+  OUT_BIN=$(OUT)/bin
+  OUT_PLUG=$(OUT)/plugins
+else
+  OUT_BIN=.
+  OUT_PLUG=.
+endif
+
+TOMCRYPT_COMPILE=-DUSE_LTM -DLTM_DESC
+
+SIMPLE_KEY_AUTH_NAME=$(LIB_PREFIX)fbSampleExtAuth.$(SHRLIB_EXT)
+BLD_SIMPLE_KEY_AUTH=$(OUT_PLUG)/$(SIMPLE_KEY_AUTH_NAME)
+SIMPLE_KEY_AUTH=$(PLUGINS)/$(SIMPLE_KEY_AUTH_NAME)
+
+KEYGEN_NAME=fbSampleExtAuthKeygen$(EXEC_EXT)
+BLD_KEYGEN=$(OUT_BIN)/$(KEYGEN_NAME)
+KEYGEN=$(BIN)/$(KEYGEN_NAME)
+
+KEYGEN_objects=$(INTERMED)/keygen.o
+TCWRAP_objects=$(INTERMED)/TcWrapper.o
+KEY_AUTH_objects=$(INTERMED)/ExtAuth.o
+
+CXXFLAGS=-std=c++17 -I$(ROOT)/include $(TOMCRYPT_COMPILE)
+LDFLAGS=-L$(LIB)
+
+LINK_LIBS=-lfbclient -ltomcrypt -ltommath
+
+$(INTERMED)/%.o: ./%.cpp
+	$(CXX) $(CXXFLAGS) -c $(firstword $<) -o $@
+
+.PHONY:		all keygen plugin install
+
+all:		keygen plugin
+
+keygen:		$(BLD_KEYGEN)
+
+$(BLD_KEYGEN):	$(KEYGEN_objects) $(TCWRAP_objects)
+	$(CXX) $(LDFLAGS) $^ -o $@ $(LINK_LIBS)
+
+plugin:		$(BLD_SIMPLE_KEY_AUTH)
+
+$(BLD_SIMPLE_KEY_AUTH):	$(KEY_AUTH_objects) $(TCWRAP_objects)
+	$(CXX) -shared $(LDFLAGS) $^ -o $@ $(LINK_LIBS)
+
+clean:
+	rm -f $(INTERMED)/*.o* $(BLD_KEYGEN) $(BLD_SIMPLE_KEY_AUTH)
+
+install:	$(SIMPLE_KEY_AUTH) $(KEYGEN)
+
+$(SIMPLE_KEY_AUTH): $(BLD_SIMPLE_KEY_AUTH)
+	cp $^ $@
+
+$(KEYGEN): $(BLD_KEYGEN)
+	cp $^ $@
+

builds/posix/Makefile.in.plugins_examples

@@ -60,6 +60,16 @@ include     $(ROOT)/gen/make.shared.variables
 
 all: udrcpp_example dc_example kh_example crypt_app
 
+ifeq ($(PLATFORM),win32)
+  PLUGIN_SONAME=$(notdir $@)
+  PLUGINS_DIR=$(FIREBIRD)/examples/prebuilt/plugins
+  SAMPLES_DIR=$(FIREBIRD)/examples/prebuilt/bin
+  makePluginName=$(PLUGINS_DIR)/$(LIB_PREFIX)$(1).$(SHRLIB_EXT)
+else
+  PLUGIN_SONAME=$(notdir $@).0
+  PLUGINS_DIR=$(PLUGINS)
+  SAMPLES_DIR=$(BIN)
+endif
 
 UDR_Objects = $(call dirObjects,../examples/udr)
 UDR_Plugin = $(PLUGINS)/udr/$(LIB_PREFIX)udrcpp_example.$(SHRLIB_EXT)
@@ -72,7 +82,7 @@ ifeq ($(PLATFORM),DARWIN)
 	$(LIB_LINK) $(LIB_BUNDLE_OPTIONS) -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ \
 		$(FIREBIRD_LIBRARY_LINK)
 else
-	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)udrcpp_example.$(SHRLIB_EXT) \
+	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(call LIB_LINK_SONAME,udrcpp_example.$(SHRLIB_EXT)) \
 		$(LIB_PATH_OPTS) -o $@ $^ $(THR_LIBS) \
 		$(FIREBIRD_LIBRARY_LINK)
 endif
@@ -85,8 +95,8 @@ AllObjects += $(DC_Objects)
 dc_example: $(DC_Plugin)
 
 $(DC_Plugin):	$(DC_Objects)
-	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)
-	$(CP) $(EXA_ROOT)/dbcrypt/fbSampleDbCrypt.conf $(PLUGINS)
+	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)
+	$(CP) $(EXA_ROOT)/dbcrypt/fbSampleDbCrypt.conf $(PLUGINS_DIR)
 
 
 KH_Objects = $(call makeObjects,../examples/dbcrypt,CryptKeyHolder.cpp)
@@ -96,12 +106,12 @@ AllObjects += $(KH_Objects)
 kh_example: $(KH_Plugin)
 
 $(KH_Plugin):	$(KH_Objects)
-	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)
-	$(CP) $(EXA_ROOT)/dbcrypt/fbSampleKeyHolder.conf $(PLUGINS)
+	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)
+	$(CP) $(EXA_ROOT)/dbcrypt/fbSampleKeyHolder.conf $(PLUGINS_DIR)
 
 
 CA_Objects = $(call makeObjects,../examples/dbcrypt,CryptApplication.cpp)
-CRYPT_APP = $(BIN)/fbSampleDbCryptApp$(EXEC_EXT)
+CRYPT_APP = $(SAMPLES_DIR)/fbSampleDbCryptApp$(EXEC_EXT)
 AllObjects += $(CA_Objects)
 
 crypt_app: $(CRYPT_APP)