diff --git a/CMakeLists.txt b/CMakeLists.txt index 255f8f4..adad16d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,13 +7,13 @@ project( add_custom_target( download_libraries - COMMAND wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/sdk-28-10-16.7z -q - COMMAND wget -r --no-parent -q http://builds.kolibrios.org/en_US/data/contrib/sdk/lib - COMMAND 7z x -y sdk-28-10-16.7z - COMMAND mv builds.kolibrios.org/en_US/data/contrib/sdk/lib/* ./ - COMMAND rm -R builds.kolibrios.org + 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 COMMENT "Download libraries" - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/libs ) add_custom_target( @@ -31,7 +31,6 @@ add_custom_target( WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) - add_custom_target( deb COMMAND mkdir -p ${CMAKE_CURRENT_SOURCE_DIR}/package/usr/lib/x86_64-linux-gnu diff --git a/README.md b/README.md index b35ac97..2f3b310 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,8 @@ wget для windows можно поискать в GnuWin32 например, 7z ### Windows +Для сборки установщиков необходимы `CoreUtils` и `wget` из `GnuWin32`. + Установщик собирается с помощью Inno Setup. Цель для сборки Installer. Для сборки требуется компилятор Inno Setup. Если сборка не работает, добавьте папку Inno Setup (например: `C:\Programs Files\Inno Setup 6`) в PATH. diff --git a/chocolatey/kos32-gcc.nuspec b/chocolatey/kos32-gcc.nuspec index f39252d..5f0398b 100644 --- a/chocolatey/kos32-gcc.nuspec +++ b/chocolatey/kos32-gcc.nuspec @@ -3,7 +3,7 @@ kos32-gcc KolibriOS gcc toolchain installer - 0.1.5 + 0.1.6 Egor00f Egor00f idk diff --git a/chocolatey/tools/chocolateyInstall.ps1 b/chocolatey/tools/chocolateyInstall.ps1 index fa0527d..ccde14b 100644 --- a/chocolatey/tools/chocolateyInstall.ps1 +++ b/chocolatey/tools/chocolateyInstall.ps1 @@ -8,7 +8,8 @@ $packageName = 'kos32-gcc' # arbitrary name for the package, used in messages $INSTALL_PATH = Read-Host 'Path to install toolchain(Enter - default)' -C:\ProgramData\Chocolatey\lib\kos32-gcc\tools\install.ps1 +Expand-7Zip -ArchiveFileName C:\ProgramData\Chocolatey\lib\kos32-gcc\tools\kos32-toolchain-win.7z -TargetPath $INSTALL_PATH + Out-File -FilePath C:\ProgramData\Chocolatey\lib\kos32-gcc\install-path -InputObject $INSTALL_PATH