From e18d7bc4bb065971aa1860f87f6322e93a075303 Mon Sep 17 00:00:00 2001 From: David Macek Date: Sun, 5 Feb 2017 12:35:44 +0100 Subject: [PATCH] msys2-installer: Split into its own repository -- https://github.com/msys2/msys2-installer --- msys2-installer/auto-install.js | 78 --------- msys2-installer/compress-msys2 | 32 ---- msys2-installer/compress_exclude | 13 -- msys2-installer/make-msys2-installer | 149 ------------------ msys2-installer/make-msys2-installer.bat | 52 ------ msys2-installer/msys2.ico | Bin 25758 -> 0 bytes msys2-installer/qt-ifw/config/config.xml | 12 -- .../com.msys2.root.base/meta/installscript.js | 38 ----- .../com.msys2.root.base/meta/package.xml | 9 -- .../com.msys2.root/meta/installscript.js | 14 -- .../packages/com.msys2.root/meta/package.xml | 8 - 11 files changed, 405 deletions(-) delete mode 100644 msys2-installer/auto-install.js delete mode 100644 msys2-installer/compress-msys2 delete mode 100644 msys2-installer/compress_exclude delete mode 100644 msys2-installer/make-msys2-installer delete mode 100644 msys2-installer/make-msys2-installer.bat delete mode 100644 msys2-installer/msys2.ico delete mode 100644 msys2-installer/qt-ifw/config/config.xml delete mode 100644 msys2-installer/qt-ifw/packages/com.msys2.root.base/meta/installscript.js delete mode 100644 msys2-installer/qt-ifw/packages/com.msys2.root.base/meta/package.xml delete mode 100644 msys2-installer/qt-ifw/packages/com.msys2.root/meta/installscript.js delete mode 100644 msys2-installer/qt-ifw/packages/com.msys2.root/meta/package.xml diff --git a/msys2-installer/auto-install.js b/msys2-installer/auto-install.js deleted file mode 100644 index 3eda6278..00000000 --- a/msys2-installer/auto-install.js +++ /dev/null @@ -1,78 +0,0 @@ -// Run with: -// ./msys2-x86_64-$(date +'%Y%m%d').exe --platform minimal --script auto-install.js -v -// Currently it gets stuck on the last page. -// To see graphically what's happening, remove "--platform minimal" - -function Controller() -{ - print("(print) Hello Installer World!\n"); - console.log("(console.log) Hello Installer World!\n"); - installer.setDefaultPageVisible(QInstaller.Introduction, true); - installer.setDefaultPageVisible(QInstaller.TargetDirectory, false); - - var page = gui.pageWidgetByObjectName( "ComponentSelectionPage" ); - page.selectComponent( "com.msys2.root" ); - page.selectComponent( "com.msys2.root.base" ); - - installer.setDefaultPageVisible(QInstaller.ComponentSelection, false); - installer.setDefaultPageVisible(QInstaller.StartMenuSelection, false); - installer.setDefaultPageVisible(QInstaller.LicenseCheck, false); - installer.setDefaultPageVisible(QInstaller.ReadyForInstallation, false); - installer.setDefaultPageVisible(QInstaller.PerformInstallation, true); - installer.setDefaultPageVisible(QInstaller.InstallationFinished, true); - installer.setDefaultPageVisible(QInstaller.FinishedPage, true); - ComponentSelectionPage.selectAll(); - installer.autoRejectMessageBoxes(); - var result = QMessageBox.question("quit.question", "Installer", "Do you want to quit the installer?", - QMessageBox.Yes | QMessageBox.No); - - console.log("(console.log) result " + result); - installer.setDefaultPageVisible(QInstaller.TargetDirectory, false); - - installer.setMessageBoxAutomaticAnswer("OverwriteTargetDirectory", QMessageBox.Yes); - installer.setMessageBoxAutomaticAnswer("stopProcessesForUpdates", QMessageBox.Ignore); -} - -Controller.prototype.IntroductionPageCallback = function() -{ - gui.clickButton(buttons.NextButton); -} - -Controller.prototype.PerformInstallationPageCallback = function() -{ - var page = gui.pageWidgetByObjectName("PerformInstallationPage"); - installer.setAutomatedPageSwitchEnabled(true); - gui.clickButton(buttons.NextButton); -} - -Controller.prototype.InstallationFinishedPageCallback = function() -{ - console.log("(console.log) InstallationFinishedPageCallback "); - var checkBox = gui.pageWidgetByObjectName("RunItCheckBox"); - console.log("typeof checkBox is " + typeof checkBox); - assert(typeof checkBox === 'object'); - - var page = gui.pageWidgetByObjectName("InstallationFinishedPage"); - gui.clickButton(buttons.NexthButton); -} - -Controller.prototype.FinishedPageCallback = function() -{ - console.log("(console.log) FinishedPageCallback "); -// var checkBox = gui.pageWidgetByObjectName("RunItCheckBox"); -// console.log("typeof checkBox is " + typeof checkBox); -// assert(typeof checkBox === 'object'); - - var page = gui.pageWidgetByObjectName("FinishedPage"); - page.RunItCheckBox.checked = false; - gui.clickButton(buttons.FinishButton); -} - -/* -Controller.prototype.ComponentSelectionPageCallback = function() -{ - var page = gui.pageWidgetByObjectName( "ComponentSelectionPage" ) - page.deselectComponent( "com.nokia.ndk.tools.maemo.usbdriver" ) - gui.clickButton( buttons.NextButton ) -} -*/ diff --git a/msys2-installer/compress-msys2 b/msys2-installer/compress-msys2 deleted file mode 100644 index 61207397..00000000 --- a/msys2-installer/compress-msys2 +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -_arch=$(uname -m) -_date=$(date +'%Y%m%d') -_filename=${_arch}-msys2-${_date}.tar.xz -_log=/tmp/compress.log - -echo "Creating MSYS2 archive /tmp/$_filename" -if [ -f /tmp/$_filename ]; then - rm -f /tmp/$_filename -fi - -_dirs= -for curr_dir in /etc /include /lib /libexec /sbin /share /ssl /tmp /usr /var /msys2.ico /msys2_shell.cmd; do - if [[ -d $curr_dir || -f $curr_dir ]]; then - _dirs="$_dirs $curr_dir" - fi -done - -if [ -n "$_dirs" ]; then - _compress_cmd="/usr/bin/tar --transform='s/:/_/g' --dereference --hard-dereference -cvJf /tmp/${_filename} $_dirs -X /etc/compress_exclude" - cd / - eval ${_compress_cmd} | tee $_log 2>&1 - _result=$? - if [ "$_result" -eq "0" ]; then - echo " done" - else - die "MSYS2 compressing fail. See $_log" - fi -fi - -exit 0 diff --git a/msys2-installer/compress_exclude b/msys2-installer/compress_exclude deleted file mode 100644 index 9d88e8cd..00000000 --- a/msys2-installer/compress_exclude +++ /dev/null @@ -1,13 +0,0 @@ -/etc/postinstall/postinstall.marker -/etc/group -/etc/passwd -/etc/mtab -/etc/fstab -/etc/hosts -/etc/networks -/etc/protocols -/etc/services -/home/* -/dev/* -/tmp/* -/var/tmp/* diff --git a/msys2-installer/make-msys2-installer b/msys2-installer/make-msys2-installer deleted file mode 100644 index 0152a531..00000000 --- a/msys2-installer/make-msys2-installer +++ /dev/null @@ -1,149 +0,0 @@ -#!/usr/bin/env bash - -_thisdir="$(dirname $0)" -test "${_thisdir}" = "." && _thisdir=${PWD} -_ifwroot="${_thisdir}"/qt-ifw -_arch=$(uname -m) -_date=$(date +'%Y%m%d') -_dateqif=$(date +'%Y-%m-%d') -_version=${_date} -_filename=msys2-${_arch}-${_date}.exe -_filename2=msys2-base-${_arch}-${_date}.tar.xz -_log=/tmp/installer-${_arch}-${_date}.log -if [ "${_arch}" = "x86_64" ]; then - _bitness=64 -else - _bitness=32 -fi -_archivegen=/mingw${_bitness}/bin/archivegen.exe -_binarycreator=/mingw${_bitness}/bin/binarycreator.exe -_installerbase=/mingw${_bitness}/bin/installerbase.exe -_newmsysbase=/tmp/newmsys -_newmsys=${_newmsysbase}/msys"${_bitness}" - -declare -a undo_commands - -_exitcode=5 - -exit_with_undo() { - for _cmd in ${undo_commands[@]}; do - eval "${_cmd}" | tee -a ${_log} - done - exit ${_exitcode} -} - -exit_cleanly() { - _exitcode=$1; shift; - local _message=$1; shift; - echo "${_message}" | tee -a ${_log} - exit_with_undo -} - -do_seds() { - find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" \) -exec sed -i "s|@DATE@|${_dateqif}|g" "{}" \; - find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" \) -exec sed -i "s|@VERSION@|${_version}|g" "{}" \; - find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" -or -name "installscript.js" \) -exec sed -i "s|@BITNESS@|${_bitness}|g" "{}" \; - undo_commands+=("undo_seds") -} - -undo_seds() { - find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" \) -exec sed -i "s|${_dateqif}<|@DATE@<|g" "{}" \; - find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" \) -exec sed -i "s|${_version}<|@VERSION@<|g" "{}" \; - find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" -or -name "installscript.js" \) -exec sed -i "s|msys${_bitness}|msys@BITNESS@|g" "{}" \; - find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" -or -name "installscript.js" \) -exec sed -i "s|${_bitness}bit|@BITNESS@bit|g" "{}" \; - find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" -or -name "installscript.js" \) -exec sed -i "s|if (\"@BITNESS@bit\" === \"@BITNESS@bit\")|if (\"@BITNESS@bit\" === \"32bit\")|g" "{}" \; -} - -create_archives() { - local _data="${_ifwroot}"/packages/com.msys2.root.base/data - [ -d "${_data}" ] && rm -rf "${_data}" - mkdir -p "${_data}" - local _dirs= - for curr_dir in /etc /var /tmp /usr /mingw32 /mingw64 /msys2_shell.cmd /msys2.exe /mingw32.exe /mingw64.exe /msys2.ini /mingw32.ini /mingw64.ini /msys2.ico /autorebase.bat autorebasebase1st.bat; do - if [[ -d ${_newmsys}${curr_dir} || -f ${_newmsys}${curr_dir} ]]; then - _dirs="${_dirs} ${_newmsys}$curr_dir" - fi - done - - if [ -n "${_dirs}" ]; then - local _compress_cmd="${_archivegen} ${_data}/msys${_bitness}.7z ${_dirs}" - pushd / > /dev/null - echo "Run: ${_compress_cmd} ..." | tee -a ${_log} - eval "${_compress_cmd}" 2>&1 | tee -a ${_log} - _result=$? - if [ "${_result}" -eq "0" ]; then - echo " archivegen succeeded. Created ${_data}/msys${_bitness}.7z" | tee -a ${_log} - else - exit_cleanly "3" "archivegen failed. See ${_log}" - fi - popd > /dev/null - - pushd ${_newmsysbase} > /dev/null - local _compress_cmd2="/usr/bin/tar --transform='s/:/_/g' --dereference --hard-dereference -cJf ${_thisdir}/${_filename2} msys${_bitness}" - echo "Run: ${_compress_cmd2} ..." | tee -a ${_log} - eval "${_compress_cmd2}" 2>&1 | tee -a ${_log} - _result=$? - if [ "${_result}" -eq "0" ]; then - echo " tar succeeded. Created " | tee -a ${_log} - else - die "MSYS2 compressing fail. See ${_log}" - fi - popd > /dev/null - fi -} - -# Add -v to get more information. -make_installer() { - eval "\"${_binarycreator}\" \ - -t \"${_installerbase}\" \ - -p \"${_ifwroot}/packages\" \ - -c \"${_ifwroot}/config/config.xml\" \ - --offline-only \ - \"${_filename}\" \ - -v" | tee -a ${_log} -} - -trap exit_with_undo 1 2 15 - -create_chroot_system() { - [ -d ${_newmsysbase} ] && rm -rf ${_newmsysbase} - mkdir -p "${_newmsys}" - pushd "${_newmsys}" > /dev/null - - mkdir -p var/lib/pacman - mkdir -p var/log - mkdir -p tmp - - eval "pacman -Syu --root \"${_newmsys}\"" | tee -a ${_log} - eval "pacman -S base --noconfirm --root \"${_newmsys}\"" | tee -a ${_log} - _result=$? - if [ "${_result}" -ne "0" ]; then - exit_cleanly "1" "failed to create newmsys2 via command 'pacman -S base --noconfirm --root ${_newmsys}'" - fi - popd > /dev/null -} - -if [ ! -f "${_archivegen}" ]; then - eval "pacman -S --noconfirm mingw${_bitness}/mingw-w64-${_arch}-qt-installer-framework-git" | tee -a ${_log} -fi - -if [ ! -f "${_archivegen}" ]; then - exit_cleanly "2" "installation of qt installer framework failed. See ${_log}" -fi - -if [ -f "${_log}" ]; then - rm "${_log}" -fi - -echo "Creating MSYS2 chroot system ${_newmsys}" | tee -a ${_log} -create_chroot_system - -echo "Creating MSYS2 installer /tmp/${_filename}" | tee -a ${_log} -if [ -f /tmp/${_filename} ]; then - rm -f /tmp/${_filename} -fi - -do_seds -create_archives -make_installer -exit_cleanly "0" "All done, see ${_filename}" diff --git a/msys2-installer/make-msys2-installer.bat b/msys2-installer/make-msys2-installer.bat deleted file mode 100644 index 0513d3d3..00000000 --- a/msys2-installer/make-msys2-installer.bat +++ /dev/null @@ -1,52 +0,0 @@ -@echo off - -REM Copyright (c) 2014, Ray Donnelly - -if "%1"=="" ( - echo Please re-run, passing the the location of an existing MSYS2 installation - exit /b 1 -) - -if not exist %1\msys2_shell.cmd ( - echo '%1' does not seem to be the root folder of an existing MSYS2 installation?! - exit /b 2 -) - -set "NEWMSYS=%CD:\=/%/newmsys/msys64" -set "NEWMSYSW=%CD%\newmsys\msys64" - -echo. -echo *********** -echo * Warning * -echo *********** -echo. -echo This batch file will sync (forcibly) the 'base' group of the MSYS2 installation in '%1' - NUL -popd - -echo Creating new MSYS2 installation containing only 'base' -timeout 1 > NUL -pushd %1 - mkdir %NEWMSYSW%\var\lib\pacman - echo bin\bash -l -c "pacman -Syu --root %NEWMSYS%" - bin\bash -l -c "pacman -Syu --root %NEWMSYS%" - exit /b 999 - %1\bin\bash -l -c "pacman -S pacman --root %NEWMSYS%" - %1\bin\bash -l -c "pacman -S base --force --root %NEWMSYS%" | more /E /P - timeout 1 > NUL -popd - -exit /b 0 diff --git a/msys2-installer/msys2.ico b/msys2-installer/msys2.ico deleted file mode 100644 index baea305abd05a31d0161b27f00c1497ced7d5122..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25758 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 - - MSYS2 @BITNESS@bit - @VERSION@ - MSYS2 @BITNESS@bit - The MSYS2 Developers - MSYS2 @BITNESS@bit - @TargetDir@/msys2_shell.cmd - - ../../msys2 - ../../msys2 - diff --git a/msys2-installer/qt-ifw/packages/com.msys2.root.base/meta/installscript.js b/msys2-installer/qt-ifw/packages/com.msys2.root.base/meta/installscript.js deleted file mode 100644 index 19b111f8..00000000 --- a/msys2-installer/qt-ifw/packages/com.msys2.root.base/meta/installscript.js +++ /dev/null @@ -1,38 +0,0 @@ -function Component() -{ - // constructor -} - -Component.prototype.isDefault = function() -{ - // select the component by default - return true; -} - -function createShortcuts() -{ - var windir = installer.environmentVariable("WINDIR"); - if (windir === "") { - QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory"); - return; - } - - var cmdLocation = installer.value("TargetDir") + "\\msys2_shell.cmd"; - component.addOperation("CreateShortcut", cmdLocation, "@StartMenuDir@/MSYS2 MinGW 32-bit.lnk", "-mingw32"); - component.addOperation("CreateShortcut", cmdLocation, "@StartMenuDir@/MSYS2 MinGW 64-bit.lnk", "-mingw64"); - component.addOperation("CreateShortcut", cmdLocation, "@StartMenuDir@/MSYS2 MSYS.lnk", "-msys"); - - if ("@BITNESS@bit" === "32bit") { - component.addOperation( "Execute", - ["@TargetDir@\\autorebase.bat"]); - } - - component.addOperation( "Execute", - ["@TargetDir@\\usr\\bin\\bash.exe", "--login", "-c", "exit"]); -} - -Component.prototype.createOperations = function() -{ - component.createOperations(); - createShortcuts(); -} diff --git a/msys2-installer/qt-ifw/packages/com.msys2.root.base/meta/package.xml b/msys2-installer/qt-ifw/packages/com.msys2.root.base/meta/package.xml deleted file mode 100644 index 4295da84..00000000 --- a/msys2-installer/qt-ifw/packages/com.msys2.root.base/meta/package.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - MSYS2 @BITNESS@bit base - Cygwin-derived Posix-like env. for Windows with Arch Linux's Pacman - @VERSION@ - @DATE@ - true - - diff --git a/msys2-installer/qt-ifw/packages/com.msys2.root/meta/installscript.js b/msys2-installer/qt-ifw/packages/com.msys2.root/meta/installscript.js deleted file mode 100644 index a0c19685..00000000 --- a/msys2-installer/qt-ifw/packages/com.msys2.root/meta/installscript.js +++ /dev/null @@ -1,14 +0,0 @@ -function Component() { - var systemDrive = installer.environmentVariable("SystemDrive"); - // Use C: as a default for messed up systems. - if (systemDrive === "") { - systemDrive = "C:"; - } - installer.setValue("TargetDir", systemDrive+"\\msys@BITNESS@"); - installer.setDefaultPageVisible(QInstaller.Introduction, false); - installer.setDefaultPageVisible(QInstaller.TargetDirectory, true); - installer.setDefaultPageVisible(QInstaller.ComponentSelection, false); - installer.setDefaultPageVisible(QInstaller.ReadyForInstallation, false); - installer.setDefaultPageVisible(QInstaller.StartMenuSelection, true); - installer.setDefaultPageVisible(QInstaller.LicenseCheck, false); -} diff --git a/msys2-installer/qt-ifw/packages/com.msys2.root/meta/package.xml b/msys2-installer/qt-ifw/packages/com.msys2.root/meta/package.xml deleted file mode 100644 index 942691ff..00000000 --- a/msys2-installer/qt-ifw/packages/com.msys2.root/meta/package.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - MSYS2 @BITNESS@bit - Cygwin-derived Posix-like env. for Windows with Arch Linux's Pacman - @VERSION@ - @DATE@ - -