Page MenuHomePhabricator (Chris)
Files F132501

No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/packaging/deb/Makefile b/packaging/deb/Makefile
index 07bfc62..7864ff2 100644
--- a/packaging/deb/Makefile
+++ b/packaging/deb/Makefile
@@ -1,12 +1,12 @@
all:
- -mkdir build
+ -mkdir build 2>/dev/null
cd ../..; ruby prepare.rb
cd build; cmake ../../..
cd build; make -j4
ruby mk-deb.rb
clean:
-rm -fr build
-rm guitar_*.deb
diff --git a/packaging/deb/arch.rb b/packaging/deb/arch.rb
new file mode 100755
index 0000000..24554ae
--- /dev/null
+++ b/packaging/deb/arch.rb
@@ -0,0 +1,14 @@
+#!/usr/bin/ruby
+
+$arch = ""
+uname_a = `uname -a`
+if uname_a =~ /armv7l/
+ $arch = "armhf"
+elsif uname_a =~ /(x86_64)|(amd64)/
+ $arch = "amd64"
+else
+ $arch = "i386"
+end
+
+puts $arch
+
diff --git a/packaging/deb/debname.rb b/packaging/deb/debname.rb
new file mode 100755
index 0000000..4cf556b
--- /dev/null
+++ b/packaging/deb/debname.rb
@@ -0,0 +1,10 @@
+#!/usr/bin/ruby
+
+load '../../version.rb'
+
+$package = "guitar"
+$arch = `./arch.rb`.strip
+$debname = "#{$package}_#{$version_a}.#{$version_b}.#{$version_c}_#{$arch}.deb"
+
+puts $debname
+
diff --git a/packaging/deb/mk-deb.rb b/packaging/deb/mk-deb.rb
index 5278f26..3099991 100755
--- a/packaging/deb/mk-deb.rb
+++ b/packaging/deb/mk-deb.rb
@@ -1,71 +1,65 @@
#!/usr/bin/ruby
require 'fileutils'
load '../../version.rb'
$package = "guitar"
$maintainer = "nobody <nobody@example.com>"
$version = "#{$version_a}.#{$version_b}.#{$version_c}"
$workdir = "build"
$bindir = "build"
$dstdir = $workdir + "/#{$package}"
-puts "Finding libssl1.0 ..."
+puts "Finding libssl1. ..."
$libssl = ""
-lines = `apt search libssl1.0. 2>/dev/null`
+lines = `apt search libssl1. 2>/dev/null`
lines.each_line {|line|
- if line =~ /^(libssl1\.0\.[0-9]+)\/.*#{$arch}/
+ if line =~ /^(libssl1\.[0-1]\.[0-9]+)\/.*#{$arch}/
$libssl = $1
break
end
}
if $libssl == ""
- puts "libssl1.0 not found"
+ puts "libssl1.x not found"
exit 1
else
puts "libssl = #{$libssl}"
end
-$arch = "i386"
-uname_a = `uname -a`
-if uname_a =~ /(x86_64)|(amd64)/
- $arch = "amd64"
-elsif uname_a =~ /armv7l/
- $arch = "armhf"
-end
+$arch = `./arch.rb`.strip
FileUtils.mkpath($dstdir + "/DEBIAN")
FileUtils.mkpath($dstdir + "/usr/bin")
FileUtils.mkpath($dstdir + "/usr/share/applications")
FileUtils.mkpath($dstdir + "/usr/share/icons/guitar")
FileUtils.cp("#{$bindir}/Guitar", $dstdir + "/usr/bin/")
system "strip #{$dstdir}/usr/bin/Guitar"
FileUtils.cp("../../LinuxDesktop/Guitar.svg", $dstdir + "/usr/share/icons/guitar/")
File.open($dstdir + "/usr/share/applications/Guitar.desktop", "w") {|f|
f.puts <<___
[Desktop Entry]
Type=Application
Name=Guitar
Categories=Development
Exec=/usr/bin/Guitar
Icon=/usr/share/icons/guitar/Guitar.svg
Terminal=false
___
}
File.open($dstdir + "/DEBIAN/control", "w") {|f|
f.puts <<___
Package: #{$package}
Section: vcs
Maintainer: #{$maintainer}
Architecture: #{$arch}
Version: #{$version}
Depends: libqt5widgets5 (>= 5.5.0), libqt5xml5 (>= 5.5.0), libqt5svg5 (>= 5.5.0), zlib1g, #{$libssl}, git, file
Description: Git GUI Client
___
}
FileUtils.cp("postinst", $dstdir + "/DEBIAN/")
system "fakeroot dpkg-deb --build #{$workdir}/#{$package} ."
diff --git a/version.rb b/version.rb
index 02d21e8..9b5897e 100644
--- a/version.rb
+++ b/version.rb
@@ -1,42 +1,47 @@
#!/dev/null
$product_name = "Guitar"
$copyright_year = 2019
$version_a = 1
-$version_b = 0
-$version_c = 1
+$version_b = 1
+$version_c = 0
$version_d = 0
-# v1.0.1 2019-06-xx
+# v1.1.0 2019-07-xx
# - 日本語翻訳ファイルのtypo修正
# - Windows版インストーラー対応
+# - ファイルリストのバッジを描画
+# - コミットグラフで異なるブランチの線が重なって描画されることがあった問題を修正
+# - コミットグラフで先祖のブランチを強調表示する機能
+# - ダークテーマの描画を改良
+# - Ctrl+HでHEADにジャンプする
#
# v1.0.0 2019-06-01
# - ロシア語対応
# - 細かい修正
#
# v0.9.3 2019-01-19
# - stashコマンドを実装
# - GitHubウェブページからのドラッグアンドドロップ動作を改良
# - メニューバー項目を整理
#
# v0.9.2 2018-11-06
# - 定期的リモート監視機能
# - ソースコードリファクタリング
# - 安定性向上
# - cmake対応
#
# v0.9.1 2018-11-06
# - support ssh key with passphrase
#
# v0.9.0 2018-10-24
# -
#
# v0.2.0 2017-12-18
# -
#
# v0.1.0 2017-05-03
# -
#
# v0.0.0 2016-12-25
# - alpha release

File Metadata

Mime Type
text/x-diff
Expires
Tue, Jun 16, 12:49 AM (2 w, 1 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
69777
Default Alt Text
(4 KB)

Event Timeline