summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-07-29 17:04:52 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-07-29 17:05:40 +0200
commitf9bde9016f9683e0b101616606b1b7f78af234ef (patch)
treea01f0529224e5c5de63a3c1fc018c55a15fccafd
parent40c237ca9ffd329e91a23fe46364aead4e9493e8 (diff)
downloadtdeio-sword-f9bde901.tar.gz
tdeio-sword-f9bde901.zip
Use common rules for build and install documentation and translations.
Change documentation path to tdeioslave/sword. Change CMake project name to tdeio_sword. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 382841c80611afca697e3859981f12b9503b48f2)
-rw-r--r--CMakeLists.txt10
-rw-r--r--doc/CMakeLists.txt14
-rw-r--r--doc/en/CMakeLists.txt8
-rw-r--r--doc/en/tdeioslave/sword/index.docbook (renamed from doc/en/index.docbook)0
-rw-r--r--doc/html/compilation.html (renamed from doc/en/compilation.html)0
-rw-r--r--doc/html/configuration.html (renamed from doc/en/configuration.html)0
-rw-r--r--doc/html/credits.html (renamed from doc/en/credits.html)0
-rw-r--r--doc/html/faq.html (renamed from doc/en/faq.html)0
-rw-r--r--doc/html/index.html (renamed from doc/en/index.html)0
-rw-r--r--doc/html/installation.html (renamed from doc/en/installation.html)0
-rw-r--r--doc/html/introduction.html (renamed from doc/en/introduction.html)0
-rw-r--r--doc/html/requirements.html (renamed from doc/en/requirements.html)0
-rw-r--r--doc/html/using-tdeio_sword.html (renamed from doc/en/using-tdeio_sword.html)0
-rw-r--r--src/sword.protocol2
-rw-r--r--translations/CMakeLists.txt1
-rw-r--r--translations/messages/CMakeLists.txt14
16 files changed, 8 insertions, 41 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23cd50f..5d87155 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ cmake_minimum_required( VERSION 2.8.12 )
#### general package setup
-project( tdeio-sword )
+project( tdeio_sword )
set( VERSION R14.0.11 )
@@ -69,8 +69,12 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined"
##### directories
add_subdirectory( src )
-tde_conditional_add_subdirectory( BUILD_DOC doc )
-tde_conditional_add_subdirectory( BUILD_TRANSLATIONS translations )
+
+
+##### other data ################################
+
+tde_conditional_add_project_docs( BUILD_DOC )
+tde_conditional_add_project_translations( BUILD_TRANSLATIONS )
##### write configure files
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
deleted file mode 100644
index 70d6348..0000000
--- a/doc/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-file( GLOB _dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} * )
-string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )
-
-foreach( _dir ${_dirs} )
- if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} AND
- EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_dir}/CMakeLists.txt )
- if( "${_dir}" STREQUAL "en" OR
- "${_dir}" STREQUAL "man" OR
- "${_linguas}" MATCHES "^;*$" OR
- ";${_linguas};" MATCHES ";${_dir};" )
- add_subdirectory( ${_dir} )
- endif( )
- endif()
-endforeach()
diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
deleted file mode 100644
index c46c8ce..0000000
--- a/doc/en/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-file( GLOB _html RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.html )
-
-install(
- FILES ${_html}
- DESTINATION ${HTML_INSTALL_DIR}/en/tdeio_sword
-)
-
-tde_create_handbook( LANG en DESTINATION tdeio_sword )
diff --git a/doc/en/index.docbook b/doc/en/tdeioslave/sword/index.docbook
index 3f6ce2a..3f6ce2a 100644
--- a/doc/en/index.docbook
+++ b/doc/en/tdeioslave/sword/index.docbook
diff --git a/doc/en/compilation.html b/doc/html/compilation.html
index c3cb9a7..c3cb9a7 100644
--- a/doc/en/compilation.html
+++ b/doc/html/compilation.html
diff --git a/doc/en/configuration.html b/doc/html/configuration.html
index 9ca975c..9ca975c 100644
--- a/doc/en/configuration.html
+++ b/doc/html/configuration.html
diff --git a/doc/en/credits.html b/doc/html/credits.html
index d8c297b..d8c297b 100644
--- a/doc/en/credits.html
+++ b/doc/html/credits.html
diff --git a/doc/en/faq.html b/doc/html/faq.html
index a259b48..a259b48 100644
--- a/doc/en/faq.html
+++ b/doc/html/faq.html
diff --git a/doc/en/index.html b/doc/html/index.html
index 67c61fd..67c61fd 100644
--- a/doc/en/index.html
+++ b/doc/html/index.html
diff --git a/doc/en/installation.html b/doc/html/installation.html
index d0bf2d6..d0bf2d6 100644
--- a/doc/en/installation.html
+++ b/doc/html/installation.html
diff --git a/doc/en/introduction.html b/doc/html/introduction.html
index fd63f9f..fd63f9f 100644
--- a/doc/en/introduction.html
+++ b/doc/html/introduction.html
diff --git a/doc/en/requirements.html b/doc/html/requirements.html
index 336ea35..336ea35 100644
--- a/doc/en/requirements.html
+++ b/doc/html/requirements.html
diff --git a/doc/en/using-tdeio_sword.html b/doc/html/using-tdeio_sword.html
index 1a56624..1a56624 100644
--- a/doc/en/using-tdeio_sword.html
+++ b/doc/html/using-tdeio_sword.html
diff --git a/src/sword.protocol b/src/sword.protocol
index b0d33fa..3e6caae 100644
--- a/src/sword.protocol
+++ b/src/sword.protocol
@@ -7,7 +7,7 @@ reading=true
defaultMimetype=text/html
Icon=tdeio_sword
Description=A tdeioslave for quick access to Bible texts within Konqueror
-X-DocPath=tdeio_sword/index.html
+X-DocPath=tdeioslave/sword/index.html
determineMimetypeFromExtension=false
Class=:local
URIMode=uri
diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt
deleted file mode 100644
index 42b186a..0000000
--- a/translations/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_auto_add_subdirectories()
diff --git a/translations/messages/CMakeLists.txt b/translations/messages/CMakeLists.txt
deleted file mode 100644
index 75c89f8..0000000
--- a/translations/messages/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
-string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )
-
-foreach( _po ${po_files} )
- get_filename_component( _lang ${_po} NAME_WE )
- if( "${_linguas}" MATCHES "^;*$" OR ";${_linguas};" MATCHES ";${_lang};" )
- if( "${_po}" MATCHES "^([^/]*)/.*" )
- string( REGEX REPLACE "^([^/]*)/.*" "\\1" _component "${_po}" )
- else( )
- set( _component "${PROJECT_NAME}" )
- endif( )
- tde_create_translation( FILES ${_po} LANG ${_lang} OUTPUT_NAME ${_component} )
- endif( )
-endforeach( )