IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38050


Ignore:
Timestamp:
Mar 28, 2015, 8:25:58 PM (11 years ago)
Author:
eugene
Message:

merge changes from trunk

Location:
branches/eam_branches/ipp-20150112
Files:
29 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20150112/magic/censorObjects/src

    • Property svn:ignore

      •  

        old new  
        99censorObjects
        1010censorErrorCodes.h
         11censorVersionDefinitions.h.tmp

  • branches/eam_branches/ipp-20150112/magic/censorObjects/src/Makefile.am

    r24695 r38050  
    1 if HAVE_SVNVERSION
    2 CENSOR_VERSION=`$(SVNVERSION) ..`
    3 else
    4 CENSOR_VERSION="UNKNOWN"
    5 endif
    6 
    7 if HAVE_SVN
    8 CENSOR_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
    9 CENSOR_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    10 else
    11 CENSOR_BRANCH="UNKNOWN"
    12 CENSOR_SOURCE="UNKNOWN"
    13 endif
    141
    152# Force recompilation of censorVersion.c, since it gets the version information
    163censorVersion.c: censorVersionDefinitions.h
    174censorVersionDefinitions.h: censorVersionDefinitions.h.in FORCE
    18         -$(RM) censorVersionDefinitions.h
    19         $(SED) -e "s|@CENSOR_VERSION@|\"$(CENSOR_VERSION)\"|" -e "s|@CENSOR_BRANCH@|\"$(CENSOR_BRANCH)\"|" -e "s|@CENSOR_SOURCE@|\"$(CENSOR_SOURCE)\"|" censorVersionDefinitions.h.in > censorVersionDefinitions.h
     5        pslib-setsvnversion.pl CENSOR censorVersionDefinitions.h.in censorVersionDefinitions.h
    206FORCE: ;
    217

  • branches/eam_branches/ipp-20150112/magic/remove/src

    • Property svn:ignore

      •  

        old new  
        1111config.h.in
        1212stamp-h1
         13streaksVersionDefinitions.h.tmp

  • branches/eam_branches/ipp-20150112/magic/remove/src/Makefile.am

    r34089 r38050  
    1 if HAVE_SVNVERSION
    2 STREAKS_VERSION=`$(SVNVERSION) ..`
    3 else
    4 STREAKS_VERSION="UNKNOWN"
    5 endif
    6 
    7 if HAVE_SVN
    8 STREAKS_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
    9 STREAKS_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    10 else
    11 STREAKS_BRANCH="UNKNOWN"
    12 STREAKS_SOURCE="UNKNOWN"
    13 endif
    141
    152# Force recompilation of streaksVersion.c, since it gets the version information
    163streaksVersion.c: streaksVersionDefinitions.h
    174streaksVersionDefinitions.h: streaksVersionDefinitions.h.in FORCE
    18         -$(RM) streaksVersionDefinitions.h
    19         $(SED) -e "s|@STREAKS_VERSION@|\"$(STREAKS_VERSION)\"|" -e "s|@STREAKS_BRANCH@|\"$(STREAKS_BRANCH)\"|" -e "s|@STREAKS_SOURCE@|\"$(STREAKS_SOURCE)\"|" streaksVersionDefinitions.h.in > streaksVersionDefinitions.h
     5        pslib-setsvnversion.pl STREAKS streaksVersionDefinitions.h.in streaksVersionDefinitions.h
    206FORCE: ;
    217

  • branches/eam_branches/ipp-20150112/ppArith/src

    • Property svn:ignore

      •  

        old new  
        88ppArith
        99ppArithVersionDefinitions.h
         10ppArithVersionDefinitions.h.tmp

  • branches/eam_branches/ipp-20150112/ppArith/src/Makefile.am

    r23980 r38050  
    11bin_PROGRAMS = ppArith
    2 
    3 if HAVE_SVNVERSION
    4 PPARITH_VERSION=`$(SVNVERSION) ..`
    5 else
    6 PPARITH_VERSION="UNKNOWN"
    7 endif
    8 
    9 if HAVE_SVN
    10 PPARITH_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
    11 PPARITH_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    12 else
    13 PPARITH_BRANCH="UNKNOWN"
    14 PPARITH_SOURCE="UNKNOWN"
    15 endif
    162
    173# Force recompilation of ppArithVersion.c, since it gets the version information
    184ppArithVersion.c: ppArithVersionDefinitions.h
    195ppArithVersionDefinitions.h: ppArithVersionDefinitions.h.in FORCE
    20         -$(RM) ppArithVersionDefinitions.h
    21         $(SED) -e "s|@PPARITH_VERSION@|\"$(PPARITH_VERSION)\"|" -e "s|@PPARITH_BRANCH@|\"$(PPARITH_BRANCH)\"|" -e "s|@PPARITH_SOURCE@|\"$(PPARITH_SOURCE)\"|" ppArithVersionDefinitions.h.in > ppArithVersionDefinitions.h
     6        pslib-setsvnversion.pl PPARITH ppArithVersionDefinitions.h.in ppArithVersionDefinitions.h
    227FORCE: ;
    238

  • branches/eam_branches/ipp-20150112/ppBackground/src

    • Property svn:ignore

      •  

        old new  
        1010stamp-h1
        1111config.h.in
        12 
         12ppBackgroundVersionDefinitions.h.tmp

  • branches/eam_branches/ipp-20150112/ppBackground/src/Makefile.am

    r36580 r38050  
    11bin_PROGRAMS = ppBackground ppBackgroundStack
    2 
    3 if HAVE_SVNVERSION
    4 PPBACKGROUND_VERSION=`$(SVNVERSION) ..`
    5 else
    6 PPBACKGROUND_VERSION="UNKNOWN"
    7 endif
    8 
    9 if HAVE_SVN
    10 PPBACKGROUND_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
    11 PPBACKGROUND_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    12 else
    13 PPBACKGROUND_BRANCH="UNKNOWN"
    14 PPBACKGROUND_SOURCE="UNKNOWN"
    15 endif
    162
    173# Force recompilation of ppBackgroundVersion.c, since it gets the version information
    184ppBackgroundVersion.c: ppBackgroundVersionDefinitions.h
    195ppBackgroundVersionDefinitions.h: ppBackgroundVersionDefinitions.h.in FORCE
    20         -$(RM) ppBackgroundVersionDefinitions.h
    21         $(SED) -e "s|@PPBACKGROUND_VERSION@|\"$(PPBACKGROUND_VERSION)\"|" -e "s|@PPBACKGROUND_BRANCH@|\"$(PPBACKGROUND_BRANCH)\"|" -e "s|@PPBACKGROUND_SOURCE@|\"$(PPBACKGROUND_SOURCE)\"|" ppBackgroundVersionDefinitions.h.in > ppBackgroundVersionDefinitions.h
     6        pslib-setsvnversion.pl PPBACKGROUND ppBackgroundVersionDefinitions.h.in ppBackgroundVersionDefinitions.h
    227FORCE: ;
    238

  • branches/eam_branches/ipp-20150112/ppImage/src

    • Property svn:ignore

      •  

        old new  
        1010.libs
        1111ppImageVersionDefinitions.h
         12ppImageVersionDefinitions.h.tmp

  • branches/eam_branches/ipp-20150112/ppImage/src/Makefile.am

    r35685 r38050  
    44        ppImage.h
    55
    6 if HAVE_SVNVERSION
    7 PPIMAGE_VERSION=`$(SVNVERSION) ..`
    8 else
    9 PPIMAGE_VERSION="UNKNOWN"
    10 endif
    11 
    12 if HAVE_SVN
    13 PPIMAGE_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
    14 PPIMAGE_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    15 else
    16 PPIMAGE_BRANCH="UNKNOWN"
    17 PPIMAGE_SOURCE="UNKNOWN"
    18 endif
    19 
    206# Force recompilation of ppImageVersion.c, since it gets the version information
    217ppImageVersion.c: ppImageVersionDefinitions.h
    228ppImageVersionDefinitions.h: ppImageVersionDefinitions.h.in FORCE
    23         -$(RM) ppImageVersionDefinitions.h
    24         $(SED) -e "s|@PPIMAGE_VERSION@|\"$(PPIMAGE_VERSION)\"|" -e "s|@PPIMAGE_BRANCH@|\"$(PPIMAGE_BRANCH)\"|" -e "s|@PPIMAGE_SOURCE@|\"$(PPIMAGE_SOURCE)\"|" ppImageVersionDefinitions.h.in > ppImageVersionDefinitions.h
     9        pslib-setsvnversion.pl PPIMAGE ppImageVersionDefinitions.h.in ppImageVersionDefinitions.h
    2510FORCE: ;
    2611

  • branches/eam_branches/ipp-20150112/ppMerge/src

    • Property svn:ignore

      •  

        old new  
        88.libs
        99ppMergeVersionDefinitions.h
         10ppMergeVersionDefinitions.h.tmp

  • branches/eam_branches/ipp-20150112/ppMerge/src/Makefile.am

    r23808 r38050  
    11bin_PROGRAMS = ppMerge
    2 
    3 if HAVE_SVNVERSION
    4 PPMERGE_VERSION=`$(SVNVERSION) ..`
    5 else
    6 PPMERGE_VERSION="UNKNOWN"
    7 endif
    8 
    9 if HAVE_SVN
    10 PPMERGE_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
    11 PPMERGE_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    12 else
    13 PPMERGE_BRANCH="UNKNOWN"
    14 PPMERGE_SOURCE="UNKNOWN"
    15 endif
    162
    173# Force recompilation of ppMergeVersion.c, since it gets the version information
    184ppMergeVersion.c: ppMergeVersionDefinitions.h
    195ppMergeVersionDefinitions.h: ppMergeVersionDefinitions.h.in FORCE
    20         -$(RM) ppMergeVersionDefinitions.h
    21         $(SED) -e "s|@PPMERGE_VERSION@|\"$(PPMERGE_VERSION)\"|" -e "s|@PPMERGE_BRANCH@|\"$(PPMERGE_BRANCH)\"|" -e "s|@PPMERGE_SOURCE@|\"$(PPMERGE_SOURCE)\"|" ppMergeVersionDefinitions.h.in > ppMergeVersionDefinitions.h
     6        pslib-setsvnversion.pl PPMERGE ppMergeVersionDefinitions.h.in ppMergeVersionDefinitions.h
    227FORCE: ;
    23 
    248
    259ppMerge_CFLAGS = $(PPMERGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)

  • branches/eam_branches/ipp-20150112/ppNoiseMap/src

    • Property svn:ignore

      •  

        old new  
        77Makefile
        88ppNoiseMapVersionDefinitions.h
         9ppNoiseMapVersionDefinitions.h.tmp

  • branches/eam_branches/ipp-20150112/ppNoiseMap/src/Makefile.am

    r24470 r38050  
    44        ppNoiseMap.h
    55
    6 if HAVE_SVNVERSION
    7 PPNOISEMAP_VERSION=`$(SVNVERSION) ..`
    8 else
    9 PPNOISEMAP_VERSION="UNKNOWN"
    10 endif
    11 
    12 if HAVE_SVN
    13 PPIMAGE_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
    14 PPIMAGE_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    15 else
    16 PPIMAGE_BRANCH="UNKNOWN"
    17 PPIMAGE_SOURCE="UNKNOWN"
    18 endif
    19 
    206# Force recompilation of ppNoiseMapVersion.c, since it gets the version information
    217ppNoiseMapVersion.c: ppNoiseMapVersionDefinitions.h
    228ppNoiseMapVersionDefinitions.h: ppNoiseMapVersionDefinitions.h.in FORCE
    23         -$(RM) ppNoiseMapVersionDefinitions.h
    24         $(SED) -e "s|@PPNOISEMAP_VERSION@|\"$(PPNOISEMAP_VERSION)\"|" -e "s|@PPNOISEMAP_BRANCH@|\"$(PPNOISEMAP_BRANCH)\"|" -e "s|@PPNOISEMAP_SOURCE@|\"$(PPNOISEMAP_SOURCE)\"|" ppNoiseMapVersionDefinitions.h.in > ppNoiseMapVersionDefinitions.h
     9        pslib-setsvnversion.pl PPNOISEMAP ppNoiseMapVersionDefinitions.h.in ppNoiseMapVersionDefinitions.h
    2510FORCE: ;
    2611

  • branches/eam_branches/ipp-20150112/ppSkycell/src

    • Property svn:ignore

      •  

        old new  
        88.deps
        99Makefile
         10ppSkycellVersionDefinitions.h.tmp

  • branches/eam_branches/ipp-20150112/ppSkycell/src/Makefile.am

    r23992 r38050  
    11bin_PROGRAMS = ppSkycell
    2 
    3 if HAVE_SVNVERSION
    4 PPSKYCELL_VERSION=`$(SVNVERSION) ..`
    5 else
    6 PPSKYCELL_VERSION="UNKNOWN"
    7 endif
    8 
    9 if HAVE_SVN
    10 PPSKYCELL_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
    11 PPSKYCELL_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    12 else
    13 PPSKYCELL_BRANCH="UNKNOWN"
    14 PPSKYCELL_SOURCE="UNKNOWN"
    15 endif
    162
    173# Force recompilation of ppSkycellVersion.c, since it gets the version information
    184ppSkycellVersion.c: ppSkycellVersionDefinitions.h
    195ppSkycellVersionDefinitions.h: ppSkycellVersionDefinitions.h.in FORCE
    20         -$(RM) ppSkycellVersionDefinitions.h
    21         $(SED) -e "s|@PPSKYCELL_VERSION@|\"$(PPSKYCELL_VERSION)\"|" -e "s|@PPSKYCELL_BRANCH@|\"$(PPSKYCELL_BRANCH)\"|" -e "s|@PPSKYCELL_SOURCE@|\"$(PPSKYCELL_SOURCE)\"|" ppSkycellVersionDefinitions.h.in > ppSkycellVersionDefinitions.h
     6        pslib-setsvnversion.pl PPSKYCELL ppSkycellVersionDefinitions.h.in ppSkycellVersionDefinitions.h
    227FORCE: ;
    238

  • branches/eam_branches/ipp-20150112/ppSmooth/src/Makefile.am

    r25976 r38050  
    33noinst_HEADERS = ppSmooth.h
    44
    5 if HAVE_SVNVERSION
    6 PPSMOOTH_VERSION=`$(SVNVERSION) ..`
    7 else
    8 PPSMOOTH_VERSION="UNKNOWN"
    9 endif
    10 
    11 if HAVE_SVN
    12 PPSMOOTH_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
    13 PPSMOOTH_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    14 else
    15 PPSMOOTH_BRANCH="UNKNOWN"
    16 PPSMOOTH_SOURCE="UNKNOWN"
    17 endif
    18 
    195# Force recompilation of ppSmoothVersion.c, since it gets the version information
    206ppSmoothVersion.c: ppSmoothVersionDefinitions.h
    217ppSmoothVersionDefinitions.h: ppSmoothVersionDefinitions.h.in FORCE
    22         -$(RM) ppSmoothVersionDefinitions.h
    23         $(SED) -e "s|@PPSMOOTH_VERSION@|\"$(PPSMOOTH_VERSION)\"|" -e "s|@PPSMOOTH_BRANCH@|\"$(PPSMOOTH_BRANCH)\"|" -e "s|@PPSMOOTH_SOURCE@|\"$(PPSMOOTH_SOURCE)\"|" ppSmoothVersionDefinitions.h.in > ppSmoothVersionDefinitions.h
     8        pslib-setsvnversion.pl PPSMOOTH ppSmoothVersionDefinitions.h.in ppSmoothVersionDefinitions.h
    249FORCE: ;
    2510

  • branches/eam_branches/ipp-20150112/ppStats/src

    • Property svn:ignore

      •  

        old new  
        1111stamp-h1
        1212ppStatsVersionDefinitions.h
         13ppStatsVersionDefinitions.h.tmp

  • branches/eam_branches/ipp-20150112/ppStats/src/Makefile.am

    r23808 r38050  
    11lib_LTLIBRARIES = libppStats.la
    2 
    3 if HAVE_SVNVERSION
    4 PPSTATS_VERSION=`$(SVNVERSION) ..`
    5 else
    6 PPSTATS_VERSION="UNKNOWN"
    7 endif
    8 
    9 if HAVE_SVN
    10 PPSTATS_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
    11 PPSTATS_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    12 else
    13 PPSTATS_BRANCH="UNKNOWN"
    14 PPSTATS_SOURCE="UNKNOWN"
    15 endif
    162
    173# Force recompilation of ppStatsVersion.c, since it gets the version information
    184ppStatsVersion.c: ppStatsVersionDefinitions.h
    195ppStatsVersionDefinitions.h: ppStatsVersionDefinitions.h.in FORCE
    20         -$(RM) ppStatsVersionDefinitions.h
    21         $(SED) -e "s|@PPSTATS_VERSION@|\"$(PPSTATS_VERSION)\"|" -e "s|@PPSTATS_BRANCH@|\"$(PPSTATS_BRANCH)\"|" -e "s|@PPSTATS_SOURCE@|\"$(PPSTATS_SOURCE)\"|" ppStatsVersionDefinitions.h.in > ppStatsVersionDefinitions.h
     6        pslib-setsvnversion.pl PPSTATS ppStatsVersionDefinitions.h.in ppStatsVersionDefinitions.h
    227FORCE: ;
    238

  • branches/eam_branches/ipp-20150112/ppTranslate/src

    • Property svn:ignore

      •  

        old new  
        88ppMops
        99ppMonet
         10ppTranslateVersionDefinitions.h.tmp

  • branches/eam_branches/ipp-20150112/ppTranslate/src/Makefile.am

    r29565 r38050  
    11bin_PROGRAMS = ppMops ppMonet
    2 
    3 if HAVE_SVNVERSION
    4 PPTRANSLATE_VERSION=`$(SVNVERSION) ..`
    5 else
    6 PPTRANSLATE_VERSION="UNKNOWN"
    7 endif
    8 
    9 if HAVE_SVN
    10 PPTRANSLATE_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
    11 PPTRANSLATE_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    12 else
    13 PPTRANSLATE_BRANCH="UNKNOWN"
    14 PPTRANSLATE_SOURCE="UNKNOWN"
    15 endif
    162
    173# Force recompilation of ppMopsVersion.c, since it gets the version information
    184ppTranslateVersion.c: ppTranslateVersionDefinitions.h
    195ppTranslateVersionDefinitions.h: ppTranslateVersionDefinitions.h.in FORCE
    20         -$(RM) ppTranslateVersionDefinitions.h
    21         $(SED) -e "s|@PPTRANSLATE_VERSION@|\"$(PPTRANSLATE_VERSION)\"|" -e "s|@PPTRANSLATE_BRANCH@|\"$(PPTRANSLATE_BRANCH)\"|" -e "s|@PPTRANSLATE_SOURCE@|\"$(PPTRANSLATE_SOURCE)\"|" ppTranslateVersionDefinitions.h.in > ppTranslateVersionDefinitions.h
     6        pslib-setsvnversion.pl PPTRANSLATE ppTranslateVersionDefinitions.h.in ppTranslateVersionDefinitions.h
    227FORCE: ;
    238

  • branches/eam_branches/ipp-20150112/psLib/Makefile.am

    r11493 r38050  
    11SUBDIRS = m4 $(SUBDIR)
    22
    3 bin_SCRIPTS = pslib-config 
     3bin_SCRIPTS = pslib-config
    44pkgconfigdir = $(libdir)/pkgconfig
    55pkgconfig_DATA= pslib.pc

  • branches/eam_branches/ipp-20150112/psLib/etc/Makefile.am

    r10577 r38050  
    11BUILT_SOURCES = pslib.config
    22EXTRA_DIST = pslib.config.template
     3
     4bin_SCRIPTS = pslib-setsvnversion.pl
    35
    46# this is done instead of using autoconf to delay the expansion of datadir

  • branches/eam_branches/ipp-20150112/psLib/pslib.pc.in

    r10528 r38050  
    77Description: Pan-STARRS Library
    88Version: @VERSION@
    9 Libs: -L${libdir} -lpslib
     9Libs: -L${libdir} -lpslib -lm
    1010Libs.private: @PSLIB_LIBS@
    1111Cflags: -I${includedir} @PSLIB_CFLAGS@

  • branches/eam_branches/ipp-20150112/psLib/src/math/psMinimizePolyFit.c

  • branches/eam_branches/ipp-20150112/psLib/src/sys

    • Property svn:ignore

      •  

        old new  
        1212*.da
        1313psVersionDefinitions.h
         14psVersionDefinitions.h.tmp

  • branches/eam_branches/ipp-20150112/psLib/src/sys/Makefile.am

    r23807 r38050  
    33noinst_LTLIBRARIES = libpslibsys.la
    44
    5 if HAVE_SVNVERSION
    6 PSLIB_VERSION=`$(SVNVERSION) ../..`
    7 else
    8 PSLIB_VERSION="UNKNOWN"
    9 endif
    10 
    11 if HAVE_SVN
    12 PSLIB_BRANCH=`$(SVN) info ../.. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
    13 PSLIB_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    14 else
    15 PSLIB_BRANCH="UNKNOWN"
    16 PSLIB_SOURCE="UNKNOWN"
    17 endif
    18 
    195# Force recompilation of psConfigure.c, since it gets the version information
    206psConfigure.c: psVersionDefinitions.h
    217psVersionDefinitions.h: psVersionDefinitions.h.in FORCE
    22         -$(RM) psVersionDefinitions.h
    23         $(SED) -e "s|@PSLIB_VERSION@|\"$(PSLIB_VERSION)\"|" -e "s|@PSLIB_BRANCH@|\"$(PSLIB_BRANCH)\"|" -e "s|@PSLIB_SOURCE@|\"$(PSLIB_SOURCE)\"|" psVersionDefinitions.h.in > psVersionDefinitions.h
     8        ../../etc/pslib-setsvnversion.pl PSLIB psVersionDefinitions.h.in psVersionDefinitions.h
    249FORCE: ;
    2510

  • branches/eam_branches/ipp-20150112/pswarp/src

    • Property svn:ignore

      •  

        old new  
        1414stamp-h1
        1515pswarpVersionDefinitions.h
         16pswarpVersionDefinitions.h.tmp

  • branches/eam_branches/ipp-20150112/pswarp/src/Makefile.am

    r35563 r38050  
    11bin_PROGRAMS = pswarp
    2 
    3 if HAVE_SVNVERSION
    4 PSWARP_VERSION=`$(SVNVERSION) ..`
    5 else
    6 PSWARP_VERSION="UNKNOWN"
    7 endif
    8 
    9 if HAVE_SVN
    10 PSWARP_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
    11 PSWARP_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    12 else
    13 PSWARP_BRANCH="UNKNOWN"
    14 PSWARP_SOURCE="UNKNOWN"
    15 endif
    162
    173# Force recompilation of pswarpVersion.c, since it gets the version information
    184pswarpVersion.c: pswarpVersionDefinitions.h
    195pswarpVersionDefinitions.h: pswarpVersionDefinitions.h.in FORCE
    20         -$(RM) pswarpVersionDefinitions.h
    21         $(SED) -e "s|@PSWARP_VERSION@|\"$(PSWARP_VERSION)\"|" -e "s|@PSWARP_BRANCH@|\"$(PSWARP_BRANCH)\"|" -e "s|@PSWARP_SOURCE@|\"$(PSWARP_SOURCE)\"|" pswarpVersionDefinitions.h.in > pswarpVersionDefinitions.h
     6        pslib-setsvnversion.pl PSWARP pswarpVersionDefinitions.h.in pswarpVersionDefinitions.h
    227FORCE: ;
    238
Note: See TracChangeset for help on using the changeset viewer.