From 894b0592f48e770e5ddfdcd08334d46b51d2be7a Mon Sep 17 00:00:00 2001 From: kichikuou Date: Fri, 19 Jan 2024 15:34:04 +0900 Subject: [PATCH] Windows: Remove installer --- .github/workflows/windows.yml | 14 ++---- tools/installer/make-installer.sh | 21 -------- tools/installer/xsystem35-32bit.nsi | 5 -- tools/installer/xsystem35-64bit.nsi | 5 -- tools/installer/xsystem35.nsi | 78 ----------------------------- 5 files changed, 4 insertions(+), 119 deletions(-) delete mode 100755 tools/installer/make-installer.sh delete mode 100644 tools/installer/xsystem35-32bit.nsi delete mode 100644 tools/installer/xsystem35-64bit.nsi delete mode 100644 tools/installer/xsystem35.nsi diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a700396..cd2a33b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -9,11 +9,11 @@ jobs: matrix: include: - sys: MINGW32 - installer: "xsystem35-32bit" + package: "xsystem35-32bit" cmake_args: "-DENABLE_DEBUGGER=no" deps: "" - sys: UCRT64 - installer: "xsystem35-64bit" + package: "xsystem35-64bit" cmake_args: "" deps: "cjson:p" defaults: @@ -34,8 +34,6 @@ jobs: SDL2_ttf:p SDL2_mixer:p libwebp:p - nsis:p - ntldd:p ${{ matrix.deps }} - name: Checkout @@ -52,12 +50,8 @@ jobs: run: ctest --output-on-failure working-directory: out/release - - name: Package - working-directory: tools/installer - run: ./make-installer.sh ../../out/release ${{ matrix.installer }}.nsi - - name: Upload uses: actions/upload-artifact@v3 with: - name: ${{ matrix.installer }} - path: tools/installer/${{ matrix.installer }}.exe + name: ${{ matrix.package }} + path: out/release/src/xsystem35.exe diff --git a/tools/installer/make-installer.sh b/tools/installer/make-installer.sh deleted file mode 100755 index 6351ac7..0000000 --- a/tools/installer/make-installer.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# To use this script in MSYS2 shell, install mingw-w64-ucrt-x86_64-nsis and -# mingw-w64-ucrt-x86_64-ntldd packages. - -if [ $# -ne 2 ]; then - echo 'Usage: make-installer.sh ' - exit 1 -fi - -builddir=$1 -nsi=$2 - -echo 'dlls.nsi:' -ntldd -R $builddir/src/xsystem35.exe |perl -ne 'print "File \"$1\"\n" if /=> (.*) \(/' |grep 'mingw32\|ucrt64' |tee $builddir/dlls.nsi -echo - -echo 'dlls-uninstall.nsi:' -sed 's/^File ".*\\/Delete "$INSTDIR\\/' $builddir/dlls.nsi |tee $builddir/dlls-uninstall.nsi -echo - -makensis -INPUTCHARSET UTF8 -DBUILDDIR="$builddir" "$nsi" diff --git a/tools/installer/xsystem35-32bit.nsi b/tools/installer/xsystem35-32bit.nsi deleted file mode 100644 index b663692..0000000 --- a/tools/installer/xsystem35-32bit.nsi +++ /dev/null @@ -1,5 +0,0 @@ -Unicode true -Name xsystem35 -OutFile xsystem35-32bit.exe -InstallDir $PROGRAMFILES32\xsystem35 -!include xsystem35.nsi diff --git a/tools/installer/xsystem35-64bit.nsi b/tools/installer/xsystem35-64bit.nsi deleted file mode 100644 index 719e52b..0000000 --- a/tools/installer/xsystem35-64bit.nsi +++ /dev/null @@ -1,5 +0,0 @@ -Unicode true -Name xsystem35 -OutFile xsystem35-64bit.exe -InstallDir $PROGRAMFILES64\xsystem35 -!include xsystem35.nsi diff --git a/tools/installer/xsystem35.nsi b/tools/installer/xsystem35.nsi deleted file mode 100644 index 4246043..0000000 --- a/tools/installer/xsystem35.nsi +++ /dev/null @@ -1,78 +0,0 @@ -ManifestDPIAware true -SetCompressor /SOLID lzma - -LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" -LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf" - -Page license -Page directory -Page components -Page instfiles -UninstPage uninstConfirm -UninstPage instfiles - -LicenseData ..\..\COPYING - -!define SHCNE_ASSOCCHANGED 0x08000000 -!define SHCNF_IDLIST 0 -Function RefreshShellIcons - System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v \ - (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)' -FunctionEnd - -Section - SetOutPath $INSTDIR - FILE ${BUILDDIR}\src\xsystem35.exe - !include ${BUILDDIR}\dlls.nsi - SetOutPath $INSTDIR\fonts - FILE /x CMakeLists.txt ..\..\fonts\*.* - WriteUninstaller $INSTDIR\uninstall.exe - - WriteRegStr HKLM "Software\Kichikuou\xsystem35" "InstallDir" "$INSTDIR" - WriteRegStr HKLM "Software\Kichikuou\xsystem35\profile" "ttfont_gothic" "$INSTDIR\fonts\MTLc3m.ttf" - WriteRegStr HKLM "Software\Kichikuou\xsystem35\profile" "ttfont_mincho" "$INSTDIR\fonts\mincho.otf" - - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\xsystem35" "DisplayName" "xsystem35 (remove only)" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\xsystem35" "UninstallString" '"$INSTDIR\uninstall.exe"' -SectionEnd - -LangString FileAssociation ${LANG_ENGLISH} "Associate with .ALD file type" -LangString FileAssociation ${LANG_JAPANESE} ".ALD ファイルに関連付け" -Section "$(FileAssociation)" - WriteRegStr HKCR ".ald" "" "System35Archive" - WriteRegStr HKCR "System35Archive" "" "AliceSoft System 3.x archive" - WriteRegStr HKCR "System35Archive\DefaultIcon" "" "$INSTDIR\xsystem35.exe,0" - WriteRegStr HKCR "System35Archive\shell\open\command" "" '"$INSTDIR\xsystem35.exe" "%1"' - Call RefreshShellIcons -SectionEnd - -LangString DesktopIcon ${LANG_ENGLISH} "Create Desktop icon" -LangString DesktopIcon ${LANG_JAPANESE} "デスクトップショートカットを作成" -Section "$(DesktopIcon)" - CreateShortcut $DESKTOP\xsystem35.lnk $INSTDIR\xsystem35.exe -SectionEnd - -LangString StartMenu ${LANG_ENGLISH} "Create Start menu entry" -LangString StartMenu ${LANG_JAPANESE} "スタートメニューに登録" -Section "$(StartMenu)" - CreateDirectory $SMPROGRAMS\xsystem35 - CreateShortcut $SMPROGRAMS\xsystem35\xsystem35.lnk $INSTDIR\xsystem35.exe - CreateShortcut $SMPROGRAMS\xsystem35\uninstall.lnk $INSTDIR\uninstall.exe -SectionEnd - -Section "Uninstall" - Delete $DESKTOP\xsystem35.lnk - RMDir /r $SMPROGRAMS\xsystem35 - - DeleteRegKey HKCR ".ald" - DeleteRegKey HKCR "System35Archive" - - DeleteRegKey HKLM "Software\Kichikuou\xsystem35" - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\xsystem35" - - RMDir /r $INSTDIR\fonts - Delete $INSTDIR\uninstall.exe - Delete $INSTDIR\xsystem35.exe - !include ${BUILDDIR}\dlls-uninstall.nsi - RMDir $INSTDIR -SectionEnd