Moving build of everything to Linux

Author: rupor-github

.gitignore

@@ -200,11 +200,15 @@ lib2inpx-win32.rar
 lib2inpx-win64.rar
 lib2inpx-win32.7z
 lib2inpx-win64.7z
+lib2inpx-linux_i686.7z
+lib2inpx-linux_x86_64.7z
 lib2inpx_linux_i686.tar.gz
 lib2inpx_linux_x86_64.tar.gz
 
 [Bb]in
 [Bb]in64
+[Bb]in_win32
+[Bb]in_win64
 [Bb]in_linux_i686
 [Bb]in_linux_x86_64
 
@@ -225,8 +229,12 @@ zlib-?.?.?/contrib/masmx86/*.lst
 
 [Dd]ebug32/
 [Dd]ebug64/
+[Dd]ebug_win32/
+[Dd]ebug_win64/
 [Rr]elease32/
 [Rr]elease64/
+[Rr]elease_win32/
+[Rr]elease_win64/
 
 [Dd]ebug_linux_i686/
 [Dd]ebug_linux_x86_64/

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.0)
 message(STATUS "Running cmake version ${CMAKE_VERSION}")
 
 project(InpxCreator)
@@ -13,33 +13,33 @@ message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 # Project version number
-set(PRJ_VERSION_MAJOR 8)
-set(PRJ_VERSION_MINOR 63)
+set(PRJ_VERSION_MAJOR 9)
+set(PRJ_VERSION_MINOR 0)
 configure_file("${PROJECT_SOURCE_DIR}/cmake/version.h.in" "${PROJECT_BINARY_DIR}/version.h")
 include_directories("${PROJECT_BINARY_DIR}")
 
-if(WIN32 AND DEFINED ENV{MSYSTEM})
+if(CMAKE_CROSSCOMPILING OR WIN32)
     # Cannot win here - libwinpthread-1.dll will still be required on run-time (unless somebody rebuilds mingw compilers in MSYS2 with win32 threads)
     if($ENV{MSYSTEM} STREQUAL "MINGW32")
-        set(DEST_DIR "${PROJECT_SOURCE_DIR}/bin")
-        find_path(WINPTHREAD_DLL_DIR libwinpthread-1.dll "/mingw32/bin")
+        set(DEST_DIR "${PROJECT_SOURCE_DIR}/bin_win32")
+        find_path(WINPTHREAD_DLL_DIR libwinpthread-1.dll)
     elseif($ENV{MSYSTEM} STREQUAL "MINGW64")
-        set(DEST_DIR "${PROJECT_SOURCE_DIR}/bin64")
-        find_path(WINPTHREAD_DLL_DIR libwinpthread-1.dll "/mingw64/bin")
+        set(DEST_DIR "${PROJECT_SOURCE_DIR}/bin_win64")
+        find_path(WINPTHREAD_DLL_DIR libwinpthread-1.dll)
     else()
         # cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release ..
         message(FATAL_ERROR "Currently unsuppored environment. CMake willl exit now.")
     endif()
+    # I want static libraries everywhere (but for MySQL on Windows)
+    set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_SHARED_LIBRARY_SUFFIX}.a)
 else()
     execute_process(COMMAND ${CMAKE_COMMAND} -E env uname -m OUTPUT_VARIABLE LINUX_BIN OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
     set(DEST_DIR "${PROJECT_SOURCE_DIR}/bin_linux_${LINUX_BIN}")
+    set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
 endif()
-message(STATUS "Destination directory: ${DEST_DIR}")
+message(STATUS "Destination directory: ${DEST_DIR} ${WINPTHREAD_DLL_DIR}")
 
-# I want static libraries everywhere (but for MySQL on Windows)
-set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_SHARED_LIBRARY_SUFFIX}.a)
 set(BUILD_SHARED_LIBS OFF)
-
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
@@ -65,7 +65,7 @@ get_filename_component(MYSQL_NAME ${MYSQL_LIBRARIES} NAME_WE)
 # Prepare history file
 execute_process(COMMAND ${CMAKE_COMMAND} -E env ${GIT_EXECUTABLE} changelog --final-tag ${PRJ_VERSION_MAJOR}.${PRJ_VERSION_MINOR} --stdout OUTPUT_FILE ${PROJECT_BINARY_DIR}/history.txt ERROR_QUIET)
 
-if(WIN32)
+if(CMAKE_CROSSCOMPILING OR WIN32)
     set(SRCS_MINIZIP minizip/ioapi.c minizip/iowin32.c minizip/unzip.c minizip/zip.c)
 else()
     set(SRCS_MINIZIP minizip/ioapi.c minizip/ioapi.c minizip/unzip.c minizip/zip.c)
@@ -85,14 +85,14 @@ FILE(GLOB files "misc/*")
 install(FILES ${files} DESTINATION ${DEST_DIR} CONFIGURATIONS Release)
 FILE(GLOB scripts "scripts/*")
 install(PROGRAMS ${scripts} DESTINATION ${DEST_DIR} CONFIGURATIONS Release)
-if(WIN32)
+if(CMAKE_CROSSCOMPILING OR WIN32)
     install(PROGRAMS ${MYSQL_LIB_DIR}/${MYSQL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION ${DEST_DIR} CONFIGURATIONS Release)
     install(PROGRAMS ${WINPTHREAD_DLL_DIR}/libwinpthread-1.dll DESTINATION ${DEST_DIR} CONFIGURATIONS Release)
 endif()
 install(FILES ${MYSQL_LIB_DIR}/../share/english/errmsg.sys DESTINATION ${DEST_DIR}/language CONFIGURATIONS Release)
 install(TARGETS lib2inpx DESTINATION ${DEST_DIR} CONFIGURATIONS Release)
 # for debugging purposes
-if(WIN32)
+if(CMAKE_CROSSCOMPILING OR WIN32)
     install(PROGRAMS ${MYSQL_LIB_DIR}/${MYSQL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION ${PROJECT_BINARY_DIR} CONFIGURATIONS Release Debug)
     install(PROGRAMS ${WINPTHREAD_DLL_DIR}/libwinpthread-1.dll DESTINATION ${PROJECT_BINARY_DIR} CONFIGURATIONS Release Debug)
 endif()
@@ -103,6 +103,16 @@ find_package(Glide 0.12 REQUIRED)
 # Proper go build structure will be here
 set(GO_PATH "${CMAKE_BINARY_DIR}/go")
 
+if(CMAKE_CROSSCOMPILING)
+    if($ENV{MSYSTEM} STREQUAL "MINGW32")
+        set(CROSS_GOOS windows)
+        set(CROSS_GOARCH 386)
+    elseif($ENV{MSYSTEM} STREQUAL "MINGW64")
+        set(CROSS_GOOS windows)
+        set(CROSS_GOARCH amd64)
+    endif()
+endif()
+
 message(STATUS "Vendoring for go")
 execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory go/src)
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/glide.yaml go/src/.)
@@ -118,7 +128,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libget2${CMAKE_EXECUTABLE_SUFFIX}
 	# setting up source tree
 	COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/libget2/ go/src/libget2
 	# Building
-	COMMAND ${CMAKE_COMMAND} -E env GOROOT=${GO_ROOT} GOPATH=${GO_PATH} ${GO_EXECUTABLE} build libget2
+    COMMAND ${CMAKE_COMMAND} -E env GOROOT=${GO_ROOT} GOPATH=${GO_PATH} GOOS=${CROSS_GOOS} GOARCH=${CROSS_GOARCH} ${GO_EXECUTABLE} build libget2
 	COMMENT "Building GO program - libget2")
 add_custom_target(libget2_exe ALL DEPENDS ${CMAKE_BINARY_DIR}/libget2${CMAKE_EXECUTABLE_SUFFIX})
 install(PROGRAMS ${CMAKE_BINARY_DIR}/libget2${CMAKE_EXECUTABLE_SUFFIX} DESTINATION ${DEST_DIR} CONFIGURATIONS Release)
@@ -131,7 +141,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libmerge${CMAKE_EXECUTABLE_SUFFIX}
 	# setting up source tree
 	COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/libmerge/ go/src/libmerge
 	# Building
-	COMMAND ${CMAKE_COMMAND} -E env GOROOT=${GO_ROOT} GOPATH=${GO_PATH} ${GO_EXECUTABLE} build libmerge
+    COMMAND ${CMAKE_COMMAND} -E env GOROOT=${GO_ROOT} GOPATH=${GO_PATH} GOOS=${CROSS_GOOS} GOARCH=${CROSS_GOARCH} ${GO_EXECUTABLE} build libmerge
 	COMMENT "Building GO program - libmerge")
 add_custom_target(libmerge_exe ALL DEPENDS ${CMAKE_BINARY_DIR}/libmerge${CMAKE_EXECUTABLE_SUFFIX})
 install(PROGRAMS ${CMAKE_BINARY_DIR}/libmerge${CMAKE_EXECUTABLE_SUFFIX} DESTINATION ${DEST_DIR} CONFIGURATIONS Release)

build-release-linux.sh

@@ -0,0 +1,96 @@
+#!/usr/bin/bash -e
+
+# Standard preambule
+plain() {
+  local mesg=$1; shift
+  printf "    ${mesg}\n" "$@" >&2
+}
+
+print_warning() {
+  local mesg=$1; shift
+  printf "${YELLOW}=> WARNING: ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+print_msg1() {
+  local mesg=$1; shift
+  printf "${GREEN}==> ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+print_msg2() {
+  local mesg=$1; shift
+  printf "${BLUE}  -> ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+print_error() {
+  local mesg=$1; shift
+  printf "${RED}==> ERROR: ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+ALL_OFF=''
+BLUE=''
+GREEN=''
+RED=''
+YELLOW=''
+
+readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
+ARCH_INSTALLS="${ARCH_INSTALLS:-win32 win64 linux}"
+
+for _mingw in ${ARCH_INSTALLS}; do
+	
+	case ${_mingw} in
+		win32)
+			_arch=win32
+			_msystem=MINGW32
+			_dist=bin_win32
+			_gcc=i686-w64-mingw32-gcc
+		;;
+		win64)
+			_arch=win64
+			_msystem=MINGW64
+			_dist=bin_win64
+			_gcc=x86_64-w64-mingw32-gcc
+		;;
+		linux)
+			_msystem=
+			_os=$(uname)
+			_arch=${_os,,}_$(uname -m)
+			_dist=bin_${_arch}
+			_gcc=gcc
+		;;
+	esac
+
+	if command -v ${_gcc} >/dev/null 2>&1; then
+		
+		print_msg1 "Building ${_arch} release"
+
+		[ -d ${_dist} ] && rm -rf ${_dist}
+
+		[ -d Release_${_arch} ] && rm -rf Release_${_arch}
+		mkdir -p Release_${_arch}
+
+		(
+			cd  Release_${_arch}
+
+			if [ -z ${_msystem} ]; then
+				cmake -DCMAKE_BUILD_TYPE=Release ..
+				make install
+			else
+				MSYSTEM=${_msystem} cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=cmake/${_arch}.toolchain ..
+				MSYSTEM=${_msystem} make install
+			fi
+		)
+
+		(
+			[ -f lib2inpx-${_arch}.7z ] && rm lib2inpx-${_arch}.7z
+
+			cd ${_dist}
+
+			7z a -r ../lib2inpx-${_arch}
+		)
+	else
+		print_warning "You don't have installed mingw-w64 toolchain for ${_mingw}."
+	fi
+done
+
+exit 0
+