preset: Move preset-related resources to separate directory.

olachan · Jun 26, 2016 · f11a010 · f11a010
1 parent 61aa2e0
commit f11a010
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 4 deletions.
diff --git a/libhb/preset.c b/libhb/preset.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "builtin_presets.h"
+#include "preset_builtin.h"
 #include "hb.h"
 #include "hb_dict.h"
 #include "plist.h"

diff --git a/libhb/builtin_presets.h → libhb/preset_builtin.h b/libhb/builtin_presets.h → libhb/preset_builtin.h
diff --git a/libhb/preset_builtin.json → preset/preset_builtin.json b/libhb/preset_builtin.json → preset/preset_builtin.json
diff --git a/libhb/libhb_presets.list → preset/preset_builtin.list b/libhb/libhb_presets.list → preset/preset_builtin.list
diff --git a/libhb/preset_template.json → preset/preset_template.json b/libhb/preset_template.json → preset/preset_template.json
diff --git a/scripts/build-presets.sh b/scripts/build-presets.sh
@@ -5,8 +5,9 @@ SELF="${BASH_SOURCE[0]}"
 BASE_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd -P)
 BASE_DIR="${BASE_DIR:-$(pwd)}"
 LIBHB_DIR="${BASE_DIR}/../libhb"
+PRESETS_DIR="${BASE_DIR}/../preset"
 
-if ! cd "${LIBHB_DIR}"; then
+if ! cd "${PRESETS_DIR}"; then
     exit 1
 fi
 
@@ -16,11 +17,11 @@ if [[ "${JSON_TEMP:-}" == "" ]] || [[ "${C_TEMP:-}" == "" ]]; then
     echo "unable to create temporary file" >2
     exit 1
 fi
-"${BASE_DIR}/create_resources.py" libhb_presets.list "${JSON_TEMP}" \
+"${BASE_DIR}/create_resources.py" preset_builtin.list "${JSON_TEMP}" \
 && echo 'const char hb_builtin_presets_json[] =' > "${C_TEMP}" \
 && "${BASE_DIR}/quotestring.py" "${JSON_TEMP}" >> "${C_TEMP}" \
 && echo ';' >> "${C_TEMP}" \
-&& cp "${C_TEMP}" builtin_presets.h
+&& cp "${C_TEMP}" "${LIBHB_DIR}/preset_builtin.h"
 rm "${JSON_TEMP}" "${C_TEMP}"
 
 exit 0