diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a34aab..c930464 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,13 +7,27 @@ project( add_custom_target( download_libraries - COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/libs - COMMAND wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/sdk-28-10-16.7z -q -O ${CMAKE_CURRENT_BINARY_DIR}/libs/sdk-28-10-16.7z - COMMAND wget -r --no-parent -q http://builds.kolibrios.org/en_US/data/contrib/sdk/lib -O ${CMAKE_CURRENT_BINARY_DIR}/libs/builds.kolibrios.org - COMMAND 7z x -y ${CMAKE_CURRENT_BINARY_DIR}/libs/sdk-28-10-16.7z - COMMAND mv ${CMAKE_CURRENT_BINARY_DIR}/libs/builds.kolibrios.org/en_US/data/contrib/sdk/lib/* ${CMAKE_CURRENT_BINARY_DIR}/libs - COMMAND rm -R ${CMAKE_CURRENT_BINARY_DIR}/libs/builds.kolibrios.org +# COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/libs + COMMAND wget -q http://ftp.kolibrios.org/users/Serge/new/Toolchain/sdk-28-10-16.7z + COMMAND wget -r --no-parent -q http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/ + COMMAND 7z x -y ${CMAKE_CURRENT_BINARY_DIR}/sdk-28-10-16.7z -o${CMAKE_CURRENT_BINARY_DIR} + COMMAND mv ${CMAKE_CURRENT_BINARY_DIR}/builds.kolibrios.org/en_US/data/contrib/sdk/lib/* ${CMAKE_CURRENT_BINARY_DIR}/lib + COMMAND rm -R ${CMAKE_CURRENT_BINARY_DIR}/builds.kolibrios.org + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Download libraries" + BYPRODUCTS + ${CMAKE_CURRNET_BINARY_DIR}/lib + ${CMAKE_CURRNET_BINARY_DIR}/sdk-28-10-16.7z +) + +add_custom_target( + archive_libraries + COMMAND 7z a lib.7z ${CMAKE_CURRNET_BINARY_DIR}/lib + WORKING_DIRECTORY ${CMAKE_CURRNET_BINARY_DIR} + BYPRODUCTS + ${CMAKE_CURRNET_BINARY_DIR}/lib.7z + DEPENDS + ${CMAKE_CURRNET_BINARY_DIR}/lib ) add_custom_target( @@ -66,6 +80,8 @@ add_custom_target( debOffline COMMAND cp -f ${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2 ${CMAKE_CURRENT_BINARY_DIR}/package/usr/lib/x86_64-linux-gnu/libisl.so.10.2.2 COMMAND cp -f ${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-linux.7z ${CMAKE_CURRENT_BINARY_DIR}/package/home/autobuild/tools + COMMAND cp -f ${CMAKE_CURRENT_BINARY_DIR}/lib.7z ${CMAKE_CURRENT_BINARY_DIR}/package/home/autobuild/tools + COMMAND cp -f ${CMAKE_CURRNET_BINARY_DIR}/lib.7z ${CMAKE_CURRENT_BINARY_DIR}/package/home/autobuild/tools COMMAND dpkg-deb --build ${CMAKE_CURRENT_BINARY_DIR}/package ${CMAKE_CURRENT_BINARY_DIR}/package.deb WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Build deb offline package" @@ -74,6 +90,7 @@ add_custom_target( DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2.7z ${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-linux.7z + ${CMAKE_CURRNET_BINARY_DIR}/lib.7z ) add_custom_target( @@ -118,10 +135,7 @@ add_dependencies( add_dependencies( debOffline configureDebPackage -) - -add_dependencies( - configureDebPackage + archive_libraries extract_linux ) diff --git a/package/DEBIAN/postinst b/package/DEBIAN/postinst index e8d24d5..f8b7686 100755 --- a/package/DEBIAN/postinst +++ b/package/DEBIAN/postinst @@ -58,7 +58,7 @@ sudo mkdir -p $TOOLCHAIN_DIR print_ok "Successfully!" -print_msg "Extracting files ..." +print_msg "Extracting toolchain ..." sudo 7z x -y /home/autobuild/tools/kos32-toolchain-linux.7z -o$TOOLCHAIN_DIR sudo rm -rf /home/autobuild/tools/kos32-toolchain-linux.7z @@ -68,23 +68,16 @@ print_ok "Successfully!" -print_msg "Downloading libraries..." +print_msg "Extracting libraries..." cd $TOOLCHAIN_DIR/win32/mingw32 -sudo 7z x -y -bso0 -bsp0 sdk-28-10-16.7z -sudo rm -rf sdk-28-10-16.7z +sudo 7z x -y -bso0 -bsp0 /home/autobuild/tools/lib.7z +sudo rm -rf /home/autobuild/tools/lib.7z print_ok "Successfully!" -print_msg "Updating libraries" - -cd lib - -print_ok "Successfully!" - - if ! [ -d /usr/lib/x86_64-linux-gnu/ ]; then sudo mkdir -p /usr/lib/x86_64-linux-gnu/ fi