IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 23202


Ignore:
Timestamp:
Mar 6, 2009, 10:26:32 AM (17 years ago)
Author:
eugene
Message:

passing version info from env vars defined by psbuild

Location:
branches/eam_branches/eam_branch_20090303
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/eam_branch_20090303/ppArith/src/Makefile.am

    r23124 r23202  
    11bin_PROGRAMS = ppArith
    22
    3 PPARITH_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
    4 PPARITH_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
    5 PPARITH_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     3# PPARITH_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
     4# PPARITH_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
     5# PPARITH_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     6#
     7# # Force recompilation of ppArithVersion.c, since it gets the version information
     8# ppArithVersion.c: FORCE
     9#       touch ppArith.c
     10# FORCE: ;
    611
    7 # Force recompilation of ppArithVersion.c, since it gets the version information
    8 ppArithVersion.c: FORCE
    9         touch ppArith.c
    10 FORCE: ;
    11 
    12 ppArith_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPARITH_CFLAGS) -DPPARITH_VERSION=\"$(PPARITH_VERSION)\" -DPPARITH_BRANCH=\"$(PPARITH_BRANCH)\" -DPPARITH_SOURCE=\"$(PPARITH_SOURCE)\"
     12ppArith_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPARITH_CFLAGS) -DPPARITH_VERSION=$(SVN_VERSION) -DPPARITH_BRANCH=$(SVN_BRANCH) -DPPARITH_SOURCE=$(SVN_SOURCE)
    1313ppArith_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PSPHOT_LIBS)   $(PPARITH_LIBS)
    1414

  • branches/eam_branches/eam_branch_20090303/ppArith/src/ppArithVersion.c

    r23124 r23202  
    2222#include "ppArith.h"
    2323
    24 psString ppArithVersion(void)
    25 {
    2624#ifndef PPARITH_VERSION
    2725#error "PPARITH_VERSION is not set"
    … …  
    3028#error "PPARITH_BRANCH is not set"
    3129#endif
    32     return psStringCopy(PPARITH_BRANCH "@" PPARITH_VERSION);
     30#ifndef PPARITH_SOURCE
     31#error "PPARITH_SOURCE is not set"
     32#endif
     33
     34#define xstr(s) str(s)
     35#define str(s) #s
     36
     37psString ppArithVersion(void)
     38{
     39    char *value = NULL;
     40    psStringAppend(&value, "%s@%s", xstr(PPARITH_BRANCH), xstr(PPARITH_VERSION));
     41    return value;
    3342}
    3443
    3544psString ppArithSource(void)
    3645{
    37 #ifndef PPARITH_SOURCE
    38 #error "PPARITH_SOURCE is not set"
    39 #endif
    40     return psStringCopy(PPARITH_SOURCE);
     46    return psStringCopy(xstr(PPARITH_SOURCE));
    4147}
    4248

  • branches/eam_branches/eam_branch_20090303/ppMerge/src/Makefile.am

    r23126 r23202  
    11bin_PROGRAMS = ppMerge
    22
    3 PPMERGE_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
    4 PPMERGE_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
    5 PPMERGE_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     3# PPMERGE_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
     4# PPMERGE_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
     5# PPMERGE_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     6#
     7# # Force recompilation of ppMergeVersion.c, since it gets the version information
     8# ppMergeVersion.c: FORCE
     9#       touch ppMergeVersion.c
     10# FORCE: ;
    611
    7 # Force recompilation of ppMergeVersion.c, since it gets the version information
    8 ppMergeVersion.c: FORCE
    9         touch ppMergeVersion.c
    10 FORCE: ;
    11 
    12 ppMerge_CFLAGS = $(PPMERGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPMERGE_VERSION=\"$(PPMERGE_VERSION)\" -DPPMERGE_BRANCH=\"$(PPMERGE_BRANCH)\" -DPPMERGE_SOURCE=\"$(PPMERGE_SOURCE)\"
     12ppMerge_CFLAGS = $(PPMERGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPMERGE_VERSION=$(SVN_VERSION) -DPPMERGE_BRANCH=$(SVN_BRANCH) -DPPMERGE_SOURCE=$(SVN_SOURCE)
    1313ppMerge_LDFLAGS = $(PPMERGE_LIBS) $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
    1414

  • branches/eam_branches/eam_branch_20090303/ppMerge/src/ppMergeVersion.c

    r23126 r23202  
    2222#include "ppMergeVersion.h"
    2323
    24 psString ppMergeVersion(void)
    25 {
    2624#ifndef PPMERGE_VERSION
    2725#error "PPMERGE_VERSION is not set"
    … …  
    3028#error "PPMERGE_BRANCH is not set"
    3129#endif
    32     return psStringCopy(PPMERGE_BRANCH "@" PPMERGE_VERSION);
     30#ifndef PPMERGE_SOURCE
     31#error "PPMERGE_SOURCE is not set"
     32#endif
     33
     34#define xstr(s) str(s)
     35#define str(s) #s
     36
     37psString ppMergeVersion(void)
     38{
     39    char *value = NULL;
     40    psStringAppend(&value, "%s@%s", xstr(PPMERGE_BRANCH), xstr(PPMERGE_VERSION));
     41    return value;
    3342}
    3443
    3544psString ppMergeSource(void)
    3645{
    37 #ifndef PPMERGE_SOURCE
    38 #error "PPMERGE_SOURCE is not set"
    39 #endif
    40     return psStringCopy(PPMERGE_SOURCE);
     46    return psStringCopy(xstr(PPMERGE_SOURCE));
    4147}
    4248

  • branches/eam_branches/eam_branch_20090303/ppSim/src/Makefile.am

    r23139 r23202  
    11bin_PROGRAMS = ppSim ppSimSequence
    22
    3 PPSIM_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
    4 PPSIM_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
    5 PPSIM_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     3# PPSIM_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
     4# PPSIM_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
     5# PPSIM_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     6#
     7# # Force recompilation of ppSimVersion.c, since it gets the version information
     8# ppSimVersion.c: FORCE
     9#       touch ppSimVersion.c
     10# FORCE: ;
    611
    7 # Force recompilation of ppSimVersion.c, since it gets the version information
    8 ppSimVersion.c: FORCE
    9         touch ppSimVersion.c
    10 FORCE: ;
    11 
    12 ppSim_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(ppSim_CFLAGS) -DPPSIM_VERSION=\"$(PPSIM_VERSION)\" -DPPSIM_BRANCH=\"$(PPSIM_BRANCH)\" -DPPSIM_SOURCE=\"$(PPSIM_SOURCE)\"
     12ppSim_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(ppSim_CFLAGS) -DPPSIM_VERSION=$(SVN_VERSION) -DPPSIM_BRANCH=$(SVN_BRANCH) -DPPSIM_SOURCE=$(SVN_SOURCE)
    1313ppSim_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PSPHOT_LIBS) $(PSASTRO_LIBS)
    1414ppSim_SOURCES = \

  • branches/eam_branches/eam_branch_20090303/ppSim/src/ppSimVersion.c

    r23139 r23202  
    11#include "ppSim.h"
    22
    3 
    4 psString ppSimVersion(void)
    5 {
    63#ifndef PPSIM_VERSION
    74#error "PPSIM_VERSION is not set"
    … …  
    107#error "PPSIM_BRANCH is not set"
    118#endif
    12     return psStringCopy(PPSIM_BRANCH "@" PPSIM_VERSION);
     9#ifndef PPSIM_SOURCE
     10#error "PPSIM_SOURCE is not set"
     11#endif
     12
     13#define xstr(s) str(s)
     14#define str(s) #s
     15
     16psString ppSimVersion(void)
     17{
     18    char *value = NULL;
     19    psStringAppend(&value, "%s@%s", xstr(PPSIM_BRANCH), xstr(PPSIM_VERSION));
     20    return value;
    1321}
    1422
    1523psString ppSimSource(void)
    1624{
    17 #ifndef PPSIM_SOURCE
    18 #error "PPSIM_SOURCE is not set"
    19 #endif
    20     return psStringCopy(PPSIM_SOURCE);
     25    return psStringCopy(xstr(PPSIM_SOURCE));
    2126}
    2227

  • branches/eam_branches/eam_branch_20090303/ppStack/src/Makefile.am

    r23143 r23202  
    11bin_PROGRAMS = ppStack
    22
    3 PPSTACK_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
    4 PPSTACK_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
    5 PPSTACK_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     3# PPSTACK_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
     4# PPSTACK_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
     5# PPSTACK_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     6#
     7# # Force recompilation of ppStackVersion.c, since it gets the version information
     8# ppStackVersion.c: FORCE
     9#       touch ppStackVersion.c
     10# FORCE: ;
    611
    7 # Force recompilation of ppStackVersion.c, since it gets the version information
    8 ppStackVersion.c: FORCE
    9         touch ppStackVersion.c
    10 FORCE: ;
    11 
    12 ppStack_CFLAGS  = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PPSTATS_CFLAGS) $(PPSTACK_CFLAGS) -DPPSTACK_VERSION=\"$(PPSTACK_VERSION)\" -DPPSTACK_BRANCH=\"$(PPSTACK_BRANCH)\" -DPPSTACK_SOURCE=\"$(PPSTACK_SOURCE)\"
     12ppStack_CFLAGS  = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PPSTATS_CFLAGS) $(PPSTACK_CFLAGS) -DPPSTACK_VERSION=$(SVN_VERSION) -DPPSTACK_BRANCH=$(SVN_BRANCH) -DPPSTACK_SOURCE=$(SVN_SOURCE)
    1313ppStack_LDFLAGS = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PSPHOT_LIBS)   $(PPSTATS_LIBS)   $(PPSTACK_LIBS)
    1414

  • branches/eam_branches/eam_branch_20090303/ppStack/src/ppStackVersion.c

    r23143 r23202  
    1010#include "ppStack.h"
    1111
    12 psString ppStackVersion(void)
    13 {
    1412#ifndef PPSTACK_VERSION
    1513#error "PPSTACK_VERSION is not set"
    … …  
    1816#error "PPSTACK_BRANCH is not set"
    1917#endif
    20     return psStringCopy(PPSTACK_BRANCH "@" PPSTACK_VERSION);
     18#ifndef PPSTACK_SOURCE
     19#error "PPSTACK_SOURCE is not set"
     20#endif
     21
     22#define xstr(s) str(s)
     23#define str(s) #s
     24
     25psString ppStackVersion(void)
     26{
     27    char *value = NULL;
     28    psStringAppend(&value, "%s@%s", xstr(PPSTACK_BRANCH), xstr(PPSTACK_VERSION));
     29    return value;
    2130}
    2231
    2332psString ppStackSource(void)
    2433{
    25 #ifndef PPSTACK_SOURCE
    26 #error "PPSTACK_SOURCE is not set"
    27 #endif
    28     return psStringCopy(PPSTACK_SOURCE);
     34    return psStringCopy(xstr(PPSTACK_SOURCE));
    2935}
    3036

  • branches/eam_branches/eam_branch_20090303/ppStats/src/Makefile.am

    r23119 r23202  
    11lib_LTLIBRARIES = libppStats.la
    22
    3 PPSTATS_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
    4 PPSTATS_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
    5 PPSTATS_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     3# PPSTATS_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
     4# PPSTATS_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
     5# PPSTATS_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     6#
     7# # Force recompilation of ppStatsVersion.c, since it gets the version information
     8# ppStatsVersion.c: FORCE
     9#       touch ppStatsVersion.c
     10# FORCE: ;
    611
    7 # Force recompilation of ppStatsVersion.c, since it gets the version information
    8 ppStatsVersion.c: FORCE
    9         touch ppStatsVersion.c
    10 FORCE: ;
    11 
    12 libppStats_la_CFLAGS = $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPSTATS_VERSION=\"$(PPSTATS_VERSION)\" -DPPSTATS_BRANCH=\"$(PPSTATS_BRANCH)\" -DPPSTATS_SOURCE=\"$(PPSTATS_SOURCE)\"
     12libppStats_la_CFLAGS = $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPSTATS_VERSION=$(SVN_VERSION) -DPPSTATS_BRANCH=$(SVN_BRANCH) -DPPSTATS_SOURCE=$(SVN_SOURCE)
    1313libppStats_la_LDFLAGS = $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
    1414

  • branches/eam_branches/eam_branch_20090303/ppStats/src/ppStatsVersion.c

    r23119 r23202  
    11#include "ppStatsInternal.h"
    22
    3 psString ppStatsVersion(void)
    4 {
    53#ifndef PPSTATS_VERSION
    64#error "PPSTATS_VERSION is not set"
    … …  
    97#error "PPSTATS_BRANCH is not set"
    108#endif
    11     return psStringCopy(PPSTATS_BRANCH "@" PPSTATS_VERSION);
     9#ifndef PPSTATS_SOURCE
     10#error "PPSTATS_SOURCE is not set"
     11#endif
     12
     13#define xstr(s) str(s)
     14#define str(s) #s
     15
     16psString ppStatsVersion(void)
     17{
     18    char *value = NULL;
     19    psStringAppend(&value, "%s@%s", xstr(PPSTATS_BRANCH), xstr(PPSTATS_VERSION));
     20    return value;
    1221}
    1322
    1423psString ppStatsSource(void)
    1524{
    16 #ifndef PPSTATS_SOURCE
    17 #error "PPSTATS_SOURCE is not set"
    18 #endif
    19     return psStringCopy(PPSTATS_SOURCE);
     25    return psStringCopy(xstr(PPSTATS_SOURCE));
    2026}
    2127

  • branches/eam_branches/eam_branch_20090303/ppSub/src/Makefile.am

    r23144 r23202  
    11bin_PROGRAMS = ppSub ppSubKernel
    22
    3 PPSUB_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
    4 PPSUB_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
    5 PPSUB_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     3# PPSUB_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
     4# PPSUB_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
     5# PPSUB_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     6#
     7# # Force recompilation of ppSubVersion.c, since it gets the version information
     8# ppSubVersion.c: FORCE
     9#       touch ppSubVersion.c
     10# FORCE: ;
    611
    7 # Force recompilation of ppSubVersion.c, since it gets the version information
    8 ppSubVersion.c: FORCE
    9         touch ppSubVersion.c
    10 FORCE: ;
    11 
    12 ppSub_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPSUB_CFLAGS) -DPPSUB_VERSION=\"$(PPSUB_VERSION)\" -DPPSUB_BRANCH=\"$(PPSUB_BRANCH)\" -DPPSUB_SOURCE=\"$(PPSUB_SOURCE)\"
     12ppSub_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPSUB_CFLAGS) -DPPSUB_VERSION=$(SVN_VERSION) -DPPSUB_BRANCH=$(SVN_BRANCH) -DPPSUB_SOURCE=$(SVN_SOURCE)
    1313ppSub_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PSPHOT_LIBS)   $(PPSUB_LIBS)
    1414

  • branches/eam_branches/eam_branch_20090303/ppSub/src/ppSubVersion.c

    r23144 r23202  
    2222#include "ppSub.h"
    2323
    24 psString ppSubVersion(void)
    25 {
    2624#ifndef PPSUB_VERSION
    2725#error "PPSUB_VERSION is not set"
    … …  
    3028#error "PPSUB_BRANCH is not set"
    3129#endif
    32     return psStringCopy(PPSUB_BRANCH "@" PPSUB_VERSION);
     30#ifndef PPSUB_SOURCE
     31#error "PPSUB_SOURCE is not set"
     32#endif
     33
     34#define xstr(s) str(s)
     35#define str(s) #s
     36
     37psString ppSubVersion(void)
     38{
     39    char *value = NULL;
     40    psStringAppend(&value, "%s@%s", xstr(PPSUB_BRANCH), xstr(PPSUB_VERSION));
     41    return value;
    3342}
    3443
    3544psString ppSubSource(void)
    3645{
    37 #ifndef PPSUB_SOURCE
    38 #error "PPSUB_SOURCE is not set"
    39 #endif
    40     return psStringCopy(PPSUB_SOURCE);
     46    return psStringCopy(xstr(PPSUB_SOURCE));
    4147}
    4248

  • branches/eam_branches/eam_branch_20090303/psLib/src/sys/Makefile.am

    r23115 r23202  
    33noinst_LTLIBRARIES = libpslibsys.la
    44
    5 PSLIB_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
    6 PSLIB_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
    7 PSLIB_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     5# PSLIB_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
     6# PSLIB_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
     7# PSLIB_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
    88
    99# Force recompilation of psConfigure.c, since it gets the version information
    … …  
    1212FORCE: ;
    1313
    14 libpslibsys_la_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) $(CFITSIO_CFLAGS) -DPSLIB_VERSION=\"$(PSLIB_VERSION)\" -DPSLIB_BRANCH=\"$(PSLIB_BRANCH)\" -DPSLIB_SOURCE=\"$(PSLIB_SOURCE)\"
     14libpslibsys_la_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) $(CFITSIO_CFLAGS) -DPSLIB_VERSION=$(SVN_VERSION) -DPSLIB_BRANCH=$(SVN_BRANCH) -DPSLIB_SOURCE=$(SVN_SOURCE)
    1515libpslibsys_la_SOURCES = \
    1616        psAbort.c \

  • branches/eam_branches/eam_branch_20090303/psLib/src/sys/psConfigure.c

    r23116 r23202  
    4747static FILE *memCheckFile = NULL;       // File to which to write results of mem check
    4848
    49 
    50 psString psLibVersion(void)
    51 {
    5249#ifndef PSLIB_VERSION
    5350#error "PSLIB_VERSION is not set"
    … …  
    5653#error "PSLIB_BRANCH is not set"
    5754#endif
    58     return psStringCopy(PSLIB_BRANCH "@" PSLIB_VERSION);
     55#ifndef PSLIB_SOURCE
     56#error "PSLIB_SOURCE is not set"
     57#endif
     58
     59#define xstr(s) str(s)
     60#define str(s) #s
     61
     62psString psLibVersion(void)
     63{
     64    char *value = NULL;
     65    psStringAppend(&value, "%s@%s", xstr(PSLIB_BRANCH), xstr(PSLIB_VERSION));
     66    return value;
    5967}
    6068
    6169psString psLibSource(void)
    6270{
    63 #ifndef PSLIB_SOURCE
    64 #error "PSLIB_SOURCE is not set"
    65 #endif
    66     return psStringCopy(PSLIB_SOURCE);
     71    return psStringCopy(xstr(PSLIB_SOURCE));
    6772}
    6873

  • branches/eam_branches/eam_branch_20090303/psModules/src/config/Makefile.am

    r23117 r23202  
    11noinst_LTLIBRARIES = libpsmodulesconfig.la
    22
    3 PSMODULES_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
    4 PSMODULES_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
    5 PSMODULES_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     3# PSMODULES_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
     4# PSMODULES_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
     5# PSMODULES_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
    66
    77# Force recompilation of pmVersion.c, since it gets the version information
    8 pmVersion.c: FORCE
    9         touch pmVersion.c
    10 FORCE: ;
     8# pmVersion.c: FORCE
     9#       touch pmVersion.c
     10# FORCE: ;
    1111
    12 libpsmodulesconfig_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS) -DPSMODULES_VERSION=\"$(PSMODULES_VERSION)\" -DPSMODULES_BRANCH=\"$(PSMODULES_BRANCH)\" -DPSMODULES_SOURCE=\"$(PSMODULES_SOURCE)\"
     12libpsmodulesconfig_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS) -DPSMODULES_VERSION=$(SVN_VERSION) -DPSMODULES_BRANCH=$(SVN_BRANCH) -DPSMODULES_SOURCE=$(SVN_SOURCE)
    1313libpsmodulesconfig_la_LDFLAGS  = -release $(PACKAGE_VERSION)
    1414libpsmodulesconfig_la_SOURCES  = \

  • branches/eam_branches/eam_branch_20090303/psModules/src/config/pmVersion.c

    r23152 r23202  
    88#include "pmVersion.h"
    99
    10 psString psModulesVersion(void)
    11 {
    1210#ifndef PSMODULES_VERSION
    1311#error "PSMODULES_VERSION is not set"
    … …  
    1614#error "PSMODULES_BRANCH is not set"
    1715#endif
    18     return psStringCopy(PSMODULES_BRANCH "@" PSMODULES_VERSION);
     16#ifndef PSMODULES_SOURCE
     17#error "PSMODULES_SOURCE is not set"
     18#endif
     19
     20#define xstr(s) str(s)
     21#define str(s) #s
     22
     23psString psModulesVersion(void)
     24{
     25    char *value = NULL;
     26    psStringAppend(&value, "%s@%s", xstr(PSMODULES_BRANCH), xstr(PSMODULES_VERSION));
     27    return value;
    1928}
    2029
    2130psString psModulesSource(void)
    2231{
    23 #ifndef PSMODULES_SOURCE
    24 #error "PSMODULES_SOURCE is not set"
    25 #endif
    26     return psStringCopy(PSMODULES_SOURCE);
     32    return psStringCopy(xstr(PSMODULES_SOURCE));
    2733}
    2834

  • branches/eam_branches/eam_branch_20090303/psastro/src/Makefile.am

    r23120 r23202  
    11lib_LTLIBRARIES = libpsastro.la
    22
    3 PSASTRO_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
    4 PSASTRO_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
    5 PSASTRO_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     3# PSASTRO_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
     4# PSASTRO_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
     5# PSASTRO_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     6#
     7# # Force recompilation of psastroVersion.c, since it gets the version information
     8# psastroVersion.c: FORCE
     9#       touch psastroVersion.c
     10# FORCE: ;
    611
    7 # Force recompilation of psastroVersion.c, since it gets the version information
    8 psastroVersion.c: FORCE
    9         touch psastroVersion.c
    10 FORCE: ;
    11 
    12 libpsastro_la_CFLAGS = $(PSASTRO_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSASTRO_VERSION=\"$(PSASTRO_VERSION)\" -DPSASTRO_BRANCH=\"$(PSASTRO_BRANCH)\" -DPSASTRO_SOURCE=\"$(PSASTRO_SOURCE)\"
     12libpsastro_la_CFLAGS = $(PSASTRO_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSASTRO_VERSION=$(SVN_VERSION) -DPSASTRO_BRANCH=$(SVN_BRANCH) -DPSASTRO_SOURCE=$(SVN_SOURCE)
    1313libpsastro_la_LDFLAGS = $(PSASTRO_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
    1414

  • branches/eam_branches/eam_branch_20090303/psastro/src/psastroVersion.c

    r23157 r23202  
    1010#include "psastroInternal.h"
    1111
    12 psString psastroVersion(void)
    13 {
    1412#ifndef PSASTRO_VERSION
    1513#error "PSASTRO_VERSION is not set"
    … …  
    1816#error "PSASTRO_BRANCH is not set"
    1917#endif
    20     return psStringCopy(PSASTRO_BRANCH "@" PSASTRO_VERSION);
     18#ifndef PSASTRO_SOURCE
     19#error "PSASTRO_SOURCE is not set"
     20#endif
     21
     22#define xstr(s) str(s)
     23#define str(s) #s
     24
     25psString psastroVersion(void)
     26{
     27    char *value = NULL;
     28    psStringAppend(&value, "%s@%s", xstr(PSASTRO_BRANCH), xstr(PSASTRO_VERSION));
     29    return value;
    2130}
    2231
    2332psString psastroSource(void)
    2433{
    25 #ifndef PSASTRO_SOURCE
    26 #error "PSASTRO_SOURCE is not set"
    27 #endif
    28     return psStringCopy(PSASTRO_SOURCE);
     34  return psStringCopy(xstr(PSASTRO_SOURCE));
    2935}
    3036

  • branches/eam_branches/eam_branch_20090303/psphot/src/Makefile.am

    r23118 r23202  
    11lib_LTLIBRARIES = libpsphot.la
    22
    3 PSPHOT_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
    4 PSPHOT_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
    5 PSPHOT_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     3# PSPHOT_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
     4# PSPHOT_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
     5# PSPHOT_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
     6#
     7# # Force recompilation of psphotVersion.c, since it gets the version information
     8# psphotVersion.c: FORCE
     9#       touch psphotVersion.c
     10# FORCE: ;
    611
    7 # Force recompilation of psphotVersion.c, since it gets the version information
    8 psphotVersion.c: FORCE
    9         touch psphotVersion.c
    10 FORCE: ;
    11 
    12 libpsphot_la_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSPHOT_VERSION=\"$(PSPHOT_VERSION)\" -DPSPHOT_BRANCH=\"$(PSPHOT_BRANCH)\" -DPSPHOT_SOURCE=\"$(PSPHOT_SOURCE)\"
     12libpsphot_la_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSPHOT_VERSION=$(PSPHOT_VERSION) -DPSPHOT_BRANCH=$(PSPHOT_BRANCH) -DPSPHOT_SOURCE=$(SVN_SOURCE)
    1313libpsphot_la_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
    1414

  • branches/eam_branches/eam_branch_20090303/psphot/src/psphotVersion.c

    r23156 r23202  
    55#endif
    66
    7 psString psphotVersion(void)
    8 {
    97#ifndef PSPHOT_VERSION
    108#error "PSPHOT_VERSION is not set"
    … …  
    1311#error "PSPHOT_BRANCH is not set"
    1412#endif
    15     return psStringCopy(PSPHOT_BRANCH "@" PSPHOT_VERSION);
     13#ifndef PSPHOT_SOURCE
     14#error "PSPHOT_SOURCE is not set"
     15#endif
     16
     17#define xstr(s) str(s)
     18#define str(s) #s
     19
     20psString psphotVersion(void)
     21{
     22    char *value = NULL;
     23    psStringAppend(&value, "%s@%s", xstr(PSPHOT_BRANCH), xstr(PSPHOT_VERSION));
     24    return value;
    1625}
    1726
    1827psString psphotSource(void)
    1928{
    20 #ifndef PSPHOT_SOURCE
    21 #error "PSPHOT_SOURCE is not set"
    22 #endif
    23     return psStringCopy(PSPHOT_SOURCE);
     29    return psStringCopy(xstr(PSPHOT_SOURCE));
    2430}
    2531
Note: See TracChangeset for help on using the changeset viewer.