[sdk/releaseme] /: remove cmakeeditor, documentatin and multipot tests
Jonathan Esk-Riddell
null at kde.org
Thu May 25 16:31:35 BST 2023
Git commit ecd43a1f0cc021de2a494f7217a80d61eb967f4d by Jonathan Esk-Riddell.
Committed on 25/05/2023 at 14:54.
Pushed by jriddell into branch 'master'.
remove cmakeeditor, documentatin and multipot tests
M +0 -1 lib/releaseme.rb
D +0 -192 lib/releaseme/cmakeeditor.rb
D +0 -135 lib/releaseme/documentation.rb
D +0 -132 test/cmakeeditor_test.rb
D +0 -0 test/data/cmakeeditor/test_create_handbook_complex/de/doc1/index.docbook
D +0 -1 test/data/cmakeeditor/test_create_handbook_complex/de/doc3/doc3.1/index.docbook
D +0 -1 test/data/cmakeeditor/test_create_handbook_complex/en/CMakeLists.txt
D +0 -0 test/data/cmakeeditor/test_create_handbook_complex/en/doc1/index.docbook
D +0 -0 test/data/cmakeeditor/test_create_handbook_complex/en/doc2/index.docbook
D +0 -1 test/data/cmakeeditor/test_create_handbook_complex/en/doc3/CMakeLists.txt
D +0 -1 test/data/cmakeeditor/test_create_handbook_complex/en/doc3/doc3.1/index.docbook
D +0 -0 test/data/cmakeeditor/test_create_handbook_complex/fr/doc2/index.docbook
D +0 -0 test/data/multi-doc/CMakeLists.txt
D +0 -3 test/data/multi-doc/doc/CMakeLists.txt
D +0 -1 test/data/multi-doc/doc/doc-invalid1/.empty
D +0 -4 test/data/multi-doc/doc/doc-valid1/CMakeLists.txt
D +0 -0 test/data/multi-doc/doc/doc-valid1/index.docbook
D +0 -3 test/data/multi-doc/doc/doc-valid2/CMakeLists.txt
D +0 -3 test/data/multi-doc/doc/doc-valid2/doc-valid2.1/CMakeLists.txt
D +0 -2 test/data/multi-doc/doc/doc-valid2/doc-valid2.1/doc-valid2.1.1/CMakeLists.txt
D +0 -0 test/data/multi-doc/doc/doc-valid2/doc-valid2.1/doc-valid2.1.1/index.docbook
D +0 -0 test/data/multi-doc/doc/doc-valid2/doc-valid2.1/index.docbook
D +0 -0 test/data/multi-doc/doc/doc-valid2/index.docbook
D +0 -0 test/data/multi-pot-kde4/CMakeLists.txt
D +0 -3 test/data/multi-pot-kde4/Messages.sh
D +0 -9 test/data/multi-pot-kde4/a/Messages.sh
D +0 -0 test/data/multi-pot-qt-frameworks/CMakeLists.txt
D +0 -7 test/data/multi-pot-qt-frameworks/Messages.sh
D +0 -0 test/data/multi-pot-qt/CMakeLists.txt
D +0 -7 test/data/multi-pot-qt/Messages.sh
D +0 -3 test/data/multi-pot-qt/a/Messages.sh
D +0 -0 test/data/multi-pot-script/CMakeLists.txt
D +0 -3 test/data/multi-pot-script/Messages.sh
D +0 -3 test/data/multi-pot-script/a/Messages.sh
D +0 -0 test/data/multi-pot/CMakeLists.txt
D +0 -3 test/data/multi-pot/Messages.sh
D +0 -9 test/data/multi-pot/a/Messages.sh
https://invent.kde.org/sdk/releaseme/-/commit/ecd43a1f0cc021de2a494f7217a80d61eb967f4d
diff --git a/lib/releaseme.rb b/lib/releaseme.rb
index f0fc8df..14b64ec 100644
--- a/lib/releaseme.rb
+++ b/lib/releaseme.rb
@@ -2,7 +2,6 @@
# SPDX-FileCopyrightText: 2017 Harald Sitter <sitter at kde.org>
require_relative 'releaseme/archive_signer'
-require_relative 'releaseme/cmakeeditor'
require_relative 'releaseme/git'
require_relative 'releaseme/gitlab'
require_relative 'releaseme/hash_template'
diff --git a/lib/releaseme/cmakeeditor.rb b/lib/releaseme/cmakeeditor.rb
deleted file mode 100644
index 6a8e458..0000000
--- a/lib/releaseme/cmakeeditor.rb
+++ /dev/null
@@ -1,192 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-# SPDX-FileCopyrightText: 2007-2021 Harald Sitter <sitter at kde.org>
-
-require 'fileutils'
-require 'pathname'
-
-require_relative 'logable'
-
-module ReleaseMe
- # General purpose CMakeLists.txt editing functions
- module CMakeEditor
- include Logable
-
- module_function
-
- def add_subdirectory(path, relative_to: nil)
- rel = path.dup
- if relative_to
- rel = Pathname.new(rel).relative_path_from(Pathname.new(relative_to))
- end
- "add_subdirectory(#{rel})\n"
- end
-
- # Checks if a given
- class SubdirMethodCall
- attr_reader :data, :subdir, :method_pattern
-
- def initialize(data:, subdir:, method_pattern:)
- @data = data
- @subdir = subdir
- @method_pattern = method_pattern
- end
-
- def check
- data =~ method_call_regex_of(method_pattern)
- end
-
- def method_call_regex_of(method_pattern)
- /^\s*(#{method_pattern})\s*\(\s*#{subdir}\s*\).*$/i
- end
- end
-
- # Base class for cmake editor implementations.
- # An editor opens a cmakelists and edits it to fit a certain expectation.
- # An editor always works with a cmakelists inside a dir and adds/changes
- # the reference to a given subdir (e.g. doc/).
- # Editing does not happen if `# SKIP_$SUBDIR_INSTALL` is in the CMakeLists.
- # If ``#$SUBDIR_SUBDIR` is in the CMakeLists the comment will be replaced
- # with the actual code (handy for if conditionally the entire block).
- # Otherwise the block will be appended to the file.
- #
- # An editor needs to implement a method `macro` which returns a string
- # of the block to paste into the file.
- # It also needs `already_edited?` to regex the content to determine
- # if the functional bit of the maybe is already in the file (e.g.
- # ki18n_install is already called somewhere).
- class CMakeEditorBase
- # The directory in which we want to edit the cmakelists
- attr_reader :dir
-
- # The directory which we are referencing in the edit.
- attr_reader :subdir
-
- # Data of the cmakelists, only available during editing!
- attr_reader :data
-
- def initialize(dir, subdir: nil)
- @dir = dir
- @subdir = subdir
- @dir, @subdir = dir_subdir_split(dir) unless subdir
- end
-
- def run
- edit_file("#{dir}/CMakeLists.txt") do
- break if skip? || already_edited?
- edit!
- end
- end
-
- private
-
- def edit!
- if data.include?("##{subdir.upcase}_SUBDIR")
- data.sub!("##{subdir.upcase}_SUBDIR", macro)
- else
- # TODO: needs test case
- # Mighty fancy regex looking for existing add_subdir.
- # Basically allows spaces everywhere one might want to put spaces.
- # At the end we allow everything as there may be a comment for
- # example.
- data << macro
- end
- end
-
- # Checks if data contains a cmake method call with subdir as argument
- def subdir_method_call?(method_pattern)
- SubdirMethodCall.new(data: data, subdir: subdir, method_pattern: method_pattern).check
- end
-
- def skip?
- data =~ /.*#\s*SKIP_#{subdir.upcase}_INSTALL/
- end
-
- def edit_file(file)
- @data = File.read(file)
- yield
- File.write(file, @data)
- end
-
- def dir_subdir_split(dir)
- [File.dirname(dir), File.basename(dir)]
- end
- end
-
- # Appends the install instructions for po/*
- class AppendPOInstallInstructions < CMakeEditorBase
- def already_edited?
- subdir_method_call?('ki18n_install') ||
- subdir_method_call?('ecm_install_po_files_as_qm')
- end
-
- def macro
- "\n" + <<-CMAKE
-find_package(KF5I18n CONFIG REQUIRED)
-ki18n_install(#{subdir})
- CMAKE
- end
- end
-
- # Compatibility, see AppendPOInstallInstructions.
- def append_po_install_instructions!(dir, subdir = nil)
- AppendPOInstallInstructions.new(dir, subdir: subdir).run
- end
-
- # Appends the install instructions for poqm/*
- class AppendPOQMInstallInstructions < CMakeEditorBase
- def already_edited?
- subdir_method_call?('ecm_install_po_files_as_qm')
- end
-
- def macro
- "\necm_install_po_files_as_qm(#{subdir})\n"
- end
- end
-
- # Compatibility, see AppendPOQMInstallInstructions.
- def append_poqm_install_instructions!(dir, subdir = nil)
- AppendPOQMInstallInstructions.new(dir, subdir: subdir).run
- end
-
- # Appends the install instructions for documentation in po/*
- class AppendDocInstallInstructions < CMakeEditorBase
- def already_edited?
- subdir_method_call?('kdoctools_install')
- end
-
- def macro
- "\n" + <<-CMAKE
- find_package(KF5DocTools CONFIG)
- if(KF5DocTools_FOUND)
- kdoctools_install(#{subdir})
- endif()
- CMAKE
- end
- end
-
- # Compatibility, see AppendDocInstallInstructions.
- def append_doc_install_instructions!(dir, subdir = nil)
- AppendDocInstallInstructions.new(dir, subdir: subdir).run
- end
-
- # Appends the inclusion of subdir/CMakeLists.txt
- class AppendOptionalAddSubdirectory < CMakeEditorBase
- def already_edited?
- subdir_method_call?('add_subdirectory') ||
- subdir_method_call?('ecm_optional_add_subdirectory')
- end
-
- def macro
- "\n" + <<-CMAKE
- include(ECMOptionalAddSubdirectory)
- ecm_optional_add_subdirectory(#{subdir})
- CMAKE
- end
- end
-
- # Compatibility, see AppendOptionalAddSubdirectory.
- def append_optional_add_subdirectory!(dir, subdir = nil)
- AppendOptionalAddSubdirectory.new(dir, subdir: subdir).run
- end
- end
-end
diff --git a/lib/releaseme/documentation.rb b/lib/releaseme/documentation.rb
deleted file mode 100644
index a7ed22a..0000000
--- a/lib/releaseme/documentation.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-# SPDX-FileCopyrightText: 2007-2017 Harald Sitter <sitter at kde.org>
-
-require 'fileutils'
-
-require_relative 'cmakeeditor'
-require_relative 'logable'
-require_relative 'svn'
-require_relative 'translationunit'
-
-module ReleaseMe
- # Fetches documentation localization.
- class DocumentationL10n < TranslationUnit
- prepend Logable
-
- HANDBOOK_REGEX =
- 'kdoctools_create_handbook\s*\(.+\s+SUBDIR\s+(?<item>[^\)\s]+)\s*\)'
- .freeze
- MANPAGE_REGEX =
- 'kdoctools_create_manpage\s*\(\s*(?<item>man-[^\)\s]+\.docbook)'.freeze
-
- def get(srcdir)
- @srcdir = File.expand_path(srcdir)
- @podir = podir_from(@srcdir)
-
- langs_with_documentation = []
- langs_without_documentation = []
-
- log_info "Downloading documentations for #{srcdir}"
-
- # return false if doc_dirs.empty?
- unless translatables?
- log_warn <<-EOF
-Could not find any documentation by checking for *.docbook files in the source.
-Skipping documentation :(
- EOF
- return
- end
-
- queue = languages_queue(without: %w[en])
- each_language_with_tmpdir(queue) do |lang, tmpdir|
- if get_language(lang, tmpdir)
- langs_with_documentation << lang
- else
- langs_without_documentation << lang
- end
- end
-
- if !langs_with_documentation.empty?
- CMakeEditor.append_doc_install_instructions!(@podir)
- else
- log_warn 'There are no translations at all!'
- end
-
- return if langs_without_documentation.empty?
- log_info "No translations for: #{langs_without_documentation.join(', ')}"
- end
-
- private
-
- def podir_from(srcdir)
- if Dir.exist?("#{srcdir}/po")
- "#{srcdir}/po"
- elsif Dir.exist?("#{srcdir}/poqm")
- "#{srcdir}/poqm"
- else
- "#{srcdir}/po" # Default to po
- end
- end
-
- def docbook_dirs
- Dir.glob("#{@srcdir}/**/*.docbook").collect do |file|
- next nil if manpage?(file)
- name = File.basename(File.dirname(file))
- %w[doc docs docbook documentation].include?(name) ? nil : name
- end
- end
-
- def cmake_collect_matches(regex_str)
- Dir.glob("#{@srcdir}/**/CMakeLists.txt").collect do |file|
- next unless file.include?('doc/')
- regex = Regexp.new(regex_str, Regexp::IGNORECASE | Regexp::MULTILINE)
- (regex.match(File.read(file)) || {})[:item]
- end.compact
- end
-
- def kdoctools_dirs
- cmake_collect_matches(HANDBOOK_REGEX)
- end
-
- def manpages
- cmake_collect_matches(MANPAGE_REGEX)
- end
-
- def doc_dirs
- (docbook_dirs + kdoctools_dirs).uniq.compact
- end
-
- def translatables?
- !doc_dirs.empty? || !manpages.empty?
- end
-
- def manpage?(path)
- File.basename(path) =~ /man-.+\.docbook/
- end
-
- def find_all_docs(dir)
- doc_dirs.select { |doc_dir| Dir.exist?("#{dir}/#{doc_dir}") }
- end
-
- def find_all_manpages(dir)
- manpages.collect do |manpage|
- Dir.glob("#{dir}/**/#{manpage}").collect do |x|
- Pathname.new(x).relative_path_from(Pathname.new(dir)).to_s
- end
- end.flatten
- end
-
- def get_language(language, tmpdir)
- target_dir = "#{@podir}/#{language}/docs"
- return true if File.exist?(target_dir) # already exists in git
-
- @vcs.get(tmpdir, "#{language}/docs/#{@i18n_path}")
-
- selection = (find_all_docs(tmpdir) + find_all_manpages(tmpdir)).uniq
- selection.each do |d|
- dest = "#{target_dir}/#{File.dirname(d)}"
- FileUtils.mkpath(dest)
- FileUtils.cp_r("#{tmpdir}/#{d}", dest)
- end
-
- !selection.empty?
- end
- end
-end
diff --git a/test/cmakeeditor_test.rb b/test/cmakeeditor_test.rb
deleted file mode 100644
index 8667c72..0000000
--- a/test/cmakeeditor_test.rb
+++ /dev/null
@@ -1,132 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-# SPDX-FileCopyrightText: 2014-2017 Harald Sitter <sitter at kde.org>
-
-require 'fileutils'
-
-require_relative 'lib/testme'
-require_relative '../lib/releaseme/cmakeeditor'
-
-class TestCMakeEditor < Testme
- def assert_has_terminal_newline(data)
- assert(data.end_with?("\n"))
- end
-
- def assert_equal_valid_meta_cmakelists(dir, file = 'CMakeLists.txt')
- Dir.chdir(dir) do
- dirs = Dir.glob('*').select { |f| File.directory?(f) }
- # FIXME: this again a variation of assert unordered nonesense lists
- # see below
- expected_subdirs = []
- dirs.each do |d|
- expected_subdirs << ReleaseMe::CMakeEditor.add_subdirectory(d).strip
- end
- present_subdirs = File.read(file).split($RS)
- missing_subdirs = []
- expected_subdirs.each do |f|
- missing_subdirs << f unless present_subdirs.include?(f)
- present_subdirs.delete(f)
- end
- assert(missing_subdirs.empty?, "missing dir(S): #{missing_subdirs}")
- assert(present_subdirs.empty?, "unexpected dir(s): #{present_subdirs}")
- end
- end
-
- def create_cmakelists!
- f = File.new('CMakeLists.txt', File::CREAT | File::RDWR | File::TRUNC)
- f << "#FOO_SUBDIR\n"
- f.close
- end
-
- def test_append_po_install_instructions
- create_cmakelists!
- ReleaseMe::CMakeEditor.append_po_install_instructions!(Dir.pwd, 'po')
- # FIXME: lots of code dup like this
- assert_path_exist('CMakeLists.txt')
- data = File.read('CMakeLists.txt')
- assert(data.include?("#FOO_SUBDIR\n"))
- assert(data.include?('ki18n_install(po)'))
- assert_has_terminal_newline(data)
- # Make sure the editor doesn't append if it is already there...
- ReleaseMe::CMakeEditor.append_po_install_instructions!(Dir.pwd, 'po')
- data = File.read('CMakeLists.txt')
- assert_includes(data, 'ki18n_install(po)')
- end
-
- def test_append_po_install_instructions_with_ecm_to_qm
- File.write('CMakeLists.txt', ' ecm_install_po_files_as_qm ( po ) ')
- ReleaseMe::CMakeEditor.append_po_install_instructions!(Dir.pwd, 'po')
- data = File.read('CMakeLists.txt')
- refute_includes(data, 'ki18n_install(po)')
- end
-
- def test_append_po_install_instructions_substitute
- create_cmakelists!
- ReleaseMe::CMakeEditor.append_po_install_instructions!(Dir.pwd, 'foo')
- assert_path_exist('CMakeLists.txt')
- data = File.read('CMakeLists.txt')
- assert(!data.include?("#FOO_SUBDIR\n"))
- assert(data.include?('ki18n_install(foo)'))
- assert_has_terminal_newline(data)
- end
-
- def test_append_optional_add_subdirectory_append
- create_cmakelists!
- ReleaseMe::CMakeEditor.append_optional_add_subdirectory!(Dir.pwd, 'append')
- assert_path_exist('CMakeLists.txt')
- data = File.read('CMakeLists.txt')
- assert(data.include?("#FOO_SUBDIR\n"))
- assert(data.include?('add_subdirectory(append)'))
- assert_has_terminal_newline(data)
- # Make sure the editor doesn't append if it is already there...
- ReleaseMe::CMakeEditor.append_optional_add_subdirectory!(Dir.pwd, 'po')
- data = File.read('CMakeLists.txt')
- assert_includes(data, 'add_subdirectory(append)')
- end
-
- def test_append_optional_add_subdirectory_substitute
- create_cmakelists!
- ReleaseMe::CMakeEditor.append_optional_add_subdirectory!(Dir.pwd, 'foo')
- assert_path_exist('CMakeLists.txt')
- data = File.read('CMakeLists.txt')
- assert(!data.include?("#FOO_SUBDIR\n"))
- assert(data.include?('ECMOptionalAddSubdirectory'))
- assert(data.include?('ecm_optional_add_subdirectory(foo'))
- assert_has_terminal_newline(data)
- end
-
- def skip_options(d)
- d = d.upcase
- [
- "# SKIP_#{d}_INSTALL",
- "# SKIP_#{d}_INSTALL fishy sail",
- " # SKIP_#{d}_INSTALL",
- " # SKIP_#{d}_INSTALL ",
- "#SKIP_#{d}_INSTALL ",
- " beeep #SKIP_#{d}_INSTALL"
- ]
- end
-
- def test_skipperino
- # SKIP_FOO_INSTALL can be used as a comment anywhere in a to-be-mangled
- # CMakeLists.txt to prevent the mangling from a source level. This overrides
- # whatever releaseme wants to do or is instructed to do!
-
- skip_options('po').each do |comment|
- File.write('CMakeLists.txt', comment)
- ReleaseMe::CMakeEditor.append_po_install_instructions!("#{Dir.pwd}/po")
- assert_equal(comment, File.read('CMakeLists.txt'), 'po')
- end
-
- skip_options('poqm').each do |comment|
- File.write('CMakeLists.txt', comment)
- ReleaseMe::CMakeEditor.append_poqm_install_instructions!("#{Dir.pwd}/poqm")
- assert_equal(comment, File.read('CMakeLists.txt'), 'poqm')
- end
-
- skip_options('doc').each do |comment|
- File.write('CMakeLists.txt', comment)
- ReleaseMe::CMakeEditor.append_optional_add_subdirectory!("#{Dir.pwd}/doc")
- assert_equal(comment, File.read('CMakeLists.txt'), 'doc')
- end
- end
-end
diff --git a/test/data/cmakeeditor/test_create_handbook_complex/de/doc1/index.docbook b/test/data/cmakeeditor/test_create_handbook_complex/de/doc1/index.docbook
deleted file mode 100644
index e69de29..0000000
diff --git a/test/data/cmakeeditor/test_create_handbook_complex/de/doc3/doc3.1/index.docbook b/test/data/cmakeeditor/test_create_handbook_complex/de/doc3/doc3.1/index.docbook
deleted file mode 100644
index 8d1c8b6..0000000
--- a/test/data/cmakeeditor/test_create_handbook_complex/de/doc3/doc3.1/index.docbook
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/data/cmakeeditor/test_create_handbook_complex/en/CMakeLists.txt b/test/data/cmakeeditor/test_create_handbook_complex/en/CMakeLists.txt
deleted file mode 100644
index 821cc64..0000000
--- a/test/data/cmakeeditor/test_create_handbook_complex/en/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-ecm_optional_add_subdirectory(doc1)
diff --git a/test/data/cmakeeditor/test_create_handbook_complex/en/doc1/index.docbook b/test/data/cmakeeditor/test_create_handbook_complex/en/doc1/index.docbook
deleted file mode 100644
index e69de29..0000000
diff --git a/test/data/cmakeeditor/test_create_handbook_complex/en/doc2/index.docbook b/test/data/cmakeeditor/test_create_handbook_complex/en/doc2/index.docbook
deleted file mode 100644
index e69de29..0000000
diff --git a/test/data/cmakeeditor/test_create_handbook_complex/en/doc3/CMakeLists.txt b/test/data/cmakeeditor/test_create_handbook_complex/en/doc3/CMakeLists.txt
deleted file mode 100644
index 8d1c8b6..0000000
--- a/test/data/cmakeeditor/test_create_handbook_complex/en/doc3/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/data/cmakeeditor/test_create_handbook_complex/en/doc3/doc3.1/index.docbook b/test/data/cmakeeditor/test_create_handbook_complex/en/doc3/doc3.1/index.docbook
deleted file mode 100644
index 8d1c8b6..0000000
--- a/test/data/cmakeeditor/test_create_handbook_complex/en/doc3/doc3.1/index.docbook
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/data/cmakeeditor/test_create_handbook_complex/fr/doc2/index.docbook b/test/data/cmakeeditor/test_create_handbook_complex/fr/doc2/index.docbook
deleted file mode 100644
index e69de29..0000000
diff --git a/test/data/multi-doc/CMakeLists.txt b/test/data/multi-doc/CMakeLists.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/test/data/multi-doc/doc/CMakeLists.txt b/test/data/multi-doc/doc/CMakeLists.txt
deleted file mode 100644
index 9ff8c17..0000000
--- a/test/data/multi-doc/doc/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-include(ECMOptionalAddSubdirectory)
-ecm_optional_add_subdirectory(doc-valid1)
-ecm_optional_add_subdirectory(doc-valid2)
diff --git a/test/data/multi-doc/doc/doc-invalid1/.empty b/test/data/multi-doc/doc/doc-invalid1/.empty
deleted file mode 100644
index 8d1c8b6..0000000
--- a/test/data/multi-doc/doc/doc-invalid1/.empty
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/data/multi-doc/doc/doc-valid1/CMakeLists.txt b/test/data/multi-doc/doc/doc-valid1/CMakeLists.txt
deleted file mode 100644
index 4e10cb2..0000000
--- a/test/data/multi-doc/doc/doc-valid1/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-########### install files ###############
-#
-#
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR amarok)
diff --git a/test/data/multi-doc/doc/doc-valid1/index.docbook b/test/data/multi-doc/doc/doc-valid1/index.docbook
deleted file mode 100644
index e69de29..0000000
diff --git a/test/data/multi-doc/doc/doc-valid2/CMakeLists.txt b/test/data/multi-doc/doc/doc-valid2/CMakeLists.txt
deleted file mode 100644
index 0f0118e..0000000
--- a/test/data/multi-doc/doc/doc-valid2/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-include(ECMOptionalAddSubdirectory)
-ecm_optional_add_subdirectory(doc-valid2.1)
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en_US)
diff --git a/test/data/multi-doc/doc/doc-valid2/doc-valid2.1/CMakeLists.txt b/test/data/multi-doc/doc/doc-valid2/doc-valid2.1/CMakeLists.txt
deleted file mode 100644
index 5023f2e..0000000
--- a/test/data/multi-doc/doc/doc-valid2/doc-valid2.1/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-include(ECMOptionalAddSubdirectory)
-ecm_optional_add_subdirectory(doc-valid2.1.1)
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en_US SUBDIR doc-valid2.1)
diff --git a/test/data/multi-doc/doc/doc-valid2/doc-valid2.1/doc-valid2.1.1/CMakeLists.txt b/test/data/multi-doc/doc/doc-valid2/doc-valid2.1/doc-valid2.1.1/CMakeLists.txt
deleted file mode 100644
index 841999d..0000000
--- a/test/data/multi-doc/doc/doc-valid2/doc-valid2.1/doc-valid2.1.1/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-include(ECMOptionalAddSubdirectory)
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en_US SUBDIR doc-valid2.1.1)
diff --git a/test/data/multi-doc/doc/doc-valid2/doc-valid2.1/doc-valid2.1.1/index.docbook b/test/data/multi-doc/doc/doc-valid2/doc-valid2.1/doc-valid2.1.1/index.docbook
deleted file mode 100644
index e69de29..0000000
diff --git a/test/data/multi-doc/doc/doc-valid2/doc-valid2.1/index.docbook b/test/data/multi-doc/doc/doc-valid2/doc-valid2.1/index.docbook
deleted file mode 100644
index e69de29..0000000
diff --git a/test/data/multi-doc/doc/doc-valid2/index.docbook b/test/data/multi-doc/doc/doc-valid2/index.docbook
deleted file mode 100644
index e69de29..0000000
diff --git a/test/data/multi-pot-kde4/CMakeLists.txt b/test/data/multi-pot-kde4/CMakeLists.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/test/data/multi-pot-kde4/Messages.sh b/test/data/multi-pot-kde4/Messages.sh
deleted file mode 100755
index c0fc025..0000000
--- a/test/data/multi-pot-kde4/Messages.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-$XGETTEXT_QT utilities/collectionscanner/CollectionScanner.cpp -o $podir/amarokcollectionscanner_qt.pot
diff --git a/test/data/multi-pot-kde4/a/Messages.sh b/test/data/multi-pot-kde4/a/Messages.sh
deleted file mode 100755
index 601cddd..0000000
--- a/test/data/multi-pot-kde4/a/Messages.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-$EXTRACTRC `find . -name "*.rc" -o -name "*.ui" -o -name "*.kcfg"` >> rc.cpp
-$EXTRACTATTR --attr=layout,name data/DefaultPlaylistLayouts.xml >> rc.cpp
-LIST=`find . -name \*.h -o -name \*.cpp`
-if test -n "$LIST"; then
- $XGETTEXT $LIST -o $podir/amarok.pot
-fi
-rm -f rc.cpp
-$XGETTEXT_QT utilities/collectionscanner/CollectionScanner.cpp -o $podir/amarokcollectionscanner_qt.pot
diff --git a/test/data/multi-pot-qt-frameworks/CMakeLists.txt b/test/data/multi-pot-qt-frameworks/CMakeLists.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/test/data/multi-pot-qt-frameworks/Messages.sh b/test/data/multi-pot-qt-frameworks/Messages.sh
deleted file mode 100755
index 056297a..0000000
--- a/test/data/multi-pot-qt-frameworks/Messages.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/sh
-
-$EXTRACTRC `find . -name '*.rc'` >> rc.cpp || exit 11
-$EXTRACTRC `find . -name '*.ui'` >> rc.cpp || exit 12
-$EXTRACTRC `find . -name '*.kcfg'` >> rc.cpp || exit 13
-$XGETTEXT `find solid_qt -name '*.cc'` rc.cpp -o $podir/solid_qt.pot
-rm -f rc.cpp
diff --git a/test/data/multi-pot-qt/CMakeLists.txt b/test/data/multi-pot-qt/CMakeLists.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/test/data/multi-pot-qt/Messages.sh b/test/data/multi-pot-qt/Messages.sh
deleted file mode 100755
index f7875b6..0000000
--- a/test/data/multi-pot-qt/Messages.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/sh
-
-$EXTRACTRC `find . -name '*.rc'` >> rc.cpp || exit 11
-$EXTRACTRC `find . -name '*.ui'` >> rc.cpp || exit 12
-$EXTRACTRC `find . -name '*.kcfg'` >> rc.cpp || exit 13
-$XGETTEXT `find step -name '*.cc'` rc.cpp -o $podir/step.pot
-rm -f rc.cpp
diff --git a/test/data/multi-pot-qt/a/Messages.sh b/test/data/multi-pot-qt/a/Messages.sh
deleted file mode 100755
index 0274024..0000000
--- a/test/data/multi-pot-qt/a/Messages.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-$EXTRACT_TR_STRINGS `find . -name '*.cc'` -o $podir/step_qt.pot
diff --git a/test/data/multi-pot-script/CMakeLists.txt b/test/data/multi-pot-script/CMakeLists.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/test/data/multi-pot-script/Messages.sh b/test/data/multi-pot-script/Messages.sh
deleted file mode 100755
index a4cca8d..0000000
--- a/test/data/multi-pot-script/Messages.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-$XGETTEXT_QT foo.cpp -o $podir/ki18n5.pot
diff --git a/test/data/multi-pot-script/a/Messages.sh b/test/data/multi-pot-script/a/Messages.sh
deleted file mode 100755
index ea3f1aa..0000000
--- a/test/data/multi-pot-script/a/Messages.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-$XGETTEXT_QT bar.cpp -o $podir/libplasma5.pot
diff --git a/test/data/multi-pot/CMakeLists.txt b/test/data/multi-pot/CMakeLists.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/test/data/multi-pot/Messages.sh b/test/data/multi-pot/Messages.sh
deleted file mode 100755
index d701cf7..0000000
--- a/test/data/multi-pot/Messages.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-$XGETTEXT_QT utilities/collectionscanner/CollectionScanner.cpp -o $podir/amarokcollectionscanner.pot
diff --git a/test/data/multi-pot/a/Messages.sh b/test/data/multi-pot/a/Messages.sh
deleted file mode 100755
index 69f46d7..0000000
--- a/test/data/multi-pot/a/Messages.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-$EXTRACTRC `find . -name "*.rc" -o -name "*.ui" -o -name "*.kcfg"` >> rc.cpp
-$EXTRACTATTR --attr=layout,name data/DefaultPlaylistLayouts.xml >> rc.cpp
-LIST=`find . -name \*.h -o -name \*.cpp`
-if test -n "$LIST"; then
- $XGETTEXT $LIST -o $podir/amarok.pot
-fi
-rm -f rc.cpp
-$XGETTEXT_QT utilities/collectionscanner/CollectionScanner.cpp -o $podir/amarokcollectionscanner.pot
More information about the kde-doc-english
mailing list