Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/45faca6bc7c600e56d641339ed1edb25e8a92280
...commit
http://git.netsurf-browser.org/toolchains.git/commit/45faca6bc7c600e56d641339ed1edb25e8a92280
...tree
http://git.netsurf-browser.org/toolchains.git/tree/45faca6bc7c600e56d641339ed1edb25e8a92280
The branch, ashmew2/kolibrios has been updated
via 45faca6bc7c600e56d641339ed1edb25e8a92280 (commit)
from 9fd123fffcc03b0bc943dc94446a5757e5c63047 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=45faca6bc7c600e56d641339ed1edb25e8a92280
commit 45faca6bc7c600e56d641339ed1edb25e8a92280
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
add build.sh
diff --git a/kos32-gcc/Makefile b/kos32-gcc/Makefile
deleted file mode 100644
index 6cd119a..0000000
--- a/kos32-gcc/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-KOLIBRI_SVN_URL := svn://kolibrios.org
-
-KOS32_DIR := /opt/netsurf/kos32-gcc/
-ENVDIR := $(KOS32_DIR)/env
-SVN_CHECKOUT := $(ENVDIR)/kolibrios
-PATH := $(PATH):/opt/netsurf/kos32-gcc/cross/autobuild/tools/win32/bin
-COMPILER_INSTALL_PATH := /opt/netsurf/kos32-gcc/cross/autobuild/tools
-
-COMPILER_NAME := x86_64-linux-kos32-4.8.5.7z
-COMPILER_URL :=
http://ftp.kolibrios.org/users/Serge/new/Toolchain/$(COMPILER_NAME)
-SDK_NAME := sdk-28-10-16.7z
-SDK_URL := http://ftp.kolibrios.org/users/Serge/new/Toolchain/$(SDK_NAME)
-
-OBJDIR := $(ENVDIR)/obj
-
-COMPILE := kos32-gcc -c -fno-ident -fomit-frame-pointer -U__WIN32__
-I$(SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include -U_Win32 -U_WIN32
-U__MINGW32__ -UWIN32 -U__BSD_VISIBLE
-
-all: clean kolibri-svn kolibri-compiler kolibri-sdk kolibri-libs
-kolibri-compiler:
- mkdir -p $(COMPILER_INSTALL_PATH)
- wget $(COMPILER_URL)
- mv $(COMPILER_NAME) $(COMPILER_INSTALL_PATH)
- cd $(COMPILER_INSTALL_PATH) && 7z x $(COMPILER_NAME)
- rm -f $(COMPILER_INSTALL_PATH)/$(COMPILER_NAME)
-
-kolibri-svn:
- mkdir -p $(ENVDIR)
- mkdir -p $(OBJDIR)
- svn checkout $(KOLIBRI_SVN_URL) $(ENVDIR)/kolibrios
-
-kolibri-libs:
- $(COMPILE) $(SVN_CHECKOUT)/programs/fs/unzip60/kolibri/dirent.c -o
$(OBJDIR)/dirent.o
- $(COMPILE) $(SVN_CHECKOUT)/programs/develop/libraries/iconv/iconv.c -o
$(OBJDIR)/iconv.o
- fasm $(SVN_CHECKOUT)/contrib/C_Layer/ASM/loadhttp.asm
$(OBJDIR)/loadhttp.obj
-
-kolibri-sdk:
- mkdir -p $(COMPILER_INSTALL_PATH)/win32
- wget $(SDK_URL)
- mv $(SDK_NAME) $(COMPILER_INSTALL_PATH)/win32/
- cd $(COMPILER_INSTALL_PATH)/win32/ && 7z x $(SDK_NAME)
- rm -f $(COMPILER_INSTALL_PATH)/win32/$(SDK_NAME)
-
-clean:
- rm -f $(OBJDIR)/*
- rm -rf $(KOS32_DIR)/cross
diff --git a/kos32-gcc/build.sh b/kos32-gcc/build.sh
new file mode 100755
index 0000000..ab7ebdb
--- /dev/null
+++ b/kos32-gcc/build.sh
@@ -0,0 +1,54 @@
+set -x
+COMPILER=x86_64-linux-kos32-4.8.5.7z
+SDK=sdk-28-10-16.7z
+
+SVN_URL=svn://kolibrios.org
+SDK_URL=http://ftp.kolibrios.org/users/Serge/new/Toolchain/$SDK
+COMPILER_URL=http://ftp.kolibrios.org/users/Serge/new/Toolchain/$COMPILER
+
+INSTALL_PATH=/opt/netsurf/kos32-gcc
+CROSS_PATH=$INSTALL_PATH/cross/autobuild/tools/
+ENV_PATH=$INSTALL_PATH/env
+OBJ_PATH=$ENV_PATH/obj
+
+SVN_CHECKOUT=$ENV_PATH/kolibrios
+
+SHA512_SDK=e37226c1421104f9025c644277080a0adad1cb5db560fe04bbcc6c41797fe87e57d337da314bde4abc4decfbedf3087ffb16b1d71d2587e317933204255ead1a
+SHA512_COMPILER=28555b2247848c5d85be6b18e10dc903b9a161179230b65d35f7f3bf40dff3b135972e84f6c25db23fee2a90c7a96b5a755dba9a2eaa9dbc4735e717436db1ce
+
+# clean
+# rm -rf $INSTALL_PATH
+
+# set up directories
+for dir in $INSTALL_PATH $CROSS_PATH $ENV_PATH $OBJ_PATH; do
+ mkdir -p $dir
+done
+
+# download sdk and friends
+svn checkout ${SVN_URL} ${SVN_CHECKOUT}
+wget -v ${COMPILER_URL} --directory-prefix=${CROSS_PATH}
+wget -v ${SDK_URL} --directory-prefix=${INSTALL_PATH}
+
+# verify checksums
+for file in COMPILER SDK; do
+ [[ $(sha1sum $INSTALL_PATH/${!file} | awk '{print $1}') !=
${!SHA512_${!file}} ]] && exit 1
+done
+
+# set up toolchain
+pushd $PWD
+
+cd $CROSS_PATH
+7z x $COMPILER
+
+popd
+
+# fix up environment
+PATH=${PATH}:/opt/netsurf/kos32-gcc/cross/autobuild/tools/win32/bin
+GCC="kos32-gcc -c -fno-ident -fomit-frame-pointer -U__WIN32__
-I${SVN_CHECKOUT}/contrib/sdk/sources/newlib/libc/include -U_Win32 -U_WIN32
-U__MINGW32__ -UWIN32 -U__BSD_VISIBLE"
+ASM=fasm
+
+# build stuff
+$GCC ${SVN_CHECKOUT}/programs/fs/unzip60/kolibri/dirent.c -o
${OBJ_PATH}/dirent.o
+$GCC ${SVN_CHECKOUT}/programs/develop/libraries/iconv/iconv.c -o
${OBJ_PATH}/iconv.o
+$ASM ${SVN_CHECKOUT}/contrib/C_Layer/ASM/loadhttp.asm ${OBJ_PATH}/loadhttp.obj
+
-----------------------------------------------------------------------
Summary of changes:
kos32-gcc/Makefile | 45 -------------------------------------------
kos32-gcc/build.sh | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+), 45 deletions(-)
delete mode 100644 kos32-gcc/Makefile
create mode 100755 kos32-gcc/build.sh
diff --git a/kos32-gcc/Makefile b/kos32-gcc/Makefile
deleted file mode 100644
index 6cd119a..0000000
--- a/kos32-gcc/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-KOLIBRI_SVN_URL := svn://kolibrios.org
-
-KOS32_DIR := /opt/netsurf/kos32-gcc/
-ENVDIR := $(KOS32_DIR)/env
-SVN_CHECKOUT := $(ENVDIR)/kolibrios
-PATH := $(PATH):/opt/netsurf/kos32-gcc/cross/autobuild/tools/win32/bin
-COMPILER_INSTALL_PATH := /opt/netsurf/kos32-gcc/cross/autobuild/tools
-
-COMPILER_NAME := x86_64-linux-kos32-4.8.5.7z
-COMPILER_URL :=
http://ftp.kolibrios.org/users/Serge/new/Toolchain/$(COMPILER_NAME)
-SDK_NAME := sdk-28-10-16.7z
-SDK_URL := http://ftp.kolibrios.org/users/Serge/new/Toolchain/$(SDK_NAME)
-
-OBJDIR := $(ENVDIR)/obj
-
-COMPILE := kos32-gcc -c -fno-ident -fomit-frame-pointer -U__WIN32__
-I$(SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include -U_Win32 -U_WIN32
-U__MINGW32__ -UWIN32 -U__BSD_VISIBLE
-
-all: clean kolibri-svn kolibri-compiler kolibri-sdk kolibri-libs
-kolibri-compiler:
- mkdir -p $(COMPILER_INSTALL_PATH)
- wget $(COMPILER_URL)
- mv $(COMPILER_NAME) $(COMPILER_INSTALL_PATH)
- cd $(COMPILER_INSTALL_PATH) && 7z x $(COMPILER_NAME)
- rm -f $(COMPILER_INSTALL_PATH)/$(COMPILER_NAME)
-
-kolibri-svn:
- mkdir -p $(ENVDIR)
- mkdir -p $(OBJDIR)
- svn checkout $(KOLIBRI_SVN_URL) $(ENVDIR)/kolibrios
-
-kolibri-libs:
- $(COMPILE) $(SVN_CHECKOUT)/programs/fs/unzip60/kolibri/dirent.c -o
$(OBJDIR)/dirent.o
- $(COMPILE) $(SVN_CHECKOUT)/programs/develop/libraries/iconv/iconv.c -o
$(OBJDIR)/iconv.o
- fasm $(SVN_CHECKOUT)/contrib/C_Layer/ASM/loadhttp.asm
$(OBJDIR)/loadhttp.obj
-
-kolibri-sdk:
- mkdir -p $(COMPILER_INSTALL_PATH)/win32
- wget $(SDK_URL)
- mv $(SDK_NAME) $(COMPILER_INSTALL_PATH)/win32/
- cd $(COMPILER_INSTALL_PATH)/win32/ && 7z x $(SDK_NAME)
- rm -f $(COMPILER_INSTALL_PATH)/win32/$(SDK_NAME)
-
-clean:
- rm -f $(OBJDIR)/*
- rm -rf $(KOS32_DIR)/cross
diff --git a/kos32-gcc/build.sh b/kos32-gcc/build.sh
new file mode 100755
index 0000000..ab7ebdb
--- /dev/null
+++ b/kos32-gcc/build.sh
@@ -0,0 +1,54 @@
+set -x
+COMPILER=x86_64-linux-kos32-4.8.5.7z
+SDK=sdk-28-10-16.7z
+
+SVN_URL=svn://kolibrios.org
+SDK_URL=http://ftp.kolibrios.org/users/Serge/new/Toolchain/$SDK
+COMPILER_URL=http://ftp.kolibrios.org/users/Serge/new/Toolchain/$COMPILER
+
+INSTALL_PATH=/opt/netsurf/kos32-gcc
+CROSS_PATH=$INSTALL_PATH/cross/autobuild/tools/
+ENV_PATH=$INSTALL_PATH/env
+OBJ_PATH=$ENV_PATH/obj
+
+SVN_CHECKOUT=$ENV_PATH/kolibrios
+
+SHA512_SDK=e37226c1421104f9025c644277080a0adad1cb5db560fe04bbcc6c41797fe87e57d337da314bde4abc4decfbedf3087ffb16b1d71d2587e317933204255ead1a
+SHA512_COMPILER=28555b2247848c5d85be6b18e10dc903b9a161179230b65d35f7f3bf40dff3b135972e84f6c25db23fee2a90c7a96b5a755dba9a2eaa9dbc4735e717436db1ce
+
+# clean
+# rm -rf $INSTALL_PATH
+
+# set up directories
+for dir in $INSTALL_PATH $CROSS_PATH $ENV_PATH $OBJ_PATH; do
+ mkdir -p $dir
+done
+
+# download sdk and friends
+svn checkout ${SVN_URL} ${SVN_CHECKOUT}
+wget -v ${COMPILER_URL} --directory-prefix=${CROSS_PATH}
+wget -v ${SDK_URL} --directory-prefix=${INSTALL_PATH}
+
+# verify checksums
+for file in COMPILER SDK; do
+ [[ $(sha1sum $INSTALL_PATH/${!file} | awk '{print $1}') !=
${!SHA512_${!file}} ]] && exit 1
+done
+
+# set up toolchain
+pushd $PWD
+
+cd $CROSS_PATH
+7z x $COMPILER
+
+popd
+
+# fix up environment
+PATH=${PATH}:/opt/netsurf/kos32-gcc/cross/autobuild/tools/win32/bin
+GCC="kos32-gcc -c -fno-ident -fomit-frame-pointer -U__WIN32__
-I${SVN_CHECKOUT}/contrib/sdk/sources/newlib/libc/include -U_Win32 -U_WIN32
-U__MINGW32__ -UWIN32 -U__BSD_VISIBLE"
+ASM=fasm
+
+# build stuff
+$GCC ${SVN_CHECKOUT}/programs/fs/unzip60/kolibri/dirent.c -o
${OBJ_PATH}/dirent.o
+$GCC ${SVN_CHECKOUT}/programs/develop/libraries/iconv/iconv.c -o
${OBJ_PATH}/iconv.o
+$ASM ${SVN_CHECKOUT}/contrib/C_Layer/ASM/loadhttp.asm ${OBJ_PATH}/loadhttp.obj
+
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
