diff options
| author | Phillip Lord <phillip.lord@russet.org.uk> | 2017-10-25 09:17:16 +0100 |
|---|---|---|
| committer | Phillip Lord <phillip.lord@russet.org.uk> | 2017-10-25 09:18:04 +0100 |
| commit | 628b65320953ff5333b332e9010c16941cba177f (patch) | |
| tree | 31011a686284ea06c1d8a1009162c62d4f8b30a5 /admin | |
| parent | e8a06a5f9a98094d340dda1c9c8b195f3e66e2c8 (diff) | |
| download | emacs-628b65320953ff5333b332e9010c16941cba177f.tar.gz | |
Fix windows build errors
* admin/nt/dist-build/build-zips.sh: Correct name of zip file, build
64 bit first
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/nt/dist-build/build-zips.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/admin/nt/dist-build/build-zips.sh b/admin/nt/dist-build/build-zips.sh index e78f72cf9c3..fb44c31c70d 100755 --- a/admin/nt/dist-build/build-zips.sh +++ b/admin/nt/dist-build/build-zips.sh @@ -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)) +if (($BUILD_64)) then - build_zip i686 /mingw32/lib/pkgconfig i686-w64-mingw32 + build_zip x86_64 /mingw64/lib/pkgconfig x86_64-w64-mingw32 fi -if (($BUILD_64)) +## 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 x86_64 /mingw64/lib/pkgconfig x86_64-w64-mingw32 + build_zip i686 /mingw32/lib/pkgconfig i686-w64-mingw32 fi |