Moving build to Ubuntu

Author: rupor-github

.gitignore

@@ -198,8 +198,8 @@ FakesAssemblies/
 
 lib2inpx-win32.7z
 lib2inpx-win64.7z
-lib2inpx-linux_i686.tar.xz
-lib2inpx-linux_x86_64.tar.xz
+lib2inpx-linux_i686-glibc_*.tar.xz
+lib2inpx-linux_x86_64-glibc_*.tar.xz
 
 [Bb]in_win32
 [Bb]in_win64

.set-project-env

@@ -0,0 +1 @@
+set_go_env

CMakeLists.txt

@@ -31,17 +31,18 @@ if(CMAKE_CROSSCOMPILING OR WIN32)
         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()
+    # When cross-compiling on Ubuntu libwinpthreadi.dll is not needed
+    string(COMPARE EQUAL "WINPTHREAD_DLL_DIR-NOTFOUND" WINPTHREAD_DLL_DIR WINPTHREAD_DLL_FOUND)
     # 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} ${WINPTHREAD_DLL_DIR}")
+message(STATUS "Destination directory: ${DEST_DIR}")
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 set(BUILD_SHARED_LIBS OFF)
@@ -106,14 +107,18 @@ FILE(GLOB scripts "scripts/*")
 install(PROGRAMS ${scripts} DESTINATION ${DEST_DIR} CONFIGURATIONS Release)
 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)
+    if(WINPTHREAD_DLL_FOUND)
+        install(PROGRAMS ${WINPTHREAD_DLL_DIR}/libwinpthread-1.dll DESTINATION ${DEST_DIR} CONFIGURATIONS Release)
+    endif()
 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(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)
+    if(WINPTHREAD_DLL_FOUND)
+        install(PROGRAMS ${WINPTHREAD_DLL_DIR}/libwinpthread-1.dll DESTINATION ${PROJECT_BINARY_DIR} CONFIGURATIONS Release Debug)
+    endif()
 endif()
 install(FILES ${MYSQL_LIB_DIR}/../share/english/errmsg.sys DESTINATION ${PROJECT_BINARY_DIR}/language CONFIGURATIONS Release Debug)
 

build-release.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/bash -e
+#!env bash
 
 # Standard preambule
 plain() {
@@ -51,6 +51,7 @@ for _mingw in ${ARCH_INSTALLS}; do
 			_gcc=x86_64-w64-mingw32-gcc
 		;;
 		linux)
+			_glibc=`ldd --version | head -n 1 | awk '{ print $5; }'`
 			_msystem=
 			_os=$(uname)
 			_arch=${_os,,}_$(uname -m)
@@ -84,7 +85,7 @@ for _mingw in ${ARCH_INSTALLS}; do
 			if [ -z ${_msystem} ]; then
 				[ -f lib2inpx-${_arch}.xz ] && rm lib2inpx-${_arch}.xz
 
-				tar --directory ${_dist} --create --xz --file lib2inpx-${_arch}.tar.xz .
+				tar --directory ${_dist} --create --xz --file lib2inpx-${_arch}-glibc_${_glibc}.tar.xz .
 			else
 				[ -f lib2inpx-${_arch}.7z ] && rm lib2inpx-${_arch}.7z
 

cmake/FindGo.cmake

@@ -11,8 +11,7 @@
 # Example usage:
 #   find_package(Go 1.2 REQUIRED)
 
-
-find_program(GO_EXECUTABLE go PATHS ENV GOROOT GOPATH PATH_SUFFIXES bin)
+find_program(GO_EXECUTABLE go PATHS ${HOME}/go ENV GOROOT GOPATH PATH_SUFFIXES bin)
 if(GO_EXECUTABLE)
     if(NOT CMAKE_CROSSCOMPILING AND WIN32 AND DEFINED ENV{MSYSTEM})
         if(NOT GO_ROOT)
@@ -25,9 +24,13 @@ if(GO_EXECUTABLE)
             endif()
         endif()
     else()
-        set(GO_ROOT "/usr/lib/go")
+	if (DEFINED ENV{GOROOT})
+ 		set(GO_ROOT "$ENV{GOROOT}")
+	else()
+ 		set(GO_ROOT "/usr/lib/go")
+	endif()
     endif()
-	execute_process(COMMAND sh -c "GOROOT=${GO_ROOT} ${GO_EXECUTABLE} version" OUTPUT_VARIABLE GO_VERSION_OUTPUT OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND sh -c "${GO_EXECUTABLE} version" OUTPUT_VARIABLE GO_VERSION_OUTPUT OUTPUT_STRIP_TRAILING_WHITESPACE)
     if(GO_VERSION_OUTPUT MATCHES "go([0-9]+\\.[0-9]+\\.?[0-9]*)[a-zA-Z0-9]* ([^/]+)/(.*)")
         set(GO_VERSION ${CMAKE_MATCH_1})
         set(GO_PLATFORM ${CMAKE_MATCH_2})

lib2inpx/lib2inpx.cpp

@@ -1149,7 +1149,7 @@ int main(int argc, char* argv[])
 #ifdef _WIN32
         GetModuleFileName(NULL, module_path, sizeof module_path);
 #else
-        readlink("/proc/self/exe", module_path, sizeof module_path);
+        ssize_t t = readlink("/proc/self/exe", module_path, sizeof module_path);
 #endif
 
         file_name = separate_file_name(module_path);