From 51dd93f859e48ff59c4bf194e7662a831788c88d Mon Sep 17 00:00:00 2001 From: mazze Date: Sat, 26 Jul 2014 15:33:10 +0000 Subject: [PATCH] Preparations for release. Added support for openSUSE to gimmearos-v1.sh. Some unifications. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@49164 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- scripts/gimmearos-v1.sh | 135 +++++++++++++++++++++++++++++++++++++----------- scripts/gimmearos.sh | 87 +++++++++++++++---------------- 2 files changed, 149 insertions(+), 73 deletions(-) diff --git a/scripts/gimmearos-v1.sh b/scripts/gimmearos-v1.sh index 16fad9de70..4a4b4d2e28 100755 --- a/scripts/gimmearos-v1.sh +++ b/scripts/gimmearos-v1.sh @@ -8,7 +8,7 @@ # This script is public domain. Use it at your own risk. -# $VER: gimmearos-v1.sh 1.11 (28.12.2013) WIP +# $VER: gimmearos-v1.sh 1.11 (26.07.2014) WIP curdir="`pwd`" srcdir="aros-src" @@ -33,11 +33,14 @@ install_pkg() } - -echo -e "\n\nScript for downloading and building of AROS" -echo -e "============================================" -echo -e "\nStep 1: install prerequisites" -echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" +echo -e "\n\n\n\n\n" +echo -e "***********************************************" +echo -e "* Script for downloading and building of AROS *" +echo -e "***********************************************" +echo -e "\n\n" +echo -e "*********************************" +echo -e "* Step 1: install prerequisites *" +echo -e "*********************************" echo -e "The build system needs some packages to do its job." echo -e "If you are asked for a password enter you admin password." echo -e "\n1 .. Get packages with apt-get for Debian and similar (e.g. Ubuntu)" @@ -46,6 +49,9 @@ echo -e "2 .. As 1) but with additional packages for building 32-bit AROS" echo -e " on 64-bit Linux" echo -e "3 .. Get packages with yum for Fedora" echo -e "4 .. Get packages with pacman for Arch" +echo -e "5 .. Get packages with zypper for openSuse" +echo -e "6 .. As 5) but with additional packages for building 32-bit AROS" +echo -e " on 64-bit Linux" echo -e "9 .. Skip this step" echo -e "0 .. Exit" @@ -137,7 +143,71 @@ case "$input" in install_pkg "pacman --needed --noconfirm -S" automake #it appears as though the libx11-dev,libc6-dev,liblzo2-dev is not needed on arch ;; - + + 5 ) echo -e "\nInstalling prerequisites with zypper..." + # tools + install_pkg "zypper --non-interactive install" subversion + install_pkg "zypper --non-interactive install" git-core + install_pkg "zypper --non-interactive install" gcc + install_pkg "zypper --non-interactive install" gcc-c++ + install_pkg "zypper --non-interactive install" make + install_pkg "zypper --non-interactive install" gawk + install_pkg "zypper --non-interactive install" bison + install_pkg "zypper --non-interactive install" flex + install_pkg "zypper --non-interactive install" bzip2 + install_pkg "zypper --non-interactive install" netpbm + install_pkg "zypper --non-interactive install" autoconf + install_pkg "zypper --non-interactive install" automake + install_pkg "zypper --non-interactive install" patch + install_pkg "zypper --non-interactive install" cmake + install_pkg "zypper --non-interactive install" gperf + install_pkg "zypper --non-interactive install" perl-Switch + install_pkg "zypper --non-interactive install" byacc + + # libs + install_pkg "zypper --non-interactive install" libXxf86vm1 + + #devel + install_pkg "zypper --non-interactive install" libX11-devel + install_pkg "zypper --non-interactive install" glibc-devel + install_pkg "zypper --non-interactive install" libpng12-devel + ;; + + 6 ) echo -e "\nInstalling prerequisites with zypper..." + # tools + install_pkg "zypper --non-interactive install" subversion + install_pkg "zypper --non-interactive install" git-core + install_pkg "zypper --non-interactive install" gcc + install_pkg "zypper --non-interactive install" gcc-c++ + install_pkg "zypper --non-interactive install" make + install_pkg "zypper --non-interactive install" gawk + install_pkg "zypper --non-interactive install" bison + install_pkg "zypper --non-interactive install" flex + install_pkg "zypper --non-interactive install" bzip2 + install_pkg "zypper --non-interactive install" netpbm + install_pkg "zypper --non-interactive install" autoconf + install_pkg "zypper --non-interactive install" automake + install_pkg "zypper --non-interactive install" patch + install_pkg "zypper --non-interactive install" cmake + install_pkg "zypper --non-interactive install" gperf + install_pkg "zypper --non-interactive install" perl-Switch + install_pkg "zypper --non-interactive install" byacc + + # libs + install_pkg "zypper --non-interactive install" libXxf86vm1 + + #devel + install_pkg "zypper --non-interactive install" libX11-devel + install_pkg "zypper --non-interactive install" glibc-devel + install_pkg "zypper --non-interactive install" libpng12-devel + + # 32-bit support + install_pkg "zypper --non-interactive install" gcc-32bit + install_pkg "zypper --non-interactive install" gcc-c++-32bit + install_pkg "zypper --non-interactive install" glibc-devel-32bit + install_pkg "zypper --non-interactive install" libXxf86vm1-32bit + ;; + 0 ) exit 0 ;; esac @@ -147,8 +217,10 @@ cd "$curdir" input="" until [ "$input" = "9" ] do - echo -e "\nStep 2: Get the sources from the repository" - echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + echo -e "\n\n\n\n\n" + echo -e "***********************************************" + echo -e "* Step 2: get the sources from the repository *" + echo -e "***********************************************" echo -e "\nYou can either use Subversion or Git. Git doesn't require" echo -e "a password, but you'll get only read-only access." echo -e "The repositories will be checked out into the current directory." @@ -160,7 +232,7 @@ do echo -e "\n 3 | 23 | Get ports source (optional, needs contrib)" echo -e "\n 4 | --- | Get documentation source (optional)" echo -e " 5 | --- | Get binaries (wallpapers, logos etc.) (optional)" - echo -e "\n9 .. Leave loop, goto next step" + echo -e "\n9 .. Go to next step" echo -e "0 .. Exit" echo -e "\nEnter number and press :" @@ -198,7 +270,6 @@ do esac done - cd "$curdir" input="" @@ -206,11 +277,13 @@ until [ "$input" = "9" ] do cd "$curdir" - echo -e "\nStep 3: Configuring Toolchain" - echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - echo -e " 1 | i386 (32-bit)" + echo -e "\n\n\n\n\n" + echo -e "*******************************" + echo -e "* Step 3: configure toolchain *" + echo -e "*******************************" + echo -e "\n 1 | i386 (32-bit)" echo -e " 2 | x86_64 (64-bit)" - echo -e "\n9 .. Leave loop, goto next step" + echo -e "\n9 .. Go to next step" echo -e "0 .. Exit" echo -e "\nEnter number and press :" @@ -242,12 +315,15 @@ input="" until [ "$input" = "9" ] do cd "$curdir" - echo -e "\nStep 4: Building Toolchain" - echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~" + + echo -e "\n\n\n\n\n" + echo -e "***************************" + echo -e "* Step 4: build toolchain *" + echo -e "***************************" echo -e "\nYou can only build what you've already configured." - echo -e " 1 | i386 (32-bit)" + echo -e "\n 1 | i386 (32-bit)" echo -e " 2 | x86_64 (64-bit)" - echo -e "\n9 .. Leave loop, goto next step" + echo -e "\n9 .. Go to next step" echo -e "0 .. Exit" echo -e "\nEnter number and press :" @@ -279,15 +355,17 @@ until [ "$input" = "9" ] do cd "$curdir" - echo -e "\nStep 5: Configuring" - echo -e "~~~~~~~~~~~~~~~~~~~" + echo -e "\n\n\n\n\n" + echo -e "**************************" + echo -e "* Step 5: configure AROS *" + echo -e "**************************" echo -e "\n 1 | linux-i386 (32-bit) debug" echo -e " 2 | linux-i386 (32-bit)" echo -e " 3 | linux-x86_64 (64-bit) debug" echo -e " 4 | linux-x86_64 (64-bit)" echo -e " 5 | pc-i386 (32-bit)" echo -e " 6 | pc-x86_64 (64-bit)" - echo -e "\n9 .. Leave loop, goto next step" + echo -e "\n9 .. Go to next step" echo -e "0 .. Exit" echo -e "\nEnter number and press :" @@ -343,8 +421,11 @@ input="" until [ "$input" = "9" ] do cd "$curdir" - echo -e "\nStep 6: Building" - echo -e "~~~~~~~~~~~~~~~~" + + echo -e "\n\n\n\n\n" + echo -e "*****************" + echo -e "* Step 6: build *" + echo -e "*****************" echo -e "\nYou can only build what you've already configured." echo -e "\n 1 | linux-i386 (32-bit) debug" echo -e " 2 | linux-i386 (32-bit)" @@ -352,7 +433,7 @@ do echo -e " 4 | linux-x86_64 (64-bit)" echo -e " 5 | pc-i386 (32-bit)" echo -e " 6 | pc-x86_64 (64-bit)" - echo -e "\n9 .. Leave loop, goto next step" + echo -e "\n9 .. Go to next step" echo -e "0 .. Exit" echo -e "\nEnter number and press :" @@ -361,28 +442,24 @@ do 1 ) echo -e "\nBuilding linux-i386 V1 with full debug...\n" cd aros-linux-i386-dbg make $makeopts - #make default-x11keymaptable echo -e "\nIf everything went well AROS will be available" echo -e "in the directory aros-linux-i386-dbg/bin//AROS" ;; 2 ) echo -e "\nBuilding linux-i386 V1 without debug...\n" cd aros-linux-i386 make $makeopts - #make default-x11keymaptable echo -e "\nIf everything went well AROS will be available" echo -e "in the directory aros-linux-i386/bin//AROS" ;; 3 ) echo -e "\nBuilding linux-x86_64 V1 with full debug...\n" cd aros-linux-x86_64-dbg make $makeopts - #make default-x11keymaptable echo -e "\nIf everything went well AROS will be available" echo -e "in the directory aros-linux-x86_64-dbg/bin//AROS" ;; 4 ) echo -e "\nBuilding linux-x86_64 V1 without debug...\n" cd aros-linux-x86_64 make $makeopts - #make default-x11keymaptable echo -e "\nIf everything went well AROS will be available" echo -e "in the directory aros-linux-x86_64/bin//AROS" ;; diff --git a/scripts/gimmearos.sh b/scripts/gimmearos.sh index 3974c84f46..c0206e3bc0 100755 --- a/scripts/gimmearos.sh +++ b/scripts/gimmearos.sh @@ -8,13 +8,13 @@ # This script is public domain. Use it at your own risk. -# $VER: gimmearos.sh 1.11 (20.07.2014) WIP +# $VER: gimmearos.sh 1.11 (26.07.2014) WIP curdir="`pwd`" srcdir="aros-src" srcdir_v0="aros-src-v0" portsdir="$HOME/aros-ports-src" -cpucoresforcompile="4" +makeopts="-j2 -s" install_pkg() { @@ -33,11 +33,14 @@ install_pkg() } - -echo -e "\n\nScript for downloading and building of AROS" -echo -e "============================================" -echo -e "\nStep 1: install prerequisites" -echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" +echo -e "\n\n\n\n\n" +echo -e "***********************************************" +echo -e "* Script for downloading and building of AROS *" +echo -e "***********************************************" +echo -e "\n\n" +echo -e "*********************************" +echo -e "* Step 1: install prerequisites *" +echo -e "*********************************" echo -e "The build system needs some packages to do its job." echo -e "If you are asked for a password enter you admin password." echo -e "\n1 .. Get packages with apt-get for Debian and similar (e.g. Ubuntu)" @@ -203,7 +206,6 @@ case "$input" in install_pkg "zypper --non-interactive install" gcc-c++-32bit install_pkg "zypper --non-interactive install" glibc-devel-32bit install_pkg "zypper --non-interactive install" libXxf86vm1-32bit - #install_pkg "zypper --non-interactive install" libgmp10-32bit ;; 0 ) exit 0 @@ -215,8 +217,10 @@ cd "$curdir" input="" until [ "$input" = "9" ] do - echo -e "\nStep 2: Get the sources from the repository" - echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + echo -e "\n\n\n\n\n" + echo -e "***********************************************" + echo -e "* Step 2: get the sources from the repository *" + echo -e "***********************************************" echo -e "\nYou can either use Subversion or Git. Git doesn't require" echo -e "a password, but you'll get only read-only access." echo -e "The repositories will be checked out into the current directory." @@ -230,7 +234,7 @@ do echo -e "\n 3 | 13 | 23 | Get ports source (optional, needs contrib)" echo -e "\n 4 | 14 | --- | Get documentation source (optional)" echo -e " 5 | 15 | --- | Get binaries (wallpapers, logos etc.) (optional)" - echo -e "\n9 .. Leave loop, goto next step" + echo -e "\n9 .. Go to next step" echo -e "0 .. Exit" echo -e "\nEnter number and press :" @@ -292,8 +296,10 @@ until [ "$input" = "9" ] do cd "$curdir" - echo -e "\nStep 3: Configuring" - echo -e "~~~~~~~~~~~~~~~~~~~" + echo -e "\n\n\n\n\n" + echo -e "*********************" + echo -e "* Step 3: configure *" + echo -e "*********************" echo -e "\nABI V1 | ABI V0 |" echo -e "-------+--------+----------------------------" echo -e " 1 | 11 | linux-i386 (32-bit) debug" @@ -302,7 +308,7 @@ do echo -e " 4 | 14 | linux-x86_64 (64-bit)" echo -e " 5 | 15 | pc-i386 (32-bit)" echo -e " 6 | 16 | pc-x86_64 (64-bit)" - echo -e "\n9 .. Leave loop, goto next step" + echo -e "\n9 .. Go to next step" echo -e "0 .. Exit" echo -e "\nEnter number and press :" @@ -389,15 +395,17 @@ do done - cd "$curdir" input="" until [ "$input" = "9" ] do cd "$curdir" - echo -e "\nStep 4: Building" - echo -e "~~~~~~~~~~~~~~~~" + + echo -e "\n\n\n\n\n" + echo -e "*****************" + echo -e "* Step 4: build *" + echo -e "*****************" echo -e "\nYou can only build what you've already configured." echo -e "\nABI V1 | ABI V0 |" echo -e "-------+--------+----------------------------" @@ -407,51 +415,47 @@ do echo -e " 4 | 14 | linux-x86_64 (64-bit)" echo -e " 5 | 15 | pc-i386 (32-bit)" echo -e " 6 | 16 | pc-x86_64 (64-bit)" - echo -e "\n9 .. Leave loop, exit" - + echo -e "\n9 .. Go to next step" + echo -e "0 .. Exit" echo -e "\nEnter number and press :" read input case "$input" in 1 ) echo -e "\nBuilding linux-i386 V1 with full debug...\n" cd aros-linux-i386-dbg - make -j$cpucoresforcompile - make default-x11keymaptable + make $makeopts echo -e "\nIf everything went well AROS will be available" echo -e "in the directory aros-linux-i386-dbg/bin//AROS" ;; 2 ) echo -e "\nBuilding linux-i386 V1 without debug...\n" cd aros-linux-i386 - make -j$cpucoresforcompile - make default-x11keymaptable + make $makeopts echo -e "\nIf everything went well AROS will be available" echo -e "in the directory aros-linux-i386/bin//AROS" ;; 3 ) echo -e "\nBuilding linux-x86_64 V1 with full debug...\n" cd aros-linux-x86_64-dbg - make -j$cpucoresforcompile - make default-x11keymaptable + make $makeopts echo -e "\nIf everything went well AROS will be available" echo -e "in the directory aros-linux-x86_64-dbg/bin//AROS" ;; 4 ) echo -e "\nBuilding linux-x86_64 V1 without debug...\n" cd aros-linux-x86_64 - make -j$cpucoresforcompile - make default-x11keymaptable + make $makeopts echo -e "\nIf everything went well AROS will be available" echo -e "in the directory aros-linux-x86_64/bin//AROS" ;; 5 ) echo -e "\nBuilding pc-i386 V1...\n" cd aros-pc-i386 - make -j$cpucoresforcompile - make -j$cpucoresforcompile bootiso + make $makeopts + make $makeopts bootiso echo -e "\nIf everything went well AROS will be available" echo -e "in the directory aros-pc-i386/bin//AROS" ;; 6 ) echo -e "\nBuilding pc-x86_64 V1...\n" cd aros-pc-x86_64 - make -j$cpucoresforcompile - make -j$cpucoresforcompile bootiso + make $makeopts + make $makeopts bootiso echo -e "\nIf everything went well AROS will be available" echo -e "in the directory aros-pc-x86_64/bin//AROS" ;; @@ -459,43 +463,39 @@ do 11 ) echo -e "\nBuilding linux-i386 V0 with full debug...\n" cd aros-linux-i386-v0-dbg - make -j$cpucoresforcompile - make default-x11keymaptable + make $makeopts echo -e "\nIf everything went well AROS will be available" echo -e "in the directory aros-linux-i386-v0-dbg/bin//AROS" ;; 12 ) echo -e "\nBuilding linux-i386 V0 without debug...\n" cd aros-linux-i386-v0 - make -j$cpucoresforcompile - make default-x11keymaptable + make $makeopts echo -e "\nIf everything went well AROS will be available" echo -e "in the directory aros-linux-i386-v0/bin//AROS" ;; 13 ) echo -e "\nBuilding linux-x86_64 V0 with full debug...\n" cd aros-linux-x86_64-v0-dbg - make -j$cpucoresforcompile - make default-x11keymaptable + make $makeopts echo -e "\nIf everything went well AROS will be available" echo -e "in the directory aros-linux-x86_64-dbg/bin//AROS" ;; 14 ) echo -e "\nBuilding linux-x86_64 V0 without debug...\n" cd aros-linux-x86_64-v0 - make -j$cpucoresforcompile - make default-x11keymaptable + make $makeopts echo -e "\nIf everything went well AROS will be available" echo -e "in the directory aros-linux-x86_64-v0/bin//AROS" ;; 15 ) echo -e "\nBuilding pc-i386 V0...\n" cd aros-pc-i386-v0 - make -j$cpucoresforcompile - make -j$cpucoresforcompile bootiso + make $makeopts + make $makeopts bootiso echo -e "\nIf everything went well AROS will be available" echo -e "in the directory aros-pc-i386-v0/bin//AROS" ;; 16 ) echo -e "\nBuilding pc-x86_64 V0...\n" cd aros-pc-x86_64-v0 - make -j$cpucoresforcompile - make -j$cpucoresforcompile bootiso + make $makeopts + make $makeopts bootiso echo -e "\nIf everything went well AROS will be available" echo -e "in the directory aros-pc-x86_64-v0/bin//AROS" ;; @@ -505,7 +505,6 @@ do esac done - cd "$curdir" exit 0 -- 2.11.4.GIT