From 96f7acc919f44a576e11a494bcd11df3190140ea Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Tue, 25 Jun 2019 22:04:51 +0100 Subject: [PATCH] remove library building from scripts --- build-devkit.sh | 40 +----------------- config.sh.sample | 6 --- dka64/scripts/build-libs.sh | 7 ---- dkarm-eabi/scripts/build-libs.sh | 71 -------------------------------- dkppc/scripts/build-libs.sh | 27 ------------ 5 files changed, 2 insertions(+), 149 deletions(-) delete mode 100644 dka64/scripts/build-libs.sh delete mode 100644 dkarm-eabi/scripts/build-libs.sh delete mode 100644 dkppc/scripts/build-libs.sh diff --git a/build-devkit.sh b/build-devkit.sh index e09313f..909f4ac 100755 --- a/build-devkit.sh +++ b/build-devkit.sh @@ -1,6 +1,6 @@ #!/bin/bash #--------------------------------------------------------------------------------- -# devkitARM release 52-2 +# devkitARM release 53-1 # devkitPPC release 35 # devkitA64 release 13 #--------------------------------------------------------------------------------- @@ -28,17 +28,10 @@ echo GENERAL_TOOLS_VER=1.0.2 -LIBGBA_VER=0.5.2 GBATOOLS_VER=1.1.0 DKARM_RULES_VER=1.0.0 DKARM_CRTLS_VER=1.0.0 -LIBNDS_VER=1.7.2 -DEFAULT_ARM7_VER=0.7.4 -DSWIFI_VER=0.4.2 -MAXMOD_VER=1.0.11 -FILESYSTEM_VER=0.9.14 -LIBFAT_VER=1.1.3 DSTOOLS_VER=1.2.1 GRIT_VER=0.8.15 NDSTOOL_VER=2.1.1 @@ -48,13 +41,9 @@ DFU_UTIL_VER=0.9.1 STLINK_VER=1.2.3 GAMECUBE_TOOLS_VER=1.0.2 -LIBOGC_VER=1.8.21 WIILOAD_VER=0.5.1 DKPPC_RULES_VER=1.0.0 -LIBCTRU_VER=1.5.1 -CITRO3D_VER=1.5.0 -CITRO2D_VER=1.1.0 TOOLS3DS_VER=1.1.4 LINK3DS_VER=0.5.2 PICASSO_VER=2.7.0 @@ -64,7 +53,6 @@ GP32_TOOLS_VER=1.0.3 LIBMIRKO_VER=0.9.8 SWITCH_TOOLS_VER=1.4.1 -LIBNX_VER=1.3.0 OSXMIN=${OSXMIN:-10.9} @@ -218,12 +206,6 @@ archives="binutils-${BINUTILS_VER}.tar.xz gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_ if [ $VERSION -eq 1 ]; then - targetarchives="libnds-src-${LIBNDS_VER}.tar.bz2 libgba-src-${LIBGBA_VER}.tar.bz2 - libmirko-src-${LIBMIRKO_VER}.tar.bz2 dswifi-src-${DSWIFI_VER}.tar.bz2 maxmod-src-${MAXMOD_VER}.tar.bz2 - default-arm7-src-${DEFAULT_ARM7_VER}.tar.bz2 libfilesystem-src-${FILESYSTEM_VER}.tar.bz2 - libfat-src-${LIBFAT_VER}.tar.bz2 libctru-src-${LIBCTRU_VER}.tar.bz2 citro3d-src-${CITRO3D_VER}.tar.bz2 - citro2d-src-${CITRO2D_VER}.tar.bz2" - hostarchives="gba-tools-$GBATOOLS_VER.tar.bz2 gp32-tools-$GP32_TOOLS_VER.tar.bz2 dstools-$DSTOOLS_VER.tar.bz2 grit-$GRIT_VER.tar.bz2 ndstool-$NDSTOOL_VER.tar.bz2 general-tools-$GENERAL_TOOLS_VER.tar.bz2 mmutil-$MMUTIL_VER.tar.bz2 @@ -235,8 +217,6 @@ fi if [ $VERSION -eq 2 ]; then - targetarchives="libogc-src-${LIBOGC_VER}.tar.bz2 libfat-src-${LIBFAT_VER}.tar.bz2" - hostarchives="gamecube-tools-$GAMECUBE_TOOLS_VER.tar.bz2 wiiload-$WIILOAD_VER.tar.bz2 general-tools-$GENERAL_TOOLS_VER.tar.bz2" archives="binutils-${MN_BINUTILS_VER}.tar.bz2 devkitppc-rules-$DKPPC_RULES_VER.tar.xz $archives" @@ -244,8 +224,6 @@ fi if [ $VERSION -eq 3 ]; then - targetarchives=" libnx-src-${LIBNX_VER}.tar.bz2" - hostarchives="general-tools-$GENERAL_TOOLS_VER.tar.bz2 switch-tools-$SWITCH_TOOLS_VER.tar.bz2" fi @@ -258,7 +236,7 @@ else fi cd "$SRCDIR" -for archive in $archives $targetarchives $hostarchives +for archive in $archives $hostarchives do echo $archive if [ ! -f $archive ]; then @@ -279,16 +257,6 @@ if [ $VERSION -eq 2 ]; then extract_and_patch binutils $MN_BINUTILS_VER bz2 fi -for archive in $targetarchives -do - destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' ) - echo $destdir - if [ ! -d $destdir ]; then - mkdir -p $destdir - bzip2 -cd "$SRCDIR/$archive" | tar -xf - -C $destdir || { echo "Error extracting "$archive; exit 1; } - fi -done - for archive in $hostarchives do destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' ) @@ -306,10 +274,6 @@ if [ "$BUILD_DKPRO_SKIP_TOOLS" != "1" ] && [ -f $scriptdir/build-tools.sh ]; the . $scriptdir/build-tools.sh || { echo "Error building tools"; exit 1; }; cd $BUILDSCRIPTDIR; fi -if [ "$BUILD_DKPRO_SKIP_LIBRARIES" != "1" ] && [ -f $scriptdir/build-libs.sh ]; then - . $scriptdir/build-libs.sh || { echo "Error building libraries"; exit 1; }; cd $BUILDSCRIPTDIR; -fi - cd $BUILDSCRIPTDIR if [ ! -z $CROSSBUILD ] && grep -q "mingw" <<<"$CROSSBUILD" ; then diff --git a/config.sh.sample b/config.sh.sample index 01667cc..1754db4 100755 --- a/config.sh.sample +++ b/config.sh.sample @@ -35,12 +35,6 @@ BUILD_DKPRO_PACKAGE=0 #--------------------------------------------------------------------------------- #BUILD_DKPRO_SKIP_TOOLS=1 -#--------------------------------------------------------------------------------- -# Uncomment to skip building of libraries -#--------------------------------------------------------------------------------- -#BUILD_DKPRO_SKIP_LIBRARIES=1 - - # Automated script execution #--------------------------------------------------------------------------------- # 0: Ask to delete build folders & patched sources diff --git a/dka64/scripts/build-libs.sh b/dka64/scripts/build-libs.sh deleted file mode 100644 index 7fd43ee..0000000 --- a/dka64/scripts/build-libs.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -export DEVKITPRO=$TOOLPATH - -cd $BUILDDIR/libnx-$LIBNX_VER -$MAKE || { echo "error building libnx"; exit 1; } -$MAKE install || { echo "error installing libnx"; exit 1; } diff --git a/dkarm-eabi/scripts/build-libs.sh b/dkarm-eabi/scripts/build-libs.sh deleted file mode 100644 index 74446dd..0000000 --- a/dkarm-eabi/scripts/build-libs.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh - -#--------------------------------------------------------------------------------- -# set env variables -#--------------------------------------------------------------------------------- -export DEVKITPRO=$TOOLPATH -export DEVKITARM=$DEVKITPRO/devkitARM - -#--------------------------------------------------------------------------------- -# Install the rules files -#--------------------------------------------------------------------------------- -cd $BUILDDIR - -mkdir -p rules -cd rules -tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz -make install - -#--------------------------------------------------------------------------------- -# Install and build the crt0 files -#--------------------------------------------------------------------------------- -cd $BUILDDIR - -mkdir -p crtls -cd crtls -tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz -make install - -cd $BUILDDIR/libgba-$LIBGBA_VER -$MAKE || { echo "error building libgba"; exit 1; } -$MAKE install || { echo "error installing libgba"; exit 1; } - -cd $BUILDDIR/libnds-$LIBNDS_VER -$MAKE || { echo "error building libnds"; exit 1; } -$MAKE install || { echo "error installing libnds"; exit 1; } - -cd $BUILDDIR/dswifi-$DSWIFI_VER -$MAKE || { echo "error building dswifi"; exit 1; } -$MAKE install || { echo "error installing dswifi"; exit 1; } - -cd $BUILDDIR/maxmod-$MAXMOD_VER -$MAKE || { echo "error building maxmod"; exit 1; } -$MAKE install || { echo "error installing maxmod"; exit 1; } - -cd $BUILDDIR/default_arm7-$DEFAULT_ARM7_VER -$MAKE || { echo "error building default arm7"; exit 1; } -$MAKE install || { echo "error installing default arm7"; exit 1; } - -cd $BUILDDIR/libfat-$LIBFAT_VER -$MAKE nds-install || { echo "error building nds libfat"; exit 1; } -$MAKE gba-install || { echo "error installing gba libfat"; exit 1; } - -#cd $BUILDDIR/libmirko-$LIBMIRKO_VER -#$MAKE || { echo "error building libmirko"; exit 1; } -#$MAKE install || { echo "error installing libmirko"; exit 1; } - -cd $BUILDDIR/libfilesystem-$FILESYSTEM_VER -$MAKE || { echo "error building libfilesystem"; exit 1; } -$MAKE install || { echo "error installing libfilesystem"; exit 1; } - -cd $BUILDDIR/libctru-$LIBCTRU_VER -$MAKE || { echo "error building libctru"; exit 1; } -$MAKE install || { echo "error installing libctru"; exit 1; } - -cd $BUILDDIR/citro3d-$CITRO3D_VER -$MAKE || { echo "error building citro3d"; exit 1; } -$MAKE install || { echo "error installing citro3d"; exit 1; } - -cd $BUILDDIR/citro2d-$CITRO2D_VER -$MAKE || { echo "error building citro2d"; exit 1; } -$MAKE install || { echo "error installing citro2d"; exit 1; } diff --git a/dkppc/scripts/build-libs.sh b/dkppc/scripts/build-libs.sh deleted file mode 100644 index d271da7..0000000 --- a/dkppc/scripts/build-libs.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -export DEVKITPPC=$TOOLPATH/devkitPPC -export DEVKITPRO=$TOOLPATH - -cd $BUILDDIR -mkdir -p rules -cd rules -tar -xvf $SRCDIR/devkitppc-rules-$DKPPC_RULES_VER.tar.xz -make install - -cd $BUILDDIR/libogc-$LIBOGC_VER - -if [ ! -f installed ]; then - echo "Building & installing libogc" - $MAKE install || { echo "libogc install failed"; exit 1; } - touch installed -fi - -cd $BUILDDIR/libfat-$LIBFAT_VER - -if [ ! -f installed ]; then - echo "Building & installing libfat" - $MAKE ogc-install || { echo "libfat install failed"; exit 1; } - touch installed -fi -