From 0fcd1a7ef1f62557daa83f390bbaf4ab40465ddd Mon Sep 17 00:00:00 2001
From: Mark Lobodzinski <mark@lunarg.com>
Date: Fri, 18 Nov 2016 14:58:57 -0700
Subject: [PATCH] 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
---
 build-android/android-generate.bat                                  | 6 +++---
 build-android/android-generate.sh                                   | 6 +++---
 layers/CMakeLists.txt                                               | 4 ++--
 generator.py => scripts/generator.py                                | 0
 lvl_genvk.py => scripts/lvl_genvk.py                                | 0
 .../parameter_validation_generator.py                               | 0
 reg.py => scripts/reg.py                                            | 0
 threading_generator.py => scripts/threading_generator.py            | 0
 unique_objects_generator.py => scripts/unique_objects_generator.py  | 0
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename generator.py => scripts/generator.py (100%)
 rename lvl_genvk.py => scripts/lvl_genvk.py (100%)
 rename parameter_validation_generator.py => scripts/parameter_validation_generator.py (100%)
 rename reg.py => scripts/reg.py (100%)
 rename threading_generator.py => scripts/threading_generator.py (100%)
 rename unique_objects_generator.py => scripts/unique_objects_generator.py (100%)

diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat
index 45dd18f..96491e1 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 cdd9ede..66293fd 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 66d2589..fa95fd3 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
similarity index 100%
rename from generator.py
rename to scripts/generator.py
diff --git a/lvl_genvk.py b/scripts/lvl_genvk.py
similarity index 100%
rename from lvl_genvk.py
rename to scripts/lvl_genvk.py
diff --git a/parameter_validation_generator.py b/scripts/parameter_validation_generator.py
similarity index 100%
rename from parameter_validation_generator.py
rename to scripts/parameter_validation_generator.py
diff --git a/reg.py b/scripts/reg.py
similarity index 100%
rename from reg.py
rename to scripts/reg.py
diff --git a/threading_generator.py b/scripts/threading_generator.py
similarity index 100%
rename from threading_generator.py
rename to scripts/threading_generator.py
diff --git a/unique_objects_generator.py b/scripts/unique_objects_generator.py
similarity index 100%
rename from unique_objects_generator.py
rename to scripts/unique_objects_generator.py
-- 
2.7.4