Permalink
Browse files

[Makefile,scripts] No longer call 'hash'

Latest version of the code does not use has table.

Signed-off-by: Christopher Hall <hsw@openmoko.com>
  • Loading branch information...
1 parent f7a4910 commit e5064ef426ab7152861b7b1ea6e35fc3afec8b04 @hxw hxw committed Apr 1, 2010
Showing with 20 additions and 15 deletions.
  1. +19 −14 Makefile
  2. +1 −1 scripts/progress
View
@@ -79,7 +79,7 @@ ALL_TARGETS += forth
ALL_TARGETS += flash
ALL_TARGETS += mahatma
ALL_TARGETS += qt4-simulator
-ALL_TARGETS += hash-gen
+#ALL_TARGETS += hash-gen
ALL_TARGETS += pcf2bmf
ALL_TARGETS += fonts
@@ -263,9 +263,9 @@ console-simulator:
# Hash generator for search index
# ===============================
-.PHONY: hash-gen
-hash-gen:
- cd ${HOST_TOOLS}/hash-gen && ${MAKE}
+#.PHONY: hash-gen
+#hash-gen:
+# cd ${HOST_TOOLS}/hash-gen && ${MAKE}
# Font processing
@@ -377,17 +377,21 @@ combine: validate-destdir
TEMPDIR="${TEMPDIR_PATH}" \
WORKDIR="${WORKDIR_PATH}" DESTDIR="${DESTDIR_PATH}"
-.PHONY: hash
-hash: validate-destdir hash-gen
- cd "${DESTDIR}/${WIKI_LANGUAGE}${WIKI_DIR_SUFFIX}" && ${HOST_TOOLS}/hash-gen/hash-gen \
- --pfx="${DESTDIR_PATH}/${WIKI_LANGUAGE}${WIKI_DIR_SUFFIX}/${WIKI_FILE_PREFIX}.pfx" \
- --fnd="${DESTDIR_PATH}/${WIKI_LANGUAGE}${WIKI_DIR_SUFFIX}/${WIKI_FILE_PREFIX}.fnd" \
- --hsh="${DESTDIR_PATH}/${WIKI_LANGUAGE}${WIKI_DIR_SUFFIX}/${WIKI_FILE_PREFIX}.hsh"
+#.PHONY: hash
+#hash: validate-destdir hash-gen
+# cd "${DESTDIR}/${WIKI_LANGUAGE}${WIKI_DIR_SUFFIX}" && ${HOST_TOOLS}/hash-gen/hash-gen \
+# --pfx="${DESTDIR_PATH}/${WIKI_LANGUAGE}${WIKI_DIR_SUFFIX}/${WIKI_FILE_PREFIX}.pfx" \
+# --fnd="${DESTDIR_PATH}/${WIKI_LANGUAGE}${WIKI_DIR_SUFFIX}/${WIKI_FILE_PREFIX}.fnd" \
+# --hsh="${DESTDIR_PATH}/${WIKI_LANGUAGE}${WIKI_DIR_SUFFIX}/${WIKI_FILE_PREFIX}.hsh"
-# o run all stages (for testing small XML sample files)
-.PHONY: iprch
-iprch: index parse render combine hash
+# run all stages (for testing small XML sample files)
+#.PHONY: iprch
+#iprch: index parse render combine hash
+
+# run all stages (for testing small XML sample files)
+.PHONY: iprc
+iprc: index parse render combine
# Build database using multiple machines
@@ -824,7 +828,8 @@ help:
@echo ' parse - parse XML_FILES into one HTML file in WORKDIR'
@echo ' render - render HTML in WORKDIR into one big data file in DESTDIR'
@echo ' combine - combine temporary indices to one file in DESTDIR'
- @echo ' hash - generate hash file in DESTDIR'
+# @echo ' hash - generate hash file in DESTDIR'
+ @echo ' iprc - same as: index parse render combine'
@echo ' farm<1..N> - parse/render XML_FILES into 3 data files in DESTDIR (use -j3)'
@echo ' farm<1..N>-parse - parse XML_FILES into 3 HTML files in WORKDIR (use -j3)'
@echo ' farm<1..N>-render - render WORKDIR HTML files into 3 data files in DESTDIR (use -j3)'
View
@@ -149,7 +149,7 @@ do
;;
-k|--combine)
- RenderDo --yes --list="${combine_host}" --brief "cd '${base_dir}' && make VERBOSE='${verbose}' WORKDIR='work' DESTDIR='image' WIKI_FILE_PREFIX=wiki WIKI_LANGUAGE='${language}' combine hash"
+ RenderDo --yes --list="${combine_host}" --brief "cd '${base_dir}' && make VERBOSE='${verbose}' WORKDIR='work' DESTDIR='image' WIKI_FILE_PREFIX=wiki WIKI_LANGUAGE='${language}' combine"
shift
;;

0 comments on commit e5064ef

Please sign in to comment.