shiboken2: Remove version suffix from generators directory

It does not make sense to move it around in each major version.

Task-number: PYSIDE-904
Change-Id: If83b1dcaf04ed5a76f35073aa63c7ef6b456936a
Reviewed-by: Christian Tismer <tismer@stackless.com>

10 files changed, 5 insertions, 5 deletions

diff --git a/sources/shiboken2/generator/CMakeLists.txt b/sources/shiboken2/generator/CMakeLists.txt
index 1a3f4e5c4..b0db0d8b0 100644
--- a/sources/shiboken2/generator/CMakeLists.txt
+++ b/sources/shiboken2/generator/CMakeLists.txt
@@ -2,10 +2,10 @@ project(shibokengenerator)
 
 set(shiboken2_SRC
 generator.cpp
-shiboken2/cppgenerator.cpp
-shiboken2/headergenerator.cpp
-shiboken2/overloaddata.cpp
-shiboken2/shibokengenerator.cpp
+shiboken/cppgenerator.cpp
+shiboken/headergenerator.cpp
+shiboken/overloaddata.cpp
+shiboken/shibokengenerator.cpp
 main.cpp
 )
 
@@ -14,7 +14,7 @@ add_executable(Shiboken2::shiboken2 ALIAS shiboken2)
 add_dependencies(shiboken2 apiextractor)
 set_target_properties(shiboken2 PROPERTIES OUTPUT_NAME shiboken2${shiboken2_SUFFIX})
 target_include_directories(shiboken2 PRIVATE
-                    ${CMAKE_CURRENT_SOURCE_DIR}/shiboken2
+                    ${CMAKE_CURRENT_SOURCE_DIR}/shiboken
                     ${CMAKE_CURRENT_SOURCE_DIR}/qtdoc
                     ${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken/cppgenerator.cpp
index 4409e0fa0..4409e0fa0 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ b/sources/shiboken2/generator/shiboken/cppgenerator.cpp
diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.h b/sources/shiboken2/generator/shiboken/cppgenerator.h
index 25d4b22db..25d4b22db 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.h
+++ b/sources/shiboken2/generator/shiboken/cppgenerator.h
diff --git a/sources/shiboken2/generator/shiboken2/ctypenames.h b/sources/shiboken2/generator/shiboken/ctypenames.h
index abac261d5..abac261d5 100644
--- a/sources/shiboken2/generator/shiboken2/ctypenames.h
+++ b/sources/shiboken2/generator/shiboken/ctypenames.h
diff --git a/sources/shiboken2/generator/shiboken2/headergenerator.cpp b/sources/shiboken2/generator/shiboken/headergenerator.cpp
index d607ed643..d607ed643 100644
--- a/sources/shiboken2/generator/shiboken2/headergenerator.cpp
+++ b/sources/shiboken2/generator/shiboken/headergenerator.cpp
diff --git a/sources/shiboken2/generator/shiboken2/headergenerator.h b/sources/shiboken2/generator/shiboken/headergenerator.h
index d02516b8d..d02516b8d 100644
--- a/sources/shiboken2/generator/shiboken2/headergenerator.h
+++ b/sources/shiboken2/generator/shiboken/headergenerator.h
diff --git a/sources/shiboken2/generator/shiboken2/overloaddata.cpp b/sources/shiboken2/generator/shiboken/overloaddata.cpp
index 53fff9f25..53fff9f25 100644
--- a/sources/shiboken2/generator/shiboken2/overloaddata.cpp
+++ b/sources/shiboken2/generator/shiboken/overloaddata.cpp
diff --git a/sources/shiboken2/generator/shiboken2/overloaddata.h b/sources/shiboken2/generator/shiboken/overloaddata.h
index 2507c3213..2507c3213 100644
--- a/sources/shiboken2/generator/shiboken2/overloaddata.h
+++ b/sources/shiboken2/generator/shiboken/overloaddata.h
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken/shibokengenerator.cpp
index c097f4355..c097f4355 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
+++ b/sources/shiboken2/generator/shiboken/shibokengenerator.cpp
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.h b/sources/shiboken2/generator/shiboken/shibokengenerator.h
index 0d49764ab..0d49764ab 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.h
+++ b/sources/shiboken2/generator/shiboken/shibokengenerator.h