Mercurial > mxe-octave
diff dist-files.mk @ 4793:202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
* src/msys2-bash.mk: new file
* src/msys2-coreutils.mk: new file
* src/msys2-diffutils.mk: new file
* src/msys2-dos2unix.mk: new file
* src/msys2-filesystem.mk: new file
* src/msys2-findutils.mk: new file
* src/msys2-gawk.mk: new file
* src/msys2-gcc-libs.mk: new file
* src/msys2-gmp.mk: new file
* src/msys2-gnupg.mk: new file
* src/msys2-grep.mk: new file
* src/msys2-gzip.mk: new file
* src/msys2-icu.mk: new file
* src/msys2-info.mk: new file
* src/msys2-less.mk: new file
* src/msys2-libassuan.mk: new file
* src/msys2-libbz2.mk: new file
* src/msys2-libexpat.mk: new file
* src/msys2-libgpg-error.mk: new file
* src/msys2-libgpgme.mk: new file
* src/msys2-libiconv.mk: new file
* src/msys2-libidn2.mk: new file
* src/msys2-libintl.mk: new file
* src/msys2-liblzma.mk: new file
* src/msys2-libmetalink.mk: new file
* src/msys2-libopenssl.mk: new file
* src/msys2-libpcre.mk: new file
* src/msys2-libpsl.mk: new file
* src/msys2-libreadline.mk: new file
* src/msys2-libunistring.mk: new file
* src/msys2-libutil-linux.mk: new file
* src/msys2-libxml2.mk: new file
* src/msys2-make.mk: new file
* src/msys2-mintty.mk: new file
* src/msys2-ncurses.mk: new file
* src/msys2-pacman-mirrors.mk: new file
* src/msys2-pacman.mk: new file
* src/msys2-patch.mk: new file
* src/msys2-runtime.mk: new file
* src/msys2-sed.mk: new file
* src/msys2-tar.mk: new file
* src/msys2-unzip.mk: new file
* src/msys2-wget.mk: new file
* src/msys2-zip.mk: new file
* src/msys2-zlib.mk: new file
* src/msys2-mpfr.mk: new file
* src/msys2-libsqlite.mk: new file
* src/msys2-keyring.mk: new file
* src/msys2-libffi.mk: new file
* src/msys2-libgnutls.mk: new file
* src/msys2-libhogweed.mk: new file
* src/msys2-libksba.mk: new file
* src/msys2-libnettle.mk: new file
* src/msys2-libnpth.mk: new file
* src/msys2-libp11-kit.mk: new file
* src/msys2-libtasn1.mk: new file
* src/src-msys2-bash.mk: new file
* src/src-msys2-coreutils.mk: new file
* src/src-msys2-diffutils.mk: new file
* src/src-msys2-dos2unix.mk: new file
* src/src-msys2-filesystem.mk: new file
* src/src-msys2-findutils.mk: new file
* src/src-msys2-gawk.mk: new file
* src/src-msys2-gcc-libs.mk: new file
* src/src-msys2-gmp.mk: new file
* src/src-msys2-gnupg.mk: new file
* src/src-msys2-grep.mk: new file
* src/src-msys2-gzip.mk: new file
* src/src-msys2-icu.mk: new file
* src/src-msys2-info.mk: new file
* src/src-msys2-keyring.mk: new file
* src/src-msys2-less.mk: new file
* src/src-msys2-libassuan.mk: new file
* src/src-msys2-libbz2.mk: new file
* src/src-msys2-libexpat.mk: new file
* src/src-msys2-libffi.mk: new file
* src/src-msys2-libgcrypt.mk: new file
* src/src-msys2-libgnutls.mk: new file
* src/src-msys2-libgpg-error.mk: new file
* src/src-msys2-libgpgme.mk: new file
* src/src-msys2-libhogweed.mk: new file
* src/src-msys2-libiconv.mk: new file
* src/src-msys2-libidn2.mk: new file
* src/src-msys2-libintl.mk: new file
* src/src-msys2-libksba.mk: new file
* src/src-msys2-liblzma.mk: new file
* src/src-msys2-libmetalink.mk: new file
* src/src-msys2-libnettle.mk: new file
* src/src-msys2-libnpth.mk: new file
* src/src-msys2-libopenssl.mk: new file
* src/src-msys2-libp11-kit.mk: new file
* src/src-msys2-libpcre.mk: new file
* src/src-msys2-libpsl.mk: new file
* src/src-msys2-libreadline.mk: new file
* src/src-msys2-libsqlite.mk: new file
* src/src-msys2-libtasn1.mk: new file
* src/src-msys2-libunistring.mk: new file
* src/src-msys2-libutil-linux.mk: new file
* src/src-msys2-libxml2.mk: new file
* src/src-msys2-make.mk: new file
* src/src-msys2-mintty.mk: new file
* src/src-msys2-mpfr.mk: new file
* src/src-msys2-ncurses.mk: new file
* src/src-msys2-pacman-mirrors.mk: new file
* src/src-msys2-pacman.mk: new file
* src/src-msys2-patch.mk: new file
* src/src-msys2-runtime.mk: new file
* src/src-msys2-sed.mk: new file
* src/src-msys2-tar.mk: new file
* src/src-msys2-unzip.mk: new file
* src/src-msys2-wget.mk: new file
* src/src-msys2-zip.mk: new file
* src/src-msys2-zlib.mk: new file
* Makefile.in: add msys2 vars and base rules
* index.html: ref new msys2 targets
* dist-files.mk: added refs to new msys2 mk files
* binary-dist-rules.mk: added conditional msys/msys2 dist files, post-install.bat
* configure.ac: added --with-msys2 option
* installer-files/post-install.bat: new file
* tools/makeinst-script.sh.in: call post-install.bat instead of fc_update and octave,
and use nsExec to hide comd windows while executing it
* tools/msys2-install.py; new file
* installer-files/cmdshell.bat, installer-files/fc_update.bat,
installer-files/octave-firsttime.vbs, installer-files/octave.vbs:
update paths when running msys2
author | John Donoghue |
---|---|
date | Wed, 15 Aug 2018 08:05:01 -0400 |
parents | ade16902356d |
children | ab4099a3573e |
line wrap: on
line diff
--- a/dist-files.mk Mon Aug 13 14:27:16 2018 -0400 +++ b/dist-files.mk Wed Aug 15 08:05:01 2018 -0400 @@ -890,6 +890,129 @@ SRC_MSVCTOOLS_MATH_FILES := \ $(addprefix src/build-msvctools/math/, $(SRC_MSVCTOOLS_MATH_FILES_1)) +SRC_MSYS2_FILES_1 := \ + msys2-bash.mk \ + msys2-coreutils.mk \ + msys2-diffutils.mk \ + msys2-dos2unix.mk \ + msys2-filesystem.mk \ + msys2-findutils.mk \ + msys2-gawk.mk \ + msys2-gcc-libs.mk \ + msys2-gmp.mk \ + msys2-gnupg.mk \ + msys2-grep.mk \ + msys2-gzip.mk \ + msys2-icu.mk \ + msys2-info.mk \ + msys2-keyring.mk \ + msys2-less.mk \ + msys2-libassuan.mk \ + msys2-libbz2.mk \ + msys2-libexpat.mk \ + msys2-libffi.mk \ + msys2-libgnutls.mk \ + msys2-libgpg-error.mk \ + msys2-libgpgme.mk \ + msys2-libhogweed.mk \ + msys2-libiconv.mk \ + msys2-libidn2.mk \ + msys2-libintl.mk \ + msys2-libksba.mk \ + msys2-liblzma.mk \ + msys2-libmetalink.mk \ + msys2-libnettle.mk \ + msys2-libnpth.mk \ + msys2-libopenssl.mk \ + msys2-libp11-kit.mk \ + msys2-libpcre.mk \ + msys2-libpsl.mk \ + msys2-libreadline.mk \ + msys2-libsqlite.mk \ + msys2-libtasn1.mk \ + msys2-libunistring.mk \ + msys2-libutil-linux.mk \ + msys2-libxml2.mk \ + msys2-make.mk \ + msys2-mintty.mk \ + msys2-mpfr.mk \ + msys2-ncurses.mk \ + msys2-pacman-mirrors.mk \ + msys2-pacman.mk \ + msys2-patch.mk \ + msys2-runtime.mk \ + msys2-sed.mk \ + msys2-tar.mk \ + msys2-unzip.mk \ + msys2-wget.mk \ + msys2-zip.mk \ + msys2-zlib.mk + +SRC_MSYS2_FILES := \ + $(addprefix src/, $(SRC_MSYS2_FILES_1)) + +SRC_MSYS2_SRC_FILES := \ + src-msys2-bash.mk \ + src-msys2-coreutils.mk \ + src-msys2-diffutils.mk \ + src-msys2-dos2unix.mk \ + src-msys2-filesystem.mk \ + src-msys2-findutils.mk \ + src-msys2-gawk.mk \ + src-msys2-gcc-libs.mk \ + src-msys2-gmp.mk \ + src-msys2-gnupg.mk \ + src-msys2-grep.mk \ + src-msys2-gzip.mk \ + src-msys2-icu.mk \ + src-msys2-info.mk \ + src-msys2-keyring.mk \ + src-msys2-less.mk \ + src-msys2-libassuan.mk \ + src-msys2-libbz2.mk \ + src-msys2-libexpat.mk \ + src-msys2-libffi.mk \ + src-msys2-libgcrypt.mk \ + src-msys2-libgnutls.mk \ + src-msys2-libgpg-error.mk \ + src-msys2-libgpgme.mk \ + src-msys2-libhogweed.mk \ + src-msys2-libiconv.mk \ + src-msys2-libidn2.mk \ + src-msys2-libintl.mk \ + src-msys2-libksba.mk \ + src-msys2-liblzma.mk \ + src-msys2-libmetalink.mk \ + src-msys2-libnettle.mk \ + src-msys2-libnpth.mk \ + src-msys2-libopenssl.mk \ + src-msys2-libp11-kit.mk \ + src-msys2-libpcre.mk \ + src-msys2-libpsl.mk \ + src-msys2-libreadline.mk \ + src-msys2-libsqlite.mk \ + src-msys2-libtasn1.mk \ + src-msys2-libunistring.mk \ + src-msys2-libutil-linux.mk \ + src-msys2-libxml2.mk \ + src-msys2-make.mk \ + src-msys2-mintty.mk \ + src-msys2-mpfr.mk \ + src-msys2-ncurses.mk \ + src-msys2-pacman-mirrors.mk \ + src-msys2-pacman.mk \ + src-msys2-patch.mk \ + src-msys2-runtime.mk \ + src-msys2-sed.mk \ + src-msys2-tar.mk \ + src-msys2-unzip.mk \ + src-msys2-wget.mk \ + src-msys2-zip.mk \ + src-msys2-zlib.mk + +SRC_MSYS2_SRC_FILES := \ + $(addprefix src/, $(SRC_MSYS2_SRC_FILES_1)) + TOOLS_FILES_1 := \ build-make.sh \ config.guess \ @@ -899,6 +1022,7 @@ make-shared-from-static \ makeinst-script.sh.in \ mk-hg-id.sh \ + msys2-install.py \ patch-tool-mxe \ pkg-install.py \ s3-fetch-and-sync \ @@ -924,6 +1048,7 @@ INSTALL_FILES_1 := \ cmdshell.bat \ + post-install.bat \ fc_update.bat \ gpl-3.0.txt \ octave.bat \ @@ -932,14 +1057,19 @@ octave-firsttime.vbs \ octave-hdr.bmp \ octave-logo.ico \ + post-install.bat \ README.html INSTALL_FILES := $(addprefix installer-files/, $(INSTALL_FILES_1)) DIST_FILES := \ $(SRC_FILES) \ + $(SRC_MSYS2_FILES) \ + $(SRC_MSYS2_SRC_FILES) \ $(SRC_MSVCTOOLS_FILES) \ $(SRC_MSVCTOOLS_COMPAT_FILES) \ $(SRC_MSVCTOOLS_MATH_FILES) \ $(TOOLS_FILES) \ $(FILES) \ $(INSTALL_FILES) + +