diff options
| -rw-r--r-- | ChangeLog.adoc | 1 | ||||
| -rw-r--r-- | weechat.cygport.in | 41 |
2 files changed, 28 insertions, 14 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 90c35a044..9ccae5be3 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -50,7 +50,6 @@ Documentation:: Build:: - * cygwin: disable build of man page and documentation * python: add detection of Python 3.5 [[v1.5]] diff --git a/weechat.cygport.in b/weechat.cygport.in index 326cd10ba..7cb73b2e9 100644 --- a/weechat.cygport.in +++ b/weechat.cygport.in @@ -23,14 +23,19 @@ # It must be used *ONLY* for a stable release (version "X.Y.Z"), not for # a development version (version "X.Y.Z-dev" or "X.Y.Z-rcN"). # -# Instructions: execute these commands inside your build directory, -# after running cmake or configure script (replace X.Y.Z by WeeChat version): +# Instructions: # -# $ cygport weechat-X.Y.Z-1.cygport fetch -# $ cygport weechat-X.Y.Z-1.cygport almostall +# 1. install asciidoctor (to build man page/docs): # -# ==> packages are built in directory: -# ./weechat-X.Y.Z-1.<arch>/dist/weechat/ +# $ gem install -n /usr/local/bin asciidoctor +# +# 2. execute these commands inside your build directory, after running cmake +# or configure script (replace X.Y.Z by WeeChat version): +# +# $ cygport weechat-X.Y.Z-1.cygport fetch +# $ cygport weechat-X.Y.Z-1.cygport almostall +# +# Packages are built in directory: ./weechat-X.Y.Z-1.<arch>/dist/weechat/ # inherit cmake @@ -53,12 +58,13 @@ ruby tcl-devel zlib-devel" # # CMake compilation of WeeChat: # 1. set prefix to /usr -# 2. disable Guile plugin because WeeChat requires Guile >= 2.0, +# 2. enable build of man pages and documentation +# 3. disable Guile plugin because WeeChat requires Guile >= 2.0, # which is not yet available in Cygwin -# 3. disable Javascript plugin because libv8 is not available in Cygwin +# 4. disable Javascript plugin because libv8 is not available in Cygwin # -CYGCMAKE_ARGS="-DCMAKE_INSTALL_PREFIX=/usr -DENABLE_GUILE=OFF \ --DENABLE_JAVASCRIPT=OFF" +CYGCMAKE_ARGS="-DCMAKE_INSTALL_PREFIX=/usr -DENABLE_MAN=ON -DENABLE_DOC=ON \ +-DENABLE_GUILE=OFF -DENABLE_JAVASCRIPT=OFF" # # Build 8 Cygwin packages: @@ -69,14 +75,15 @@ CYGCMAKE_ARGS="-DCMAKE_INSTALL_PREFIX=/usr -DENABLE_GUILE=OFF \ # weechat-lua # weechat-tcl # weechat-devel +# weechat-doc # PKG_NAMES="${PN} ${PN}-python ${PN}-perl ${PN}-ruby ${PN}-lua ${PN}-tcl \ -${PN}-devel" -PKG_HINTS="setup python perl ruby lua tcl devel" +${PN}-devel ${PN}-doc" +PKG_HINTS="setup python perl ruby lua tcl devel doc" # # Package "weechat": binary, all plugins except scripting languages, -# translations, icon +# translations, icon, man pages # weechat_SUMMARY="Fast, light and extensible chat client (IRC/XMPP)" weechat_DESCRIPTION="WeeChat (Wee Enhanced Environment for Chat) is a fast, \ @@ -97,6 +104,7 @@ weechat_CONTENTS=" usr/lib/weechat/plugins/xfer.dll usr/share/locale/ usr/share/icons/ + usr/share/man/ usr/share/doc/weechat/AUTHORS.adoc usr/share/doc/weechat/ChangeLog.adoc usr/share/doc/weechat/Contributing.adoc @@ -151,3 +159,10 @@ weechat_tcl_REQUIRES="weechat" weechat_devel_CATEGORY="Net Devel" weechat_devel_SUMMARY="Development files to build WeeChat plugins" weechat_devel_CONTENTS="usr/include/ usr/lib/pkgconfig/" + +# +# Package "weechat-doc": documentation +# +weechat_doc_CATEGORY="Net Doc" +weechat_doc_SUMMARY="Documentation for WeeChat" +weechat_doc_CONTENTS="usr/share/doc/weechat/*.html" |