ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/xdaq.spec
(Generate patch)

Comparing COMP/CMSDIST/xdaq.spec (file contents):
Revision 1.64 by muzaffar, Fri Sep 11 08:43:00 2009 UTC vs.
Revision 1.73 by muzaffar, Fri Feb 5 16:31:38 2010 UTC

# Line 1 | Line 1
1 < ### RPM external xdaq VR15487
1 > ### RPM external xdaq VR16021
2   ## BUILDIF case $(uname):$(uname -p) in Linux:i*86 ) true ;; Linux:x86_64 ) true ;;  Linux:ppc64 ) false ;; Darwin:* ) false ;; * ) false ;; esac
3  
4   Requires: zlib mimetic xerces-c uuid sqlite
5   %define xdaqv %(echo %v | cut -f1 -d- | tr . _)
6   %define libext so
7 + %define svntrunk  %(echo %v | sed 's|^VR||')
8 + Source: svn://svn.cern.ch/reps/cmsos/releases/baseline10/tags/base/?scheme=svn+ssh&revision=%svntrunk&strategy=export&module=xdaq&output=/xdaq.tar.gz
9  
10 < Source: svn://svn.cern.ch/reps/cmsos/trunk/?scheme=svn+ssh&revision=15487&strategy=export&module=xdaq&output=/xdaq.gz
10 > Patch0: xdaq_VR16021_build
11 > Patch1: xdaq_mfDefs_flags
12 > Patch2: xdaq_VR15544_gcc44
13  
10 – Patch: xdaq_build
14   Provides: /bin/awk
15  
16   %prep
17   %setup -T -b 0 -n xdaq
18  
19 < %patch -p1
20 < ls
21 < echo " Install root in prep:" %{i}    %{pkginstroot}
19 > %patch0 -p1
20 > %patch1 -p1
21 > %patch2 -p1
22  
23   %build
24   # Xdaq does not provide makeinstall,  it uses "simplify" script instead to
# Line 28 | Line 31 | cp -rp *  %{i} # assuming there are no s
31   cd %{i}
32   export XDAQ_ROOT=$PWD
33   cd %{i}/daq
34 < # Fix up a problem for the 64bit build
32 < case %cmsplatf in
33 <  *amd64* )
34 <    perl -p -i -e "s!configure --prefix!configure --with-pic --prefix!" extern/asyncresolv/Makefile
35 <    ;;
36 < esac
34 >
35   export MIMETIC_PREFIX=$MIMETIC_ROOT
36   export XERCES_PREFIX=$XERCES_C_ROOT
37   export UUID_LIB_PREFIX=$UUID_ROOT/lib
# Line 44 | Line 42 | make CPPDEFINES=linux Set=extern_coretoo
42   make CPPDEFINES=linux Set=coretools install
43   make CPPDEFINES=linux Set=extern_powerpack install
44   make CPPDEFINES=linux Set=powerpack install
45 < cd xdaq2rc
48 < make CPPDEFINES=linux install
45 > make CPPDEFINES=linux Set=general_worksuite install
46  
47   # The following structure used as defined in Xdaq "simplify" script:
48   cd %{i}
# Line 87 | Line 84 | mv daq/xdaq/etc/default.profile etc/
84   rm -fr daq
85   rm -fr CVS
86   rm -fr x86*
87 + rm -fR java
88 + rm -fR htdocs
89 + ln -s libasyncresolv %{i}/lib/libasyncresolv.so
90   rm -f %{i}/lib/lib*.a %{i}/lib/lib*.la
91  
92   # Libraries from extern (not found cause they are symlinks)
# Line 96 | Line 96 | perl -p -i -e "s|^#!.*make|#!/usr/bin/en
96  
97   # SCRAM ToolBox toolfile
98   mkdir -p %i/etc/scram.d
99 < cat << \EOF_TOOLFILE >%i/etc/scram.d/%n
100 < <doc type=BuildSystem::ToolDoc version=1.0>
101 < <Tool name=XDAQ version=%v>
102 < <info url=http://home.cern.ch/xdaq></info>
103 < <lib name=toolbox>
104 < <lib name=xdaq>
105 < <lib name=config>
106 < <lib name=xoap>
107 < <lib name=xgi>
108 < <lib name=xdata>
109 < <lib name=cgicc>
110 < <lib name=log4cplus>
111 < <lib name=xcept>
112 < <lib name=logudpappender>
113 < <lib name=peer>
114 < <lib name=logxmlappender>
115 < <lib name=asyncresolv>
116 < <lib name=ptfifo>
117 < <lib name=pthttp>
118 < <lib name=pttcp>
119 < <lib name=i2outils>
120 < <lib name=xdaq2rc>
121 < <lib name=xoapfilter>
122 < <lib name=xalan-c>
123 < <lib name=xalanMsg>
124 < <lib name=wsaddressing>
125 < <lib name=wsclientsubscriber>
126 < <lib name=wseventing>
127 < <lib name=wsserviceeventing>
128 < <Client>
129 < <Environment name=XDAQ_BASE  default="%i"></Environment>
130 < <Environment name=LIBDIR default="$XDAQ_BASE/lib"></Environment>
131 < <Environment name=BINDIR default="$XDAQ_BASE/bin"></Environment>
132 < <Environment name=INCLUDE default="$XDAQ_BASE/include"></Environment>
133 < <Environment name=INCLUDE default="$XDAQ_BASE/include/linux"></Environment>
134 < </Client>
135 < <use name=xerces-c>
136 < <use name=sockets>
137 < <use name=mimetic>
138 < <use name=uuid>
139 < <runtime name=XDAQ_OS value="linux">
140 < <runtime name=XDAQ_PLATFORM value="x86">
141 < <runtime name=PATH value="$BINDIR" type=path>
142 < <runtime name=XDAQ_ROOT value="$XDAQ_BASE">
143 < <runtime name=XDAQ_DOCUMENT_ROOT value="$XDAQ_BASE/htdocs">
144 < <flags CPPDEFINES="SOAP__ LITTLE_ENDIAN__">
145 < <flags CPPDEFINES="linux">
146 < </Tool>
99 > cat << \EOF_TOOLFILE >%i/etc/scram.d/%n.xml
100 >  <tool name="XDAQ" version="%v">
101 >    <info url="http://home.cern.ch/xdaq"/>
102 >    <lib name="toolbox"/>
103 >    <lib name="xdaq"/>
104 >    <lib name="config"/>
105 >    <lib name="xoap"/>
106 >    <lib name="xgi"/>
107 >    <lib name="xdata"/>
108 >    <lib name="cgicc"/>
109 >    <lib name="log4cplus"/>
110 >    <lib name="xcept"/>
111 >    <lib name="logudpappender"/>
112 >    <lib name="peer"/>
113 >    <lib name="logxmlappender"/>
114 >    <lib name="asyncresolv"/>
115 >    <lib name="ptfifo"/>
116 >    <lib name="pthttp"/>
117 >    <lib name="pttcp"/>
118 >    <lib name="i2outils"/>
119 >    <lib name="xdaq2rc"/>
120 >    <lib name="xoapfilter"/>
121 >    <lib name="xalan-c"/>
122 >    <lib name="xalanMsg"/>
123 >    <lib name="wsaddressing"/>
124 >    <lib name="wsclientsubscriber"/>
125 >    <lib name="wseventing"/>
126 >    <lib name="wsserviceeventing"/>
127 >    <client>
128 >      <environment name="XDAQ_BASE" default="%i"/>
129 >      <environment name="LIBDIR" default="$XDAQ_BASE/lib"/>
130 >      <environment name="BINDIR" default="$XDAQ_BASE/bin"/>
131 >      <environment name="INCLUDE" default="$XDAQ_BASE/include"/>
132 >      <environment name="INCLUDE" default="$XDAQ_BASE/include/linux"/>
133 >    </client>
134 >    <flags cppdefines="SOAP__ LITTLE_ENDIAN__"/>
135 >    <flags cppdefines="linux"/>
136 >    <runtime name="XDAQ_OS" value="linux"/>
137 >    <runtime name="XDAQ_PLATFORM" value="x86"/>
138 >    <runtime name="PATH" value="$BINDIR" type="path"/>
139 >    <runtime name="XDAQ_ROOT" value="$XDAQ_BASE"/>
140 >    <runtime name="XDAQ_DOCUMENT_ROOT" value="$XDAQ_BASE/htdocs"/>
141 >    <use name="xerces-c"/>
142 >    <use name="sockets"/>
143 >    <use name="mimetic"/>
144 >    <use name="uuid"/>
145 >  </tool>
146   EOF_TOOLFILE
147  
148 < cat << \EOF_TOOLFILE >%i/etc/scram.d/xdaqheader
149 < <doc type=BuildSystem::ToolDoc version=1.0>
150 < <Tool name=XDAQHEADER version=%v>
151 < <info url=http://home.cern.ch/xdaq></info>
152 < <Client>
153 < <Environment name=XDAQHEADER_BASE  default="%i"></Environment>
154 < <Environment name=INCLUDE default="$XDAQHEADER_BASE/include"></Environment>
155 < </Client>
157 < </Tool>
148 > cat << \EOF_TOOLFILE >%i/etc/scram.d/xdaqheader.xml
149 >  <tool name="XDAQHEADER" version="%v">
150 >    <info url="http://home.cern.ch/xdaq"/>
151 >    <client>
152 >      <environment name="XDAQHEADER_BASE" default="%i"/>
153 >      <environment name="INCLUDE" default="$XDAQHEADER_BASE/include"/>
154 >    </client>
155 >  </tool>
156   EOF_TOOLFILE
157  
158   %post
159   find $RPM_INSTALL_PREFIX/%pkgrel -type l | xargs ls -la | sed -e "s|.*[ ]\(/.*\) -> \(.*\)| \2 \1|;s|[ ]/[^ ]*/external| $RPM_INSTALL_PREFIX/%cmsplatf/external|g" | xargs -n2 ln -sf
160 < %{relocateConfig}etc/scram.d/%n
161 < %{relocateConfig}etc/scram.d/xdaqheader
160 > %{relocateConfig}etc/scram.d/%n.xml
161 > %{relocateConfig}etc/scram.d/xdaqheader.xml
162  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines