Egor00f/kolibrios-gcc-toolchain
1
0
Fork 0
mirror of https://github.com/Egor00f/kolibrios-gcc-toolchain.git synced 2025-09-20 18:00:07 +02:00
Code Issues Packages Projects Releases Activity

fix not deleting PATH set from etc/profile on remove && some other changes

Browse Source
This commit is contained in:
Егор
2025-03-13 17:55:43 +00:00
committed by GitHub
parent 0c05341157
commit 3b3e3f3fd6
6 changed files with 82 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
CMakeLists.txt
View File

@@ -12,58 +12,68 @@ add_custom_target(
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/lib COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/lib
COMMAND mv ${CMAKE_CURRENT_BINARY_DIR}/builds.kolibrios.org/en_US/data/contrib/sdk/lib/* ${CMAKE_CURRENT_BINARY_DIR}/lib 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 COMMAND rm -R ${CMAKE_CURRENT_BINARY_DIR}/builds.kolibrios.org
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Download libraries" COMMENT "Download libraries"
BYPRODUCTS OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/lib
${CMAKE_CURRENT_BINARY_DIR}/sdk-28-10-16.7z ${CMAKE_CURRENT_BINARY_DIR}/sdk-28-10-16.7z
BYPRODUCTS
${CMAKE_CURRENT_BINARY_DIR}/sdk-28-10-16.7z
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
) )
add_custom_target( add_custom_target(
archive_libraries archive_libraries
COMMAND 7z x -y -bso0 -bsp0 ${CMAKE_CURRENT_BINARY_DIR}/sdk-28-10-16.7z -o${CMAKE_CURRENT_BINARY_DIR} COMMAND 7z x -y -bso0 -bsp0 ${CMAKE_CURRENT_BINARY_DIR}/sdk-28-10-16.7z -o${CMAKE_CURRENT_BINARY_DIR}
COMMAND 7z a -bso0 -bsp0 ${CMAKE_CURRENT_BINARY_DIR}/lib.7z ${CMAKE_CURRENT_BINARY_DIR}/lib COMMAND 7z a -bso0 -bsp0 ${CMAKE_CURRENT_BINARY_DIR}/lib.7z ${CMAKE_CURRENT_BINARY_DIR}/lib
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Add libraries to archive"
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/lib.7z
BYPRODUCTS BYPRODUCTS
${CMAKE_CURRENT_BINARY_DIR}/lib.7z ${CMAKE_CURRENT_BINARY_DIR}/lib.7z
DEPENDS DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/sdk-28-10-16.7z ${CMAKE_CURRENT_BINARY_DIR}/sdk-28-10-16.7z
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
) )
add_custom_target( add_custom_target(
download_linux download_linux
COMMAND wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/x86_64-linux-kos32-5.4.0.7z -q -O ${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-linux.7z COMMAND wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/x86_64-linux-kos32-5.4.0.7z -q -O ${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-linux.7z
COMMAND wget http://board.kolibrios.org/download/file.php?id=8301libisl.so.10.2.2.7z -q -O ${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2.7z COMMAND wget http://board.kolibrios.org/download/file.php?id=8301libisl.so.10.2.2.7z -q -O ${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2.7z
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Download linux toolchain" COMMENT "Download linux toolchain"
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-linux.7z
${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2.7z
BYPRODUCTS BYPRODUCTS
${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-linux.7z ${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-linux.7z
${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2.7z ${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2.7z
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
) )
add_custom_target( add_custom_target(
download_windows download_windows
COMMAND wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/msys-kos32-5.4.0.7z -q -O ${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-win.7z COMMAND wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/msys-kos32-5.4.0.7z -q -O ${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-win.7z
COMMENT "Download windows toolchain" COMMENT "Download windows toolchain"
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-win.7z
BYPRODUCTS BYPRODUCTS
${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-win.7z ${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-win.7z
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
) )
add_custom_target( add_custom_target(
extract_linux extract_linux
COMMENT "Extract linux archives"
COMMAND 7z x -y -bso0 -bsp0 ${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2.7z COMMAND 7z x -y -bso0 -bsp0 ${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2.7z
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Extract linux archives"
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2
BYPRODUCTS BYPRODUCTS
${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2 ${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2
DEPENDS DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2.7z ${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2.7z
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
) )
add_custom_target( add_custom_target(
configureDebPackage configureDebPackage
COMMAND
COMMENT "Setup debian package" COMMENT "Setup debian package"
COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_BINARY_DIR}/package COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_BINARY_DIR}/package
COMMAND cp -rf ${CMAKE_CURRENT_SOURCE_DIR}/package/ ${CMAKE_CURRENT_BINARY_DIR}/package COMMAND cp -rf ${CMAKE_CURRENT_SOURCE_DIR}/package/ ${CMAKE_CURRENT_BINARY_DIR}/package
@@ -71,10 +81,10 @@ add_custom_target(
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/package/usr/lib/x86_64-linux-gnu COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/package/usr/lib/x86_64-linux-gnu
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/package/home/autobuild/tools COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/package/home/autobuild/tools
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
SOURCES OUTPUT
${CMAKE_CURRENT_SOURCE_DIR}/package/ ${CMAKE_CURRENT_SOURCE_DIR}/package/
BYPRODUCTS BYPRODUCTS
${CMAKE_CURRENT_BINARY_DIR}/package ${CMAKE_CURRENT_BINARY_DIR}/package/
) )
@@ -86,12 +96,13 @@ add_custom_target(
COMMAND dpkg-deb --build ${CMAKE_CURRENT_BINARY_DIR}/package ${CMAKE_CURRENT_BINARY_DIR}/package.deb COMMAND dpkg-deb --build ${CMAKE_CURRENT_BINARY_DIR}/package ${CMAKE_CURRENT_BINARY_DIR}/package.deb
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Build deb package" COMMENT "Build deb package"
BYPRODUCTS OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/package.deb ${CMAKE_CURRENT_BINARY_DIR}/package.deb
DEPENDS DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2 ${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2
${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-linux.7z ${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-linux.7z
${CMAKE_CURRENT_BINARY_DIR}/lib.7z ${CMAKE_CURRENT_BINARY_DIR}/lib.7z
configureDebPackage
) )
add_custom_target( add_custom_target(
@@ -117,8 +128,3 @@ add_custom_target(
${CMAKE_CURRENT_SOURCE_DIR}/chocolatey/tools/chocolateyInstall.ps1 ${CMAKE_CURRENT_SOURCE_DIR}/chocolatey/tools/chocolateyInstall.ps1
${CMAKE_CURRENT_SOURCE_DIR}/chocolatey/tools/chocolateyUninstall.ps1 ${CMAKE_CURRENT_SOURCE_DIR}/chocolatey/tools/chocolateyUninstall.ps1
) )
add_dependencies(
deb
configureDebPackage
)

20
install.sh
View File

@@ -7,9 +7,10 @@
set -e set -e
pwd pwd
CONFIG_FOLDER="/etc/kos32-gcc"
INSTALL_PATH_FILE="$CONFIG_FOLDER/install-path"
DEFAULT_TOOLCHAIN_DIR="/home/autobuild/tools" DEFAULT_TOOLCHAIN_DIR="/home/autobuild/tools"
TOOLCHAIN_DIR=$DEFAULT_TOOLCHAIN_DIR
print_msg(){ print_msg(){
echo -e "\e[34m$1\e[0m" echo -e "\e[34m$1\e[0m"
@@ -34,16 +35,19 @@ check_utils(){
fi fi
} }
echo -n -e "\e[0mToolchain install path \e[90m(default is $TOOLCHAIN_DIR)\e[97m: " if [ test -f $INSTALL_PATH_FILE ]; then
read INPUT TOOLCHAIN_DIR=$(head -n 1 $INSTALL_PATH_FILE)
else
echo -n -e "\e[0mToolchain install path \e[90m(default is $DEFAULT_TOOLCHAIN_DIR)\e[97m: "
read INPUT
if [[ ! -z "$INPUT" ]]; then if [[ ! -z "$INPUT" ]]; then
TOOLCHAIN_DIR=$INPUT TOOLCHAIN_DIR=$INPUe
else
TOOLCHAIN_DIR=$DEFAULT_TOOLCHAIN_DIR
fi
fi fi
echo -e "\e[0mInstalling toolchain to \e[97m$TOOLCHAIN_DIR\e[0m"
print_msg "Checking utilities..." print_msg "Checking utilities..."

8
package/DEBIAN/control
View File

@@ -1,9 +1,11 @@
Package: kos32-gcc Package: kos32-gcc
Version: 0.1.7 Version: 0.1.8
Architecture: amd64 Architecture: amd64
Section: devel Section: devel
Depends: libc6-i386:amd64, libmpc3:amd64 Depends: libc6-i386:amd64,
Pre-Depends: p7zip-full, wget libmpc3:amd64
Pre-Depends: p7zip-full,
wget
Recommends: fasm Recommends: fasm
Priority: optional Priority: optional
Homepage: https://github.com/Egor00f/kolibrios-gcc-toolchain Homepage: https://github.com/Egor00f/kolibrios-gcc-toolchain

29
package/DEBIAN/postinst
View File

@@ -7,9 +7,10 @@
set -e set -e
pwd pwd
CONFIG_FOLDER="/etc/kos32-gcc"
INSTALL_PATH_FILE="$CONFIG_FOLDER/install-path"
DEFAULT_TOOLCHAIN_DIR="/home/autobuild/tools" DEFAULT_TOOLCHAIN_DIR="/home/autobuild/tools"
TOOLCHAIN_DIR=$DEFAULT_TOOLCHAIN_DIR
print_msg(){ print_msg(){
echo -e "\e[34m$1\e[0m" echo -e "\e[34m$1\e[0m"
@@ -34,11 +35,17 @@ check_utils(){
fi fi
} }
echo -n -e "\e[0mToolchain install path \e[90m(default is $TOOLCHAIN_DIR)\e[97m: " if [ test -f $INSTALL_PATH_FILE ]; then
read INPUT TOOLCHAIN_DIR=$(head -n 1 $INSTALL_PATH_FILE)
else
echo -n -e "\e[0mToolchain install path \e[90m(default is $DEFAULT_TOOLCHAIN_DIR)\e[97m: "
read INPUT
if [[ ! -z "$INPUT" ]]; then if [[ ! -z "$INPUT" ]]; then
TOOLCHAIN_DIR=$INPUT TOOLCHAIN_DIR=$INPUe
else
TOOLCHAIN_DIR=$DEFAULT_TOOLCHAIN_DIR
fi
fi fi
echo -e "\e[0mInstalling toolchain to \e[97m$TOOLCHAIN_DIR\e[0m" echo -e "\e[0mInstalling toolchain to \e[97m$TOOLCHAIN_DIR\e[0m"
@@ -60,8 +67,8 @@ print_ok "Successfully!"
print_msg "Extracting toolchain ..." print_msg "Extracting toolchain ..."
sudo 7z x -y -bso0 -bsp0 /home/autobuild/tools/kos32-toolchain-linux.7z -o$TOOLCHAIN_DIR sudo 7z x -y -bso0 -bsp0 $DEFAULT_TOOLCHAIN_DIR/kos32-toolchain-linux.7z -o$TOOLCHAIN_DIR
sudo rm -rf /home/autobuild/tools/kos32-toolchain-linux.7z sudo rm -rf $DEFAULT_TOOLCHAIN_DIR/kos32-toolchain-linux.7z
print_ok "Successfully!" print_ok "Successfully!"
@@ -71,8 +78,8 @@ print_ok "Successfully!"
print_msg "Extracting libraries..." print_msg "Extracting libraries..."
cd $TOOLCHAIN_DIR/win32/mingw32 cd $TOOLCHAIN_DIR/win32/mingw32
sudo 7z x -y -bso0 -bsp0 /home/autobuild/tools/lib.7z sudo 7z x -y -bso0 -bsp0 $DEFAULT_TOOLCHAIN_DIR/lib.7z
sudo rm -rf /home/autobuild/tools/lib.7z sudo rm -rf $DEFAULT_TOOLCHAIN_DIR/lib.7z
print_ok "Successfully!" print_ok "Successfully!"
@@ -111,8 +118,8 @@ if [ ! "$(id -u)" -ne 0 ]
then then
echo $MESSAGE >> /etc/profile echo $MESSAGE >> /etc/profile
sudo mkdir -p /etc/kos32-gcc sudo mkdir -p $CONFIG_FOLDER
echo $TOOLCHAIN_DIR > /etc/kos32-gcc/install-path echo $TOOLCHAIN_DIR > $INSTALL_PATH_FILE
else else
if ! grep -q $EXPORT_MESSSAGE ~/.bashrc; then if ! grep -q $EXPORT_MESSSAGE ~/.bashrc; then
print_msg "Adding '$TOOLCHAIN_DIR/win32/bin' to '~/.bashrc'" print_msg "Adding '$TOOLCHAIN_DIR/win32/bin' to '~/.bashrc'"

15
package/DEBIAN/postrm
View File

@@ -1,12 +1,17 @@
#!/bin/bash #!/bin/bash
CONFIG_FOLDER="/etc/kos32-gcc"
INSTALL_PATH_FILE="$CONFIG_FOLDER/install-path"
DEFAULT_TOOLCHAIN_DIR="/home/autobuild/tools"
TOOLCHAIN_DIR=$(head -n 1 /etc/kos32-gcc/install-path) TOOLCHAIN_DIR=$(head -n 1 /etc/kos32-gcc/install-path)
FULL_PATH="$TOOLCHAIN_DIR/win32/bin"
CHR="/"
REPLACE_TO="\/"
MESSAGE="PATH=\$PATH:$TOOLCHAIN_DIR/win32/bin" MESSAGE="${FULL_PATH//$CHR/"$REPLACE_TO"}"
sudo sed -i -e '/$MESSAGE/d' /etc/profile
rm -R /etc/kos32-gcc
sudo sed -i -e '/'$MESSAGE'/d' /etc/profile

7
package/DEBIAN/prerm
View File

@@ -1,6 +1,11 @@
#!/bin/bash #!/bin/bash
TOOLCHAIN_DIR=$(head -n 1 /etc/kos32-gcc/install-path) CONFIG_FOLDER="/etc/kos32-gcc"
INSTALL_PATH_FILE="$CONFIG_FOLDER/install-path"
DEFAULT_TOOLCHAIN_DIR="/home/autobuild/tools"
TOOLCHAIN_DIR=$(head -n 1 $INSTALL_PATH_FILE)
rm -Rf $TOOLCHAIN_DIR rm -Rf $TOOLCHAIN_DIR