Uploaded image for project: 'Data Management'
  1. Data Management
  2. DM-13900

psfex headers are in src

    XMLWordPrintable

    Details

    • Type: Story
    • Status: Done
    • Resolution: Done
    • Fix Version/s: None
    • Component/s: psfex
    • Labels:
      None
    • Team:
      External

      Description

      psfex includes headers in the src directory, and they get installed under the same. However, Docker builds strip the src directory, meaning that the headers are removed. The headers should be put in the include directory to be immune from the stripping.

        Attachments

          Activity

          Ascending order - Click to sort in descending order
          Hide
          Permalink
          price Paul Price added a comment -

          Asking Kian-Tat Lim to review this, as he may have policy questions beyond the mere implementation.

          price@pap-laptop-2:~/LSST/external/psfex (tickets/DM-13900=) $ git sub-patch
          		 
          commit c90c594cee036fd2d58e287d823526b91cb3bd5f (HEAD -> tickets/DM-13900, origin/tickets/DM-13900)
          		 
          Author: Paul Price <price@astro.princeton.edu>
          		 
          Date:   Mon Mar 26 20:26:28 2018 -0400
          		 
           
          		 
              install headers under include dir
          		 
              
              To make them immune from stripping the src directory from the install
          		 
              (as is done in Docker and binary builds).
          		 
           
          		 
          diff --git a/ups/eupspkg.cfg.sh b/ups/eupspkg.cfg.sh
          		 
          index e61dd12..c93b244 100644
          		 
          --- a/ups/eupspkg.cfg.sh
          		 
          +++ b/ups/eupspkg.cfg.sh
          		 
          @@ -28,5 +28,9 @@ install()
          		 
           {
          		 
           	clean_old_install
          		 
           	scons install prefix=$PREFIX version=$VERSION
          		 
          +    # Install headers under 'include' directory
          		 
          +    # in case the user wants to delete 'src'.
          		 
          +    mkdir -p $PREFIX/include
          		 
          +    cp config.h src/*.h $PREFIX/include/
          		 
           }
          		 
           
          diff --git a/ups/psfex.cfg b/ups/psfex.cfg
          		 
          index 993232c..fdf2dd6 100644
          		 
          --- a/ups/psfex.cfg
          		 
          +++ b/ups/psfex.cfg
          		 
          @@ -10,7 +10,7 @@ config = lsst.sconsUtils.Configuration(
          		 
               __file__,
          		 
               headers=[],
          		 
               libs=["psfex"],
          		 
          -    includeFileDirs=["src"],
          		 
          +    includeFileDirs=["include"],
          		 
               hasDoxygenInclude=False, hasDoxygenTag=False,
          		 
               hasSwigFiles=True,
          		 
           )

          Show
          price Paul Price added a comment - Asking Kian-Tat Lim to review this, as he may have policy questions beyond the mere implementation. price@pap-laptop-2:~/LSST/external/psfex (tickets/DM-13900=) $ git sub-patch commit c90c594cee036fd2d58e287d823526b91cb3bd5f (HEAD -> tickets/DM-13900, origin/tickets/DM-13900) Author: Paul Price <price@astro.princeton.edu> Date: Mon Mar 26 20:26:28 2018 -0400   install headers under include dir To make them immune from stripping the src directory from the install (as is done in Docker and binary builds).   diff --git a/ups/eupspkg.cfg.sh b/ups/eupspkg.cfg.sh index e61dd12..c93b244 100644 --- a/ups/eupspkg.cfg.sh +++ b/ups/eupspkg.cfg.sh @@ -28,5 +28,9 @@ install() { clean_old_install scons install prefix=$PREFIX version=$VERSION + # Install headers under 'include' directory + # in case the user wants to delete 'src'. + mkdir -p $PREFIX/include + cp config.h src/*.h $PREFIX/include/ } diff --git a/ups/psfex.cfg b/ups/psfex.cfg index 993232c..fdf2dd6 100644 --- a/ups/psfex.cfg +++ b/ups/psfex.cfg @@ -10,7 +10,7 @@ config = lsst.sconsUtils.Configuration( __file__, headers=[], libs=["psfex"], - includeFileDirs=["src"], + includeFileDirs=["include"], hasDoxygenInclude=False, hasDoxygenTag=False, hasSwigFiles=True, )
          Hide
          Permalink
          price Paul Price added a comment -

          After a bit more extensive addition to the install step, Jenkins is green.

          Show
          price Paul Price added a comment - After a bit more extensive addition to the install step, Jenkins is green.
          Hide
          Permalink
          ktl Kian-Tat Lim added a comment -

          LGTM.

          Show
          ktl Kian-Tat Lim added a comment - LGTM.
          Hide
          Permalink
          price Paul Price added a comment -

          Thanks KT.

          Merged to master.

          Show
          price Paul Price added a comment - Thanks KT. Merged to master.

            People

            Assignee:
            price Paul Price
            Reporter:
            price Paul Price
            Reviewers:
            Kian-Tat Lim
            Watchers:
            Kian-Tat Lim, Paul Price
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Dates

              Created:
              Updated:
              Resolved:

                Jenkins

                No builds found.