Index: makearchive.sh
===================================================================
RCS file: /repository/timelib/zones/makearchive.sh,v
retrieving revision 1.14
diff -u -r1.14 makearchive.sh
--- makearchive.sh	20 Jul 2008 21:29:25 -0000	1.14
+++ makearchive.sh	3 Sep 2008 12:21:04 -0000
@@ -19,43 +19,16 @@
 cd ..
 echo " "
 
-rm -f timezonedb.idx timezonedb.idx.php timezonedb.dta timezonedb.gz
-touch timezonedb.idx timezonedb.dta
-
-echo "Building index:"
-echo "<?php return array(" >> timezonedb.idx.php
-for i in `find code/data -type f | sort`; do
-	l=`stat -c "%s" timezonedb.dta`
-	j=`echo $i | sed 's/code\/data\///'`
-	php create-entry.php $j >> timezonedb.dta
-	php -r "echo \"\\t{ \". sprintf('%-36s, 0x%06X', '\"$j\"', $l). \" },\\n\";" >> timezonedb.idx
-	php -r "echo \"\\t\". sprintf('%s => 0x%06X', '\"$j\"', $l). \",\\n\";" >> timezonedb.idx.php
-	echo "- $j"
-done
-echo "); ?>" >> timezonedb.idx.php
-echo " "
-echo "Done"
-
-echo "Sorting index:"
-php sort-index.php > timezonedb.idx.tmp
-mv timezonedb.idx.tmp timezonedb.idx
-
 echo "Creating .h file:"
-echo -n "const timelib_tzdb_index_entry timezonedb_idx_builtin[" > ../timezonedb.h
-echo -n `cat timezonedb.idx | wc -l ` >> ../timezonedb.h
-echo "] = {" >> ../timezonedb.h
-cat timezonedb.idx >> ../timezonedb.h
-echo "};" >> ../timezonedb.h
-
-php create_dot_h_file.php >> ../timezonedb.h
-echo >> ../timezonedb.h
-echo -n "const timelib_tzdb timezonedb_builtin = { \"" >> ../timezonedb.h
+php gen.php > ../timezonedb.h
+
+echo -n "static const timelib_tzdb timezonedb_builtin = { \"" >> ../timezonedb.h
 version=`find . -name tzdata*.tar.gz | php -r "preg_match('@([0-9]{4})([a-z])@', file_get_contents('php://stdin'), \\\$a); echo \\\$a[1], '.', ord(\\\$a[2]) - ord('a') + 1;"`
 tzversion=`find . -name tzdata*.tar.gz | sed 's/.*200/200/' | sed 's/\.tar.*//'`
 version="$version$VERSUF"
 echo -n $version >> ../timezonedb.h
 echo -n "\", " >> ../timezonedb.h
-echo -n `cat timezonedb.idx | wc -l ` >> ../timezonedb.h 
+echo -n `find code/data -type f | wc -l` >> ../timezonedb.h 
 echo ", timezonedb_idx_builtin, timelib_timezone_db_data_builtin };" >> ../timezonedb.h
 echo " "
 echo "Done"