Page MenuHomePhabricator (Chris)
Files F85991

No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/RELEASE-WINDOWS.rb b/RELEASE-WINDOWS.rb
index c5de3b7..4a9600d 100644
--- a/RELEASE-WINDOWS.rb
+++ b/RELEASE-WINDOWS.rb
@@ -1,89 +1,85 @@
#!/usr/bin/ruby
$qt = "C:/Qt/5.15.0/msvc2019"
#$qt = "" # スタティックリンクのとき
$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/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/deploy.rb b/packaging/win/deploy.rb
new file mode 100644
index 0000000..62acdb0
--- /dev/null
+++ b/packaging/win/deploy.rb
@@ -0,0 +1,55 @@
+
+require 'fileutils'
+$script_dir = __dir__
+
+FileUtils.rm_rf $script_dir + "/build"
+FileUtils.rm_rf $script_dir + "/packages/jp.soramimi.guitar/data"
+
+def mkcd(dir)
+ FileUtils.mkpath dir
+ FileUtils.chdir dir
+end
+
+def run(cmd)
+ r = system cmd
+ if !r then
+ abort "FATAL: " + cmd
+ end
+end
+
+FileUtils.rm_rf "zlib"
+run "git clone https://github.com/madler/zlib"
+FileUtils.cp "../../zlib.pro", "zlib/"
+Dir.chdir("zlib") {
+ run "C:/Qt/5.15.0/msvc2019/bin/qmake.exe zlib.pro"
+ run "C:/Qt/Tools/QtCreator/bin/jom.exe"
+}
+#ENV["INCLUDE"] = $script_path + "/zlib;" + ENV["INCLUDE"]
+
+Dir.chdir $script_dir + "/../../"
+FileUtils.mkpath "_bin"
+run "ruby prepare.rb"
+
+FileUtils.cp $script_dir + "/zlib/_bin/libz.lib", "_bin/"
+
+mkcd $script_dir + "/build"
+run "C:/Qt/5.15.0/msvc2019/bin/qmake.exe ../../../Guitar.pro"
+run "C:/Qt/Tools/QtCreator/bin/jom.exe"
+
+Dir.chdir $script_dir + "/../../"
+run "ruby RELEASE-WINDOWS.rb"
+
+Dir.chdir $script_dir
+load '../../version.rb'
+
+pkgname = "Guitar-#{$version_a}.#{$version_b}.#{$version_c}-win32.zip"
+
+run "7z x ../../_release/#{pkgname} -opackages/jp.soramimi.guitar"
+
+mkcd $script_dir + "/packages/jp.soramimi.guitar"
+FileUtils.mv "Guitar", "data"
+
+Dir.chdir $script_dir
+run "C:/Qt/QtIFW-3.2.2/bin/binarycreator.exe -c config/config.xml -p packages GuitarSetup.exe"
+
+run "curl -T GuitarSetup.exe ftp://10.10.10.5:/Public/pub/nightlybuild/"
diff --git a/packaging/win/mk.bat b/packaging/win/mk.bat
deleted file mode 100644
index d700e89..0000000
--- a/packaging/win/mk.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-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\QtIFW-3.2.2\bin\binarycreator.exe -c config/config.xml -p packages GuitarSetup.exe

File Metadata

Mime Type
text/x-diff
Expires
Tue, Sep 9, 2:51 PM (6 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
42575
Default Alt Text
(4 KB)

Event Timeline