Skip to main content

Browse the archive

Revision 0b45f435d9fb0332e8601adc9360de711cdb319b authored by Ronny Lorenz on 11 May 2015, 09:20:33 UTC, committed by Ronny Lorenz on 11 May 2015, 09:20:33 UTC 
Merge branch 'development' for v2.2.0-RC3
 
Conflicts:
	interfaces/Python/setup.py.in
	src/ViennaRNA/cofold.c
	src/ViennaRNA/data_structures.c
	src/ViennaRNA/data_structures.h
	src/ViennaRNA/fold.c
	src/ViennaRNA/fold.h
	src/ViennaRNA/multibranch_loops.h
	src/ViennaRNA/part_func.c
	src/ViennaRNA/part_func.h
	src/ViennaRNA/part_func_co.c
	src/ViennaRNA/part_func_co.h
	src/ViennaRNA/perturbation_fold.c
	src/ViennaRNA/subopt.c
	src/bin/RNA2Dfold.c
	src/bin/RNAalifold.c
	src/bin/RNAcofold.c
	src/bin/RNAfold.c
	src/bin/RNApvmin.c
	src/bin/RNAsubopt.c
	src/bin/RNAsubopt.ggo

All conflicts resolved and bump to v2.2.0-RC3
2 parent s b7822a1 + e4bc14c
Raw File
make_windows_installer.sh 
#!/bin/bash
#

WIN_INSTALLER_LOG=win_installer.log

export ac_cv_func_realloc_0_nonnull=yes
export ac_cv_func_malloc_0_nonnull=yes



case "$1" in

arch64) echo "Making Windows Installer using Arch Linux mingw-w64 installation"
              echo -ne "...making 32bit version..."
              ./configure --host=i686-w64-mingw32 --without-perl --without-forester --with-cluster &>> ${WIN_INSTALLER_LOG}
              make clean &>> ${WIN_INSTALLER_LOG}
              make &>> ${WIN_INSTALLER_LOG}
              makensis win_installer_archlinux_i686.nsi &>> ${WIN_INSTALLER_LOG}
              echo -ne " done\n"
              echo -ne "...making 64bit version..."
              ./configure --host=x86_64-w64-mingw32 --without-perl --without-forester --with-cluster &>> ${WIN_INSTALLER_LOG}
              make clean &>> ${WIN_INSTALLER_LOG}
              make &>> ${WIN_INSTALLER_LOG}
              makensis win_installer_archlinux_x86_64.nsi &>> ${WIN_INSTALLER_LOG}
              echo -ne " done\n"
              ;;

arch)         echo "Making Windows Installer using Arch Linux mingw32 installation of mingw"
              echo -ne "...making 32bit version..."
              ./configure --host=i486-mingw32 --without-perl --without-forester --with-cluster &>> ${WIN_INSTALLER_LOG}
              make clean &>> ${WIN_INSTALLER_LOG}
              make &>> ${WIN_INSTALLER_LOG}
              makensis win_installer_archlinux_i486.nsi &>> ${WIN_INSTALLER_LOG}
              echo -ne " done\n"
              ;;

*)            echo "Making Windows Installer using Fedora installation of mingw64"
              echo -ne "...making 32bit version..."
              mingw32-configure --without-perl --without-forester --with-cluster &>> ${WIN_INSTALLER_LOG}
              make clean  &>> ${WIN_INSTALLER_LOG}
              make &>> ${WIN_INSTALLER_LOG}
              makensis win_installer_fedora_i686.nsi >> ${WIN_INSTALLER_LOG}
              echo -ne " done\n"
              echo -ne "...making 64bit version..."
              mingw64-configure --without-perl --without-forester --with-cluster &>> ${WIN_INSTALLER_LOG}
              make clean  &>> ${WIN_INSTALLER_LOG}
              make &>> ${WIN_INSTALLER_LOG}
              makensis win_installer_fedora_x86_64.nsi &>> ${WIN_INSTALLER_LOG}
              echo -ne "done\n"
              ;;

esac
back to top