--- embedaddon/pcre/PrepareRelease	2012/02/21 23:05:51	1.1
+++ embedaddon/pcre/PrepareRelease	2013/07/22 08:25:56	1.1.1.4
@@ -25,7 +25,13 @@
 #             when the HTML documentation is built. It works like this so that
 #             doc/html can be deleted and re-created from scratch.
 
+# README & NON-AUTOTOOLS-BUILD
+#             These files are copied into the doc/html directory, with .txt
+#             extensions so that they can by hyperlinked from the HTML 
+#             documentation, because some people just go to the HTML without
+#             looking for text files.
 
+
 # First, sort out the documentation. Remove pcredemo.3 first because it won't
 # pass the markup check (it is created below, using markup that none of the
 # other pages use).
@@ -58,8 +64,8 @@ pcretest commands.
 End
 
 echo "Making pcre.txt"
-for file in pcre pcrebuild pcrematching pcreapi pcrecallout pcrecompat \
-            pcrepattern pcresyntax pcreunicode pcrejit pcrepartial \
+for file in pcre pcre16 pcre32 pcrebuild pcrematching pcreapi pcrecallout \
+            pcrecompat pcrepattern pcresyntax pcreunicode pcrejit pcrepartial \
             pcreprecompile pcreperform pcreposix pcrecpp pcresample \
             pcrelimits pcrestack ; do
   echo "  Processing $file.3"
@@ -122,6 +128,8 @@ if [ $? != 0 ] ; then exit 1; fi
 echo "Making HTML documentation"
 /bin/rm html/*
 cp index.html.src html/index.html
+cp ../README html/README.txt
+cp ../NON-AUTOTOOLS-BUILD html/NON-AUTOTOOLS-BUILD.txt
 
 for file in *.1 ; do
   base=`basename $file .1`
@@ -159,7 +167,9 @@ if [ "$1" = "doc" ] ; then exit; fi
 # These files are detrailed; do not detrail the test data because there may be
 # significant trailing spaces. Do not detrail RunTest.bat, because it has CRLF
 # line endings and the detrail script removes all trailing white space. The
-# configure files are also omitted from the detrailing.
+# configure files are also omitted from the detrailing. We don't bother with
+# those pcre[16|32]_xx files that just define COMPILE_PCRE16 and then #include the
+# common file, because they aren't going to change.
 
 files="\
   Makefile.am \
@@ -171,6 +181,7 @@ files="\
   AUTHORS \
   NEWS \
   NON-UNIX-USE \
+  NON-AUTOTOOLS-BUILD \
   INSTALL \
   132html \
   CleanTxt \
@@ -181,10 +192,11 @@ files="\
   RunTest \
   pcre-config.in \
   libpcre.pc.in \
+  libpcre16.pc.in \
+  libpcre32.pc.in \
   libpcreposix.pc.in \
   libpcrecpp.pc.in \
   config.h.in \
-  pcre_printint.src \
   pcre_chartables.c.dist \
   pcredemo.c \
   pcregrep.c \
@@ -193,7 +205,8 @@ files="\
   pcreposix.c \
   pcreposix.h \
   pcre.h.in \
-  pcre_internal.h
+  pcre_internal.h \
+  pcre_byte_order.c \
   pcre_compile.c \
   pcre_config.c \
   pcre_dfa_exec.c \
@@ -201,20 +214,25 @@ files="\
   pcre_fullinfo.c \
   pcre_get.c \
   pcre_globals.c \
-  pcre_info.c \
   pcre_jit_compile.c \
   pcre_jit_test.c \
   pcre_maketables.c \
   pcre_newline.c \
   pcre_ord2utf8.c \
+  pcre16_ord2utf16.c \
+  pcre32_ord2utf32.c \
+  pcre_printint.c \
   pcre_refcount.c \
+  pcre_string_utils.c \
   pcre_study.c \
   pcre_tables.c \
-  pcre_try_flipped.c \
-  pcre_ucp_searchfuncs.c \
   pcre_valid_utf8.c \
   pcre_version.c \
   pcre_xclass.c \
+  pcre16_utf16_utils.c \
+  pcre32_utf32_utils.c \
+  pcre16_valid_utf16.c \
+  pcre32_valid_utf32.c \
   pcre_scanner.cc \
   pcre_scanner.h \
   pcre_scanner_unittest.cc \
@@ -227,8 +245,6 @@ files="\
   pcre_stringpiece_unittest.cc \
   perltest.pl \
   ucp.h \
-  ucpinternal.h \
-  ucptable.h \
   makevp.bat \
   pcre.def \
   libpcre.def \
@@ -236,34 +252,6 @@ files="\
 
 echo Detrailing
 perl ./Detrail $files doc/p* doc/html/*
-
-echo Doing basic configure to get default pcre.h and config.h
-# This is in case the caller has set aliases (as I do - PH)
-unset cp ls mv rm
-./configure >/dev/null
-
-echo Converting pcre.h and config.h to generic forms
-cp -f pcre.h pcre.h.generic
-
-perl <<'END'
-  open(IN, "<config.h") || die "Can't open config.h: $!\n";
-  open(OUT, ">config.h.generic") || die "Can't open config.h.generic: $!\n";
-  while (<IN>)
-    {
-    if (/^#define\s(?!PACKAGE)(\w+)/)
-      {
-      print OUT "#ifndef $1\n";
-      print OUT;
-      print OUT "#endif\n";
-      }
-    else
-      {
-      print OUT;
-      }
-    }
-  close IN;
-  close OUT;
-END
 
 echo Done