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

Comparing COMP/CMSDIST/onlinesystemtools.spec (file contents):
Revision 1.1 by ratnik, Wed Nov 21 23:13:29 2007 UTC vs.
Revision 1.3 by ratnik, Wed Aug 6 20:46:22 2008 UTC

# Line 1 | Line 1
1 < ### RPM external onlinesystemtools 2.0
1 > ### RPM external onlinesystemtools 2.1
2   Source: none
3  
4 < %if "%{?use_system_gcc:set}" == "set"
4 > # Here we are assuming that online release always uses system compiler:
5   %define compilertools ccompiler cxxcompiler f77compiler jcompiler
6 %else
7 %define compilertools %jcompiler
8 %endif
6  
7 < %if "%{?online_release:set}" == "set"
7 > %if "%cmsplatf" == "slc4onl_ia32_gcc346"
8   #%define onlinetools curl libpng libtiff libungif mimetic mysql openssl oracle python elementtree qt xdaq xerces zlib
9   %define onlinetools zlib curl oracle openssl xerces-c xdaq mimetic
10   # Define variables used in non-scram-managed tools, that would be
# Line 29 | Line 26 | Source: none
26   %define xerces_version                  2.7.0
27   ## INITENV SET XERCES_C_VERSION         %xerces_version
28   ## INITENV SET XERCES_C_ROOT            /opt/xdaq
29 < %define xdaq_version                    3.15.0
29 > %define xdaq_version                    3.16.1
30   ## INITENV SET XDAQ_VERSION             %xdaq_version
31   ## INITENV SET XDAQ_ROOT                /opt/xdaq
32   %define mimetic_version                 0.9.1
# Line 145 | Line 142 | cat << \EOF_TOOLFILE >>%i/etc/scram.d/jc
142   </Tool>
143   EOF_TOOLFILE
144  
145 < %if "%{?online_release:set}" == "set"
145 > %if "%cmsplatf" == "slc4onl_ia32_gcc346"
146   #cxxcompiler
147   cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
148   <doc type=BuildSystem::ToolDoc version=1.1>
# Line 336 | Line 333 | cat << \EOF_TOOLFILE >%i/etc/scram.d/xda
333   </Tool>
334   EOF_TOOLFILE
335  
336 + #xdaqheader
337 + cat << \EOF_TOOLFILE >%i/etc/scram.d/xdaqheader
338 + <doc type=BuildSystem::ToolDoc version=1.0>
339 + <Tool name=XDAQHEADER version=%xdaq_version>
340 + <info url=http://home.cern.ch/xdaq></info>
341 + <Client>
342 + <Environment name=XDAQHEADER_BASE  default="/opt/xdaq"></Environment>
343 + <Environment name=INCLUDE default="$XDAQHEADER_BASE/include"></Environment>
344 + </Client>
345 + </Tool>
346 + EOF_TOOLFILE
347 +
348   #mimetic
349   cat << \EOF_TOOLFILE >%i/etc/scram.d/mimetic
350   <doc type=BuildSystem::ToolDoc version=1.0>
# Line 357 | Line 366 | EOF_TOOLFILE
366   %{relocateConfig}etc/scram.d/x11
367   %{relocateConfig}etc/scram.d/jcompiler
368  
369 < %if "%{?online_release:set}" == "set"
369 > %if "%cmsplatf" == "slc4onl_ia32_gcc346"
370   %{relocateConfig}etc/scram.d/cxxcompiler
371   %{relocateConfig}etc/scram.d/ccompiler
372   %{relocateConfig}etc/scram.d/f77compiler
# Line 367 | Line 376 | EOF_TOOLFILE
376   %{relocateConfig}etc/scram.d/openssl
377   %{relocateConfig}etc/scram.d/xerces-c
378   %{relocateConfig}etc/scram.d/xdaq
379 + %{relocateConfig}etc/scram.d/xdaqheader
380   %{relocateConfig}etc/scram.d/mimetic
381  
382   %endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines