From fc6fc0deeb15cd8df633defdd4b8f72f55ea7061 Mon Sep 17 00:00:00 2001 From: divverent Date: Sun, 18 Jan 2015 15:32:27 +0000 Subject: [PATCH] Try to insert the Xonotic icon another way (without resedit.exe). git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12136 d7cf8633-e32d-0410-b094-e92efae38249 --- .travis-before_install-xonotic.sh | 6 ++++++ .travis-script-xonotic.sh | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh index a36b141c..8d8ce4d6 100755 --- a/.travis-before_install-xonotic.sh +++ b/.travis-before_install-xonotic.sh @@ -46,9 +46,15 @@ for os in "$@"; do ) ;; win32) + git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \ + --prefix=".icons/" master:"misc/logos/icons_ico" | tar xvf - + mv .icons/xonotic.ico darkplaces.ico wget -qO- http://beta.xonotic.org/win-builds.org/cross_toolchain_32.tar.xz | sudo tar xaJvf - -C/ opt/cross_toolchain_32 ;; win64) + git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \ + --prefix=".icons/" master:"misc/logos/icons_ico" | tar xvf - + mv .icons/xonotic.ico darkplaces.ico wget -qO- http://beta.xonotic.org/win-builds.org/cross_toolchain_64.tar.xz | sudo tar xvJf - -C/ opt/cross_toolchain_64 ;; osx) diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh index c859d4c7..5ea3fb82 100755 --- a/.travis-script-xonotic.sh +++ b/.travis-script-xonotic.sh @@ -114,15 +114,15 @@ for os in "$@"; do ) ( - trap "${chroot} make -C ${PWD} ${makeflags} clean" EXIT - eval "${chroot} make -C ${PWD} ${makeflags} ${maketargets}" - for o in $outputs; do - src=${o%%:*} - dst=${o#*:} - sftp -oStrictHostKeyChecking=no -i id_rsa-xonotic -P 2222 -b - autobuild-bin-uploader@beta.xonotic.org <