Try to fix the README in GitHub.
This commit is contained in:
parent
745bbf0ce5
commit
d9a310a691
37
README.md
37
README.md
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
logdiag is a schematic editor written in GTK+.
|
logdiag is a schematic editor written in GTK+.
|
||||||
|
|
||||||
__This software is considered to be alpha quality and cannot be recommended
|
__This software is considered to be alpha quality and isn't recommended for
|
||||||
for regular usage.__
|
regular usage.__
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
|
@ -24,47 +24,58 @@ First check that you have all the required dependencies installed, including
|
||||||
all development packages, if your distribution provides them.
|
all development packages, if your distribution provides them.
|
||||||
|
|
||||||
Reserve a directory for an out-of-source build:
|
Reserve a directory for an out-of-source build:
|
||||||
|
|
||||||
$ mkdir build
|
$ mkdir build
|
||||||
$ cd build
|
$ cd build
|
||||||
|
|
||||||
Let CMake prepare the build. You may change the directory where you want
|
Let CMake prepare the build. You may change the directory where you want the
|
||||||
the application to be installed. The default is _/usr/local_.
|
application to be installed. The default is _/usr/local_.
|
||||||
|
|
||||||
$ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
|
$ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
|
||||||
|
|
||||||
Now you have two basic choices of installing the application:
|
Now you have two basic choices of installing the application.
|
||||||
|
|
||||||
|
#### Using _make install_
|
||||||
|
|
||||||
1. Using _make install_:
|
|
||||||
# make install
|
# make install
|
||||||
|
|
||||||
2. Using _cpack_; you have to choose a package format understood by your
|
#### Using _cpack_
|
||||||
system package manager. CMake offers DEB and RPM.
|
|
||||||
|
You have to choose a package format understood by your system package manager.
|
||||||
|
CMake offers DEB and RPM.
|
||||||
|
|
||||||
|
After _cpack_ finishes making the package, install this file.
|
||||||
|
|
||||||
After _cpack_ finishes making the package, install this file.
|
|
||||||
$ fakeroot cpack -G DEB
|
$ fakeroot cpack -G DEB
|
||||||
# dpkg -i logdiag-0.0-Linux-x86_64.deb
|
# dpkg -i logdiag-0.0-Linux-x86_64.deb
|
||||||
|
|
||||||
## Building from sources on Windows
|
## Building from sources on Windows
|
||||||
|
|
||||||
First install CMake 2.8 and MinGW. Add both to the system path.
|
First install CMake 2.8 and MinGW. Add both to the system path. If you want to
|
||||||
If you want to build an installation package, also install NSIS.
|
build an installation package, also install NSIS.
|
||||||
|
|
||||||
|
Run the following command in the directory with source files to automatically
|
||||||
|
fetch and setup all dependencies:
|
||||||
|
|
||||||
Run the following command in the directory with source files
|
|
||||||
to automatically fetch and setup all dependencies:
|
|
||||||
> cmake -P Win32Depends.cmake
|
> cmake -P Win32Depends.cmake
|
||||||
|
|
||||||
Reserve a directory for an out-of-source build:
|
Reserve a directory for an out-of-source build:
|
||||||
|
|
||||||
> mkdir build
|
> mkdir build
|
||||||
> cd build
|
> cd build
|
||||||
|
|
||||||
Let CMake prepare the build:
|
Let CMake prepare the build:
|
||||||
|
|
||||||
> cmake .. -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release
|
> cmake .. -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release
|
||||||
|
|
||||||
Now you can generate a package with CPack. You may choose between:
|
Now you can generate a package with CPack. You may choose between:
|
||||||
|
|
||||||
1. An NSIS-based installation package:
|
1. An NSIS-based installation package:
|
||||||
|
|
||||||
> cpack -G NSIS
|
> cpack -G NSIS
|
||||||
|
|
||||||
2. A portable ZIP package:
|
2. A portable ZIP package:
|
||||||
|
|
||||||
> cpack -G ZIP
|
> cpack -G ZIP
|
||||||
|
|
||||||
By default, that is if you specify no generator, both packages are built.
|
By default, that is if you specify no generator, both packages are built.
|
||||||
|
|
Loading…
Reference in New Issue