Page MenuHomePhabricator (Chris)
Files F86008

No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/.gitignore b/.gitignore
index b3fe137..c28fbc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,25 @@
*.user
win.rc
Info.plist
version.c
_notes
_release
.DS_Store
image/about.psd
extra/_build_*
misc/win32tools
_bin/
build/
src/version.h
*.autosave
src/version.h
*.deb
packaging/win/packages/jp.soramimi.guitar/data/
packaging/win/GuitarSetup.exe
packaging/mac/Guitar.app
packaging/mac/Guitar.app/Contents/Frameworks/QtCore.framework/QtCore
packaging/mac/*.zip
packaging/mac/Guitar-macos.zip
docs/src_docs/
packaging/deb/Guitar
+packaging/win/packages/jp.soramimi.guitar/
diff --git a/RELEASE-WINDOWS.rb b/RELEASE-WINDOWS.rb
index 69c1632..c5de3b7 100644
--- a/RELEASE-WINDOWS.rb
+++ b/RELEASE-WINDOWS.rb
@@ -1,89 +1,89 @@
#!/usr/bin/ruby
-$qt = "C:/Qt/Qt5.7.1/5.7/msvc2013"
+$qt = "C:/Qt/5.15.0/msvc2019"
#$qt = "" # スタティックリンクのとき
-$openssl = "C:/openssl"
+$openssl = "C:/Program Files (x86)/OpenSSL"
require 'fileutils'
load 'version.rb'
$workdir = "_release"
$dstdir = $workdir + "/" + $product_name
$dstdir_iconengines = $dstdir + "/iconengines"
$dstdir_imageformats = $dstdir + "/imageformats"
$dstdir_platforms = $dstdir + "/platforms"
FileUtils.rm_rf($workdir)
FileUtils.mkpath($dstdir)
FileUtils.cp("_bin/#{$product_name}.exe", $dstdir)
#FileUtils.cp("src/resources/translations/Guitar_ja.qm", $dstdir)
-FileUtils.cp($openssl + "/bin/libeay32.dll", $dstdir)
-FileUtils.cp($openssl + "/bin/ssleay32.dll", $dstdir)
+FileUtils.cp($openssl + "/bin/libssl-1_1.dll", $dstdir)
+FileUtils.cp($openssl + "/bin/libcrypto-1_1.dll", $dstdir)
`7z x -o#{$dstdir} misc/win32tools.zip`
`move #{$dstdir}\\win32tools\\* #{$dstdir}`
FileUtils.rmdir("#{$dstdir}\\win32tools")
if $qt != ''
FileUtils.mkpath($dstdir_iconengines)
FileUtils.mkpath($dstdir_imageformats)
FileUtils.mkpath($dstdir_platforms)
def cp_qt_lib(name)
src = $qt + "/bin/" + name
FileUtils.cp(src, $dstdir)
end
cp_qt_lib("Qt5Core.dll")
cp_qt_lib("Qt5Gui.dll")
cp_qt_lib("Qt5Svg.dll")
cp_qt_lib("Qt5Widgets.dll")
cp_qt_lib("Qt5Xml.dll")
cp_qt_lib("Qt5Network.dll")
cp_qt_lib("Qt5WinExtras.dll")
def cp_qt_imageformat(name)
src = $qt + "/plugins/imageformats/" + name
FileUtils.cp(src, $dstdir_imageformats)
end
cp_qt_imageformat("qgif.dll")
cp_qt_imageformat("qicns.dll")
cp_qt_imageformat("qico.dll")
cp_qt_imageformat("qjpeg.dll")
cp_qt_imageformat("qsvg.dll")
def cp_qt_iconengine(name)
src = $qt + "/plugins/iconengines/" + name
FileUtils.cp(src, $dstdir_iconengines)
end
cp_qt_iconengine("qsvgicon.dll")
def cp_qt_platform(name)
src = $qt + "/plugins/platforms/" + name
FileUtils.cp(src, $dstdir_platforms)
end
cp_qt_platform("qwindows.dll")
cp_qt_platform("qminimal.dll")
cp_qt_platform("qoffscreen.dll")
end
pkgfilename = "#{$product_name}-#{$version_a}.#{$version_b}.#{$version_c}-win32.zip"
Dir.chdir($workdir) {
`7z a #{pkgfilename} #{$product_name}`
}
Dir.chdir("packaging/win") {
`mk.bat #{pkgfilename}`
}
diff --git a/packaging/win/mk.bat b/packaging/win/mk.bat
index 7d0a738..d700e89 100644
--- a/packaging/win/mk.bat
+++ b/packaging/win/mk.bat
@@ -1,5 +1,5 @@
rd /s /q packages\jp.soramimi.guitar\data
rem 7z x ../../_release/Guitar-1.0.0-win32.zip -opackages\jp.soramimi.guitar
7z x ../../_release/%1 -opackages\jp.soramimi.guitar
ren packages\jp.soramimi.guitar\Guitar data
-C:\Qt\Tools\QtInstallerFramework\3.1\bin\binarycreator.exe -c config/config.xml -p packages GuitarSetup.exe
+C:\Qt\QtIFW-3.2.2\bin\binarycreator.exe -c config/config.xml -p packages GuitarSetup.exe

File Metadata

Mime Type
text/x-diff
Expires
Wed, Sep 10, 11:35 AM (38 m, 26 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
42589
Default Alt Text
(3 KB)

Event Timeline