mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-22 07:09:54 +00:00
Code Issues Releases Activity

Fix windows build errors

Browse Source 
* admin/nt/dist-build/build-zips.sh: Correct name of zip file, build
  64 bit first
This commit is contained in:
Phillip Lord 2017-10-25 09:17:16 +01:00
parent e8a06a5f9a
commit 628b653209
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
admin/nt/dist-build/build-zips.sh
View File

@ -55,7 +55,7 @@ function build_zip {
cd $HOME/emacs-build/install/emacs-$VERSION/$ARCH
cp $HOME/emacs-build/deps/libXpm/$ARCH/libXpm-noX4.dll bin
zip -r -9 emacs-$VERSION-$ARCH-no-deps.zip *
mv emacs-$VERSION-$ARCH.zip $HOME/emacs-upload
mv emacs-$VERSION-$ARCH-no-deps.zip $HOME/emacs-upload
rm bin/libXpm-noX4.dll
unzip $HOME/emacs-build/deps/emacs-26-$ARCH-deps.zip
zip -r -9 emacs-$VERSION-$ARCH.zip *
@ -132,12 +132,14 @@ then
git_up
fi
if (($BUILD_32))
then
build_zip i686 /mingw32/lib/pkgconfig i686-w64-mingw32
fi
if (($BUILD_64))
then
build_zip x86_64 /mingw64/lib/pkgconfig x86_64-w64-mingw32
fi
## Do the 64 bit build first, because we reset some environment
## variables during the 32 bit which will break the build.
if (($BUILD_32))
then
build_zip i686 /mingw32/lib/pkgconfig i686-w64-mingw32
fi