Git commit 90324b83c7e6e6e02ec8f53724feafc822cbe5e1 by Christophe Giboudeaux. Committed on 04/07/2013 at 12:49. Pushed by cgiboudeaux into branch 'master'.
Move the english doc. Translations are now handled by scripty M +1 -42 doc/CMakeLists.txt D +0 -22 doc/en/CMakeLists.txt D +0 -1 doc/en/hi128-filesys-kdesvnadded.png D +0 -1 doc/en/hi128-filesys-kdesvnconflicted.png D +0 -1 doc/en/hi128-filesys-kdesvndeleted.png D +0 -1 doc/en/hi128-filesys-kdesvnlocked.png D +0 -1 doc/en/hi128-filesys-kdesvnmodified.png D +0 -1 doc/en/hi128-filesys-kdesvnneedlock.png D +0 -1 doc/en/hi128-filesys-kdesvnupdates.png A +- -- doc/hi128-filesys-kdesvnadded.png A +- -- doc/hi128-filesys-kdesvnconflicted.png A +- -- doc/hi128-filesys-kdesvndeleted.png A +- -- doc/hi128-filesys-kdesvnlocked.png A +- -- doc/hi128-filesys-kdesvnmodified.png A +- -- doc/hi128-filesys-kdesvnneedlock.png A +- -- doc/hi128-filesys-kdesvnupdates.png R +0 -0 doc/index.docbook [from: doc/en/index.docbook - 100% similarity] D +0 -35 doc/makecommon.sh D +0 -38 doc/makelink.cmake http://commits.kde.org/kdesvn/90324b83c7e6e6e02ec8f53724feafc822cbe5e1 diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 1d87890..33b906a 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,44 +1,3 @@ -#### - # Copyright (C) 2005-2009 by Rajko Albrecht ral at alwins-world.de # - # http://kdesvn.alwins-world.de/ # - # # - # This program is free software; you can redistribute it and/or modify # - # it under the terms of the GNU General Public License as published by # - # the Free Software Foundation; either version 2 of the License, or # - # (at your option) any later version. # - # # - # This program is distributed in the hope that it will be useful, # - # but WITHOUT ANY WARRANTY; without even the implied warranty of # - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # - # GNU General Public License for more details. # - # # - # You should have received a copy of the GNU General Public License # - # along with this program; if not, write to the # - # Free Software Foundation, Inc., # - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # - #### - -macro(GENBOOK _language_code) - file(GLOB docimages RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} hi128-filesys-*.png) - kde4_create_handbook(index.docbook - INSTALL_DESTINATION ${HTML_INSTALL_DIR}/${_language_code} SUBDIR kdesvn) - - foreach(_img ${docimages}) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_img} - ${CMAKE_CURRENT_BINARY_DIR}/${_img} - COPYONLY - ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_img} - DESTINATION ${HTML_INSTALL_DIR}/${_language_code}/kdesvn - ) - endforeach() - add_dependencies(doc ${_language_code}-handbook) -endmacro () - -add_custom_target(doc ALL) - -add_subdirectory(en) -add_subdirectory(nl) -install(SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/makelink.cmake) +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en) add_subdirectory(man) diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt deleted file mode 100644 index 8c4b150..0000000 --- a/doc/en/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -#### - # Copyright (C) 2005-2009 by Rajko Albrecht ral at alwins-world.de # - # http://kdesvn.alwins-world.de/ # - # # - # This program is free software; you can redistribute it and/or modify # - # it under the terms of the GNU General Public License as published by # - # the Free Software Foundation; either version 2 of the License, or # - # (at your option) any later version. # - # # - # This program is distributed in the hope that it will be useful, # - # but WITHOUT ANY WARRANTY; without even the implied warranty of # - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # - # GNU General Public License for more details. # - # # - # You should have received a copy of the GNU General Public License # - # along with this program; if not, write to the # - # Free Software Foundation, Inc., # - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # - #### - -genbook(en) - diff --git a/doc/en/hi128-filesys-kdesvnadded.png b/doc/en/hi128-filesys-kdesvnadded.png deleted file mode 120000 index 3980b44..0000000 --- a/doc/en/hi128-filesys-kdesvnadded.png +++ /dev/null @@ -1 +0,0 @@ -../../src/pics/hi128-filesys-kdesvnadded.png \ No newline at end of file diff --git a/doc/en/hi128-filesys-kdesvnconflicted.png b/doc/en/hi128-filesys-kdesvnconflicted.png deleted file mode 120000 index 72b1744..0000000 --- a/doc/en/hi128-filesys-kdesvnconflicted.png +++ /dev/null @@ -1 +0,0 @@ -../../src/pics/hi128-filesys-kdesvnconflicted.png \ No newline at end of file diff --git a/doc/en/hi128-filesys-kdesvndeleted.png b/doc/en/hi128-filesys-kdesvndeleted.png deleted file mode 120000 index 121290d..0000000 --- a/doc/en/hi128-filesys-kdesvndeleted.png +++ /dev/null @@ -1 +0,0 @@ -../../src/pics/hi128-filesys-kdesvndeleted.png \ No newline at end of file diff --git a/doc/en/hi128-filesys-kdesvnlocked.png b/doc/en/hi128-filesys-kdesvnlocked.png deleted file mode 120000 index bd13b99..0000000 --- a/doc/en/hi128-filesys-kdesvnlocked.png +++ /dev/null @@ -1 +0,0 @@ -../../src/pics/hi128-filesys-kdesvnlocked.png \ No newline at end of file diff --git a/doc/en/hi128-filesys-kdesvnmodified.png b/doc/en/hi128-filesys-kdesvnmodified.png deleted file mode 120000 index f60c494..0000000 --- a/doc/en/hi128-filesys-kdesvnmodified.png +++ /dev/null @@ -1 +0,0 @@ -../../src/pics/hi128-filesys-kdesvnmodified.png \ No newline at end of file diff --git a/doc/en/hi128-filesys-kdesvnneedlock.png b/doc/en/hi128-filesys-kdesvnneedlock.png deleted file mode 120000 index 7b2a791..0000000 --- a/doc/en/hi128-filesys-kdesvnneedlock.png +++ /dev/null @@ -1 +0,0 @@ -../../src/pics/hi128-filesys-kdesvnneedlock.png \ No newline at end of file diff --git a/doc/en/hi128-filesys-kdesvnupdates.png b/doc/en/hi128-filesys-kdesvnupdates.png deleted file mode 120000 index 0b4de09..0000000 --- a/doc/en/hi128-filesys-kdesvnupdates.png +++ /dev/null @@ -1 +0,0 @@ -../../src/pics/hi128-filesys-kdesvnupdates.png \ No newline at end of file diff --git a/doc/hi128-filesys-kdesvnadded.png b/doc/hi128-filesys-kdesvnadded.png new file mode 100644 index 0000000..6ccb770 Binary files /dev/null and b/doc/hi128-filesys-kdesvnadded.png differ diff --git a/doc/hi128-filesys-kdesvnconflicted.png b/doc/hi128-filesys-kdesvnconflicted.png new file mode 100644 index 0000000..0fbd12f Binary files /dev/null and b/doc/hi128-filesys-kdesvnconflicted.png differ diff --git a/doc/hi128-filesys-kdesvndeleted.png b/doc/hi128-filesys-kdesvndeleted.png new file mode 100644 index 0000000..c0d85e0 Binary files /dev/null and b/doc/hi128-filesys-kdesvndeleted.png differ diff --git a/doc/hi128-filesys-kdesvnlocked.png b/doc/hi128-filesys-kdesvnlocked.png new file mode 100644 index 0000000..3022706 Binary files /dev/null and b/doc/hi128-filesys-kdesvnlocked.png differ diff --git a/doc/hi128-filesys-kdesvnmodified.png b/doc/hi128-filesys-kdesvnmodified.png new file mode 100644 index 0000000..5f028fa Binary files /dev/null and b/doc/hi128-filesys-kdesvnmodified.png differ diff --git a/doc/hi128-filesys-kdesvnneedlock.png b/doc/hi128-filesys-kdesvnneedlock.png new file mode 100644 index 0000000..371a2a2 Binary files /dev/null and b/doc/hi128-filesys-kdesvnneedlock.png differ diff --git a/doc/hi128-filesys-kdesvnupdates.png b/doc/hi128-filesys-kdesvnupdates.png new file mode 100644 index 0000000..dd70ded Binary files /dev/null and b/doc/hi128-filesys-kdesvnupdates.png differ diff --git a/doc/en/index.docbook b/doc/index.docbook similarity index 100% rename from doc/en/index.docbook rename to doc/index.docbook diff --git a/doc/makecommon.sh b/doc/makecommon.sh deleted file mode 100755 index 70d6825..0000000 --- a/doc/makecommon.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -#### - # Copyright (C) 2005-2009 by Rajko Albrecht ral at alwins-world.de # - # http://kdesvn.alwins-world.de/ # - # # - # This program is free software; you can redistribute it and/or modify # - # it under the terms of the GNU General Public License as published by # - # the Free Software Foundation; either version 2 of the License, or # - # (at your option) any later version. # - # # - # This program is distributed in the hope that it will be useful, # - # but WITHOUT ANY WARRANTY; without even the implied warranty of # - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # - # GNU General Public License for more details. # - # # - # You should have received a copy of the GNU General Public License # - # along with this program; if not, write to the # - # Free Software Foundation, Inc., # - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # - #### - -if [ "x$1" = "x" ]; then - echo "No source" - exit 0 -fi -if [ "x$2" = "x" ]; then - echo "No target" - exit 0 -fi - -if [ ! -h $1 ]; then - echo "linking $2 -> $1" - ln -fs "$2" "$1" -fi - diff --git a/doc/makelink.cmake b/doc/makelink.cmake deleted file mode 100644 index f3edec4..0000000 --- a/doc/makelink.cmake +++ /dev/null @@ -1,38 +0,0 @@ -#### - # Copyright (C) 2005-2009 by Rajko Albrecht ral at alwins-world.de # - # http://kdesvn.alwins-world.de/ # - # # - # This program is free software; you can redistribute it and/or modify # - # it under the terms of the GNU General Public License as published by # - # the Free Software Foundation; either version 2 of the License, or # - # (at your option) any later version. # - # # - # This program is distributed in the hope that it will be useful, # - # but WITHOUT ANY WARRANTY; without even the implied warranty of # - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # - # GNU General Public License for more details. # - # # - # You should have received a copy of the GNU General Public License # - # along with this program; if not, write to the # - # Free Software Foundation, Inc., # - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # - #### - -if($ENV{DESTDIR} MATCHES ".+") - set(DESTDIR $ENV{DESTDIR}) -else() - set(DESTDIR "") -endif() - -set(COMMONLINK "${DESTDIR}${CMAKE_INSTALL_PREFIX}/share/doc/HTML/en/kdesvn/common") - -message(STATUS "Generating ${COMMONLINK}") - -execute_process( - COMMAND "rm" "-f" "common" - COMMAND ln "-s" "../common" "common" - WORKING_DIRECTORY "${DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/doc/HTML/en/kdesvn" - ) - -set(CMAKE_INSTALL_MANIFEST_FILES ${CMAKE_INSTALL_MANIFEST_FILES} "${CMAKE_INSTALL_PREFIX}/share/doc/HTML/en/kdesvn/common") -
