#945, clean up build artefacts and upgrade script

git-svn-id: http://svn.osgeo.org/postgis/trunk@11289 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index bcfc992da3dac4295813ff472908ca95d35d6365..88f80668e73edc39eedd11f2a6bfecbd07f326bb 100644 (file)
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -76,7 +76,12 @@ PG_CPPFLAGS += @CPPFLAGS@ -I../liblwgeom -I../libpgcommon
 SHLIB_LINK_F = ../libpgcommon/libpgcommon.a ../liblwgeom/.libs/liblwgeom.a @SHLIB_LINK@ 
 
 # Extra files to remove during 'make clean'
-EXTRA_CLEAN=$(SQL_OBJS) legacy_uninstall.sql
+EXTRA_CLEAN=$(SQL_OBJS) \
+       uninstall_postgis.sql \
+       uninstall_legacy.sql \
+       postgis_upgrade_20_21.sql.in \
+       postgis_upgrade_20_21.sql \
+       postgis_upgrade_21_minor.sql 
 
 # PGXS information
 PG_CONFIG = @PGCONFIG@ 

diff --git a/postgis/gserialized_estimate.c b/postgis/gserialized_estimate.c
index 9dc5b62d01e234a860d07ac1605e33022eaeae86..6b57cebb73ca4ee2ce52bd5923f35b3bb2aca116 100644 (file)
--- a/postgis/gserialized_estimate.c
+++ b/postgis/gserialized_estimate.c
@@ -437,29 +437,28 @@ nd_stats_to_json(const ND_STATS *nd_stats)
 * Caller is responsible for freeing.
 * Currently only prints first two dimensions.
 */
-static char* 
-nd_stats_to_grid(const ND_STATS *stats)
-{
-       char *rv;
-       int j, k;
-//     int ndims = (int)roundf(stats->ndims);
-       int sizex = (int)roundf(stats->size[0]);
-       int sizey = (int)roundf(stats->size[1]);
-       stringbuffer_t *sb = stringbuffer_create();
-
-       for ( k = 0; k < sizey; k++ )
-       {
-               for ( j = 0; j < sizex; j++ )
-               {
-                       stringbuffer_aprintf(sb, "%3d ", (int)roundf(stats->value[j + k*sizex]));
-               }
-               stringbuffer_append(sb,  "\n");
-       }
-               
-       rv = stringbuffer_getstringcopy(sb);
-       stringbuffer_destroy(sb);
-       return rv;
-}
+// static char* 
+// nd_stats_to_grid(const ND_STATS *stats)
+// {
+//  char *rv;
+//  int j, k;
+//  int sizex = (int)roundf(stats->size[0]);
+//  int sizey = (int)roundf(stats->size[1]);
+//  stringbuffer_t *sb = stringbuffer_create();
+// 
+//  for ( k = 0; k < sizey; k++ )
+//  {
+//      for ( j = 0; j < sizex; j++ )
+//      {
+//          stringbuffer_aprintf(sb, "%3d ", (int)roundf(stats->value[j + k*sizex]));
+//      }
+//      stringbuffer_append(sb,  "\n");
+//  }
+//      
+//  rv = stringbuffer_getstringcopy(sb);
+//  stringbuffer_destroy(sb);
+//  return rv;
+// }
 
 
 /** Expand the bounds of target to include source */
@@ -2196,20 +2195,20 @@ Datum geometry_estimated_extent(PG_FUNCTION_ARGS)
 {
        if ( PG_NARGS() == 3 )
        {
+           PG_RETURN_DATUM(
            DirectFunctionCall3(gserialized_estimated_extent, 
            PG_GETARG_DATUM(0), 
            PG_GETARG_DATUM(1), 
-        PG_GETARG_DATUM(2));
+        PG_GETARG_DATUM(2)));
        }
        else if ( PG_NARGS() == 2 )
        {
+           PG_RETURN_DATUM(
            DirectFunctionCall2(gserialized_estimated_extent, 
            PG_GETARG_DATUM(0), 
-           PG_GETARG_DATUM(1));
-       }
-       else
-       {
-               elog(ERROR, "geometry_estimated_extent() called with wrong number of arguments");
-               PG_RETURN_NULL();
+           PG_GETARG_DATUM(1)));
        }
+
+       elog(ERROR, "geometry_estimated_extent() called with wrong number of arguments");
+       PG_RETURN_NULL();
 }

diff --git a/postgis/postgis_drop_after.sql b/postgis/postgis_drop_after.sql
index 56e01da9948060f2bc122c0df5fe80624da0586b..2f7a0fd7b4e1f380f283b5de311443b3b4f51fb8 100644 (file)
--- a/postgis/postgis_drop_after.sql
+++ b/postgis/postgis_drop_after.sql
@@ -135,5 +135,10 @@ DROP FUNCTION IF EXISTS st_geometry_eq(geometry, geometry);
 DROP FUNCTION IF EXISTS st_geometry_cmp(geometry, geometry);
 DROP FUNCTION IF EXISTS SnapToGrid(geometry, float8, float8);
 
+DROP FUNCTION IF EXISTS geometry_gist_sel_2d (internal, oid, internal, int4);
+DROP FUNCTION IF EXISTS geometry_gist_joinsel_2d(internal, oid, internal, smallint);
+DROP FUNCTION IF EXISTS geography_gist_selectivity (internal, oid, internal, int4);
+DROP FUNCTION IF EXISTS geography_gist_join_selectivity(internal, oid, internal, smallint);
+
 DROP FUNCTION IF EXISTS ST_AsBinary(text); -- deprecated in 2.0
 DROP FUNCTION IF EXISTS postgis_uses_stats(); -- deprecated in 2.0