Page MenuHomePhabricator (Chris)
Files F118059

No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/README.md b/README.md
index f883309..1ddbbca 100644
--- a/README.md
+++ b/README.md
@@ -1,49 +1,52 @@
[![Build Status](https://travis-ci.com/soramimi/Guitar.svg?branch=master)](https://travis-ci.com/soramimi/Guitar)
# Guitar
Git GUI Client
## Summary
* Open Source, Free Software (GPL v2)
* Of course, commercial purposes is also free.
* Run on Windows, macOS and Linux
* Written in C++
* Powered by Qt 5
## Download
* https://files.soramimi.jp/guitar/
* [Countinuous build (x86_64.AppImage)](https://github.com/soramimi/Guitar/releases/tag/continuous)
## Documents
-* how to build : https://soramimi.github.io/Guitar/build-en.html (in English)
+* how to build : https://soramimi.github.io/Guitar/html/build-en.html (in English)
* more information : https://soramimi.github.io/Guitar/ (in Japanese)
+markdown format:
+* how to build: https://github.com/soramimi/Guitar/blob/master/docs/build_guide-en/build_guide_origin.md (in English)
+
## Screenshots
### Windows
![Windows](https://soramimi.github.io/Guitar/html/screenshots/windows.png "Windows")
### macOS
![macOS](https://soramimi.github.io/Guitar/html/screenshots/macos.png "macOS")
### Ubuntu
![Ubuntu](https://soramimi.github.io/Guitar/html/screenshots/ubuntu.png "Ubuntu")
### Raspbian
![Raspbian](https://soramimi.github.io/Guitar/html/screenshots/raspberrypi0.jpg "Raspbian")
### Dark Theme
![Dark Theme](https://soramimi.github.io/Guitar/html/screenshots/raspberrypi1.jpg "Dark Theme")
### Haiku
![Haiku](https://soramimi.github.io/Guitar/html/screenshots/haiku.png "Haiku")
### Log and Graph
![Log and Graph](https://soramimi.github.io/Guitar/html/screenshots/commitgraph.png "Log and Graph")
### Diff View
![Diff View](https://soramimi.github.io/Guitar/html/screenshots/diffview.png "Diff View")
diff --git a/docs/build_guide-en/build_guide_origin.md b/docs/build_guide-en/build_guide_origin.md
index d86d4f2..0e15c1c 100644
--- a/docs/build_guide-en/build_guide_origin.md
+++ b/docs/build_guide-en/build_guide_origin.md
@@ -1,118 +1,116 @@
# How to build the Guitar (en) (draft)
# 0. Prerequirements
## 0.1 Compiler
__Windows__
Microsoft Visual C++ 2013 or later
Ruby : https://rubyinstaller.org/
Perl : https://www.activestate.com/activeperl
__mac OS__
Xcode
Ruby
Perl
__Linux (Ubuntu)__
GCC
Ruby: sudo apt-get install ruby
Perl: sudo apt-get install perl
## 0.2 Dependent libraries
Qt : https://www.qt.io/download-open-source/#section-2
- Please download and install Qt SDK suitable for your platform.
zlib : https://github.com/madler/zlib.git
OpenSSL : https://www.openssl.org/source/ | https://github.com/openssl/openssl.git
- required openssl-1.0.x
- openssl-1.1.x is not supported
## 0.3 Download sources
- Guitar
- (https) git clone https://github.com/soramimi/Guitar.git
- (ssh) git clone git@github.com:soramimi/Guitar.git
+ `(https) git clone https://github.com/soramimi/Guitar.git`
+ `(ssh) git clone git@github.com:soramimi/Guitar.git`
- zlib
- git clone https://github.com/madler/zlib.git
+ `git clone https://github.com/madler/zlib.git`
- OpenSSL
- git clone https://github.com/openssl/openssl.git
- ...or download source from https://www.openssl.org/source/
+ `git clone https://github.com/openssl/openssl.git`
+ `...or download source from https://www.openssl.org/source/`
-
-
-## 0.3 Directories (example)
+## 0.4 Directories (example)
/home/my/work/Guitar
/home/my/work/openssl
/home/my/work/zlib
# 1. Make the zlib
Start the Qt Creator and open Guitar/zlib.pro
- Set build directory to:
- (ex. for Windows) `C:\work\_build_zlib`
- (ex. for Linux/mac) `/home/my/work/_build_zlib_Debug|Release`
Run [Build] menu (or press Ctrl+B)
---
__Make OpenSSL on Windows__
please read the INSTALL.W32
recommended to install the OpenSSL on `C:\openssl`
perl Configure VC-WIN32 --prefix=c:\openssl
__Make OpenSSL on macOS__
$ cd openssl
$ git checkout -b OpenSSL_1_0_2-stable origin/OpenSSL_1_0_2-stable
$ ./Configure darwin64-x86_64-cc --prefix=/usr/local
$ make -j4
$ sudo make install
__Install OpenSSL on Linux__
$ sudo apt-get install libssl-dev
# 1. Make the Guitar
first, run the script 'prepare.rb'
$ cd Guitar
$ ruby prepare.rb
start the Qt Creator, open the project file 'Guitar.pro'
- Set build directory to:
(ex. for Windows) `C:\work\_build_Guitar`
(ex. for Linux/mac) `/home/my/work/_build_Guitar_Debug|Release`
- do [Run qmake] (in [Build] menu)
- do [Build] (or press Ctrl+B)
# Note
(on Windows) necessary to copy OpenSSL's 'libeay32.dll' and 'ssleay32.dll' to the same folder as 'Guitar.exe'.

File Metadata

Mime Type
text/x-diff
Expires
Fri, May 15, 6:59 AM (17 h, 49 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
63861
Default Alt Text
(4 KB)

Event Timeline