build: Move XML codegen scripts into scripts dir

- Update android-generate.bat and android-generate.sh
- Updated layer CMakeLists.txt files for new path

Change-Id: I1b1c9dbc9e944c90e95542fcfdda1d2e804517f3

9 files changed, 8 insertions, 8 deletions

diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat
index 45dd18fb..96491e1a 100644
--- a/build-android/android-generate.bat
+++ b/build-android/android-generate.bat
@@ -25,9 +25,9 @@ python ../scripts/vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan
 python ../scripts/vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated/include

 

 cd generated/include

-python ../../../lvl_genvk.py -registry ../../../vk.xml thread_check.h

-python ../../../lvl_genvk.py -registry ../../../vk.xml parameter_validation.h

-python ../../../lvl_genvk.py -registry ../../../vk.xml unique_objects_wrappers.h

+python ../../../scripts/lvl_genvk.py -registry ../../../vk.xml thread_check.h

+python ../../../scripts/lvl_genvk.py -registry ../../../vk.xml parameter_validation.h

+python ../../../scripts/lvl_genvk.py -registry ../../../vk.xml unique_objects_wrappers.h

 cd ../..

 

 copy /Y ..\layers\vk_layer_config.cpp   generated\common\

diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh
index cdd9ede7..66293fd9 100755
--- a/build-android/android-generate.sh
+++ b/build-android/android-generate.sh
@@ -26,9 +26,9 @@ python ../scripts/vk-generate.py Android dispatch-table-ops layer > generated/in
 python ../scripts/vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated/include
 python ../scripts/vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated/include
 
-( cd generated/include; python ../../../lvl_genvk.py -registry ../../../vk.xml thread_check.h )
-( cd generated/include; python ../../../lvl_genvk.py -registry ../../../vk.xml parameter_validation.h )
-( cd generated/include; python ../../../lvl_genvk.py -registry ../../../vk.xml unique_objects_wrappers.h )
+( cd generated/include; python ../../../scripts/lvl_genvk.py -registry ../../../vk.xml thread_check.h )
+( cd generated/include; python ../../../scripts/lvl_genvk.py -registry ../../../vk.xml parameter_validation.h )
+( cd generated/include; python ../../../scripts/lvl_genvk.py -registry ../../../vk.xml unique_objects_wrappers.h )
 
 cp -f ../layers/vk_layer_config.cpp   generated/common/
 cp -f ../layers/vk_layer_extension_utils.cpp  generated/common/
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index 66d25898..fa95fd33 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -9,8 +9,8 @@ endmacro()
 
 macro(run_vk_layer_xml_generate dependency output)
     add_custom_command(OUTPUT ${output}
-        COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/lvl_genvk.py -registry ${PROJECT_SOURCE_DIR}/vk.xml ${output}
-        DEPENDS ${PROJECT_SOURCE_DIR}/vk.xml ${PROJECT_SOURCE_DIR}/generator.py ${PROJECT_SOURCE_DIR}/${dependency} ${PROJECT_SOURCE_DIR}/lvl_genvk.py ${PROJECT_SOURCE_DIR}/reg.py
+        COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${PROJECT_SOURCE_DIR}/vk.xml ${output}
+        DEPENDS ${PROJECT_SOURCE_DIR}/vk.xml ${SCRIPTS_DIR}/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${SCRIPTS_DIR}/reg.py
     )
 endmacro()
 
diff --git a/generator.py b/scripts/generator.py
index 043121cd..043121cd 100755
--- a/generator.py
+++ b/scripts/generator.py
diff --git a/lvl_genvk.py b/scripts/lvl_genvk.py
index 8fa7c1bf..8fa7c1bf 100644
--- a/lvl_genvk.py
+++ b/scripts/lvl_genvk.py
diff --git a/parameter_validation_generator.py b/scripts/parameter_validation_generator.py
index e0d215da..e0d215da 100644
--- a/parameter_validation_generator.py
+++ b/scripts/parameter_validation_generator.py
diff --git a/reg.py b/scripts/reg.py
index 98436a33..98436a33 100755
--- a/reg.py
+++ b/scripts/reg.py
diff --git a/threading_generator.py b/scripts/threading_generator.py
index 0d0df12a..0d0df12a 100644
--- a/threading_generator.py
+++ b/scripts/threading_generator.py
diff --git a/unique_objects_generator.py b/scripts/unique_objects_generator.py
index cdd2808c..cdd2808c 100644
--- a/unique_objects_generator.py
+++ b/scripts/unique_objects_generator.py