[postgis-tickets] [PostGIS] #3482: Change distfile creation to based on a checkout, without writing the repo

PostGIS trac at osgeo.org
Wed Mar 2 06:10:53 PST 2016


#3482: Change distfile creation to based on a checkout, without writing the repo
--------------------------+---------------------------
  Reporter:  gdt          |      Owner:  strk
      Type:  enhancement  |     Status:  new
  Priority:  high         |  Milestone:  PostGIS 2.2.2
 Component:  postgis      |    Version:  2.2.x
Resolution:               |   Keywords:
--------------------------+---------------------------

Comment (by gdt):

 The other issue is hardcoded make, which is sort of the same thing of not
 carrying over user environment adapations from the build.
 The following patch makes it easier to work around this, while not really
 changing anything.  With it and the ticket:3488 patch, I have built a
 distfile.

 This is really just:

   - using CONFIGURE_ARGS with configure

   - changing make to ${MAKE}, and defaulting to make if unset

 {{{
 Index: make_dist.sh
 ===================================================================
 --- make_dist.sh        (revision 14733)
 +++ make_dist.sh        (working copy)
 @@ -20,6 +20,15 @@
  version=dev
  git=no

 +# Define in environment if necessary to get postgis to configure,
 +# which is only done to build comments.
 +#CONFIGURE_ARGS=
 +
 +# Define in environment if Gnu make is not make (e.g., gmake).
 +if [ "$MAKE" = "" ]; then
 +    MAKE=make
 +fi
 +
  [ -d ".git" ] && git=yes
  [ "$git" = "yes" ] && tag=svn-$tag

 @@ -66,7 +75,7 @@
  owd="$PWD"
  cd "$outdir"
  ./autogen.sh
 -./configure
 +./configure ${CONFIGURE_ARGS}
  # generating postgis_svn_revision.h for >= 2.0.0 tags
  if test -f utils/svn_repo_revision.pl; then
         echo "Generating postgis_svn_revision.h"
 @@ -79,11 +88,11 @@
  echo "Generating documentation"
  owd="$PWD"
  cd "$outdir"/doc
 -make comments
 +${MAKE} comments
  if [ $? -gt 0 ]; then
         exit 1
  fi
 -make clean # won't drop the comment files
 +${MAKE} clean # won't drop the comment files
  cd "$owd"

  # Run make distclean
 @@ -90,7 +99,7 @@
  echo "Running make distclean"
  owd="$PWD"
  cd "$outdir"
 -make distclean
 +${MAKE} distclean
  if [ "$git" = "yes" ]; then
    echo "Removing .git dir"
    rm -rf .git
 }}}

--
Ticket URL: <https://trac.osgeo.org/postgis/ticket/3482#comment:13>
PostGIS <http://trac.osgeo.org/postgis/>
The PostGIS Trac is used for bug, enhancement & task tracking, a user and developer wiki, and a view into the subversion code repository of PostGIS project.


More information about the postgis-tickets mailing list