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

Comparing COMP/CMSDIST/systemtools.spec (file contents):
Revision 1.3 by dlange, Fri Sep 7 14:31:05 2007 UTC vs.
Revision 1.21 by eulisse, Fri Sep 10 08:40:31 2010 UTC

# Line 1 | Line 1
1 < ### RPM virtual systemtools 1.0
1 > ### RPM external systemtools 19
2   Source: none
3  
4 < %define systemtools                     sockets opengl x11 jcompiler
4 > %if "%{?use_system_gcc:set}" == "set"
5 > %define compilertools ccompiler cxxcompiler f77compiler jcompiler
6 > %else
7 > %define compilertools %jcompiler
8 > %endif
9 >
10 > %define systemtools                     sockets opengl x11 %compilertools
11   %define sockets_version                 1.0
12   %define opengl_version                  XFree4.2
13   %define x11_version                     R6
14   ### why oh why is this hardwired??
15 < %define jcompiler_version               1.5.0.p6-CMS8
15 > %define jcompiler_version               1.5.0.p6-CMS18
16  
17   ## INITENV SET SOCKETS_VERSION          %sockets_version
18   ## INITENV SET OPENGL_VERSION           %opengl_version
# Line 21 | Line 27 | Source: none
27   # SCRAM ToolBox toolfile
28   mkdir -p %i/etc/scram.d
29   # Sockets
30 < cat << \EOF_TOOLFILE >%i/etc/scram.d/sockets
31 < <doc type=BuildSystem::ToolDoc version=1.1>
26 < <Tool name=Sockets version=%sockets_version>
30 > cat << \EOF_TOOLFILE >%i/etc/scram.d/sockets.xml
31 >  <tool name="sockets" version="%sockets_version">
32   EOF_TOOLFILE
33   case %cmsplatf in
34 < slc3_* | slc4_* )
35 < cat << \EOF_TOOLFILE >>%i/etc/scram.d/sockets
36 < <lib name=nsl>
37 < <lib name=crypt>
38 < <lib name=dl>
34 > slc3_* | slc4_* | slc4onl_* | slc5_* )
35 > cat << \EOF_TOOLFILE >>%i/etc/scram.d/sockets.xml
36 >    <lib name="nsl"/>
37 >    <lib name="crypt"/>
38 >    <lib name="dl"/>
39 >    <lib name="rt"/>
40   EOF_TOOLFILE
41   ;;
42   osx10* )
43 < cat << \EOF_TOOLFILE >>%i/etc/scram.d/sockets
44 < <lib name=dl>
43 > cat << \EOF_TOOLFILE >>%i/etc/scram.d/sockets.xml
44 >    <lib name="dl"/>
45   EOF_TOOLFILE
46   ;;
47   esac
48 < echo "</Tool>" >>%i/etc/scram.d/sockets
48 > echo "  </tool>" >>%i/etc/scram.d/sockets.xml
49  
50   # OpenGL
51 < cat << \EOF_TOOLFILE >%i/etc/scram.d/opengl
52 < <doc type=BuildSystem::ToolDoc version=1.1>
53 < <Tool name=OpenGL version=%opengl_version>
54 < <use name=X11>
55 < <lib name=GL>
50 < <lib name=GLU>
51 > cat << \EOF_TOOLFILE >%i/etc/scram.d/opengl.xml
52 >  <tool name="opengl" version="%opengl_version">
53 >    <lib name="GL"/>
54 >    <lib name="GLU"/>
55 >    <use name="x11"/>
56   EOF_TOOLFILE
57   case %cmsplatf in
58 < osx103* )
59 < cat << \EOF_TOOLFILE >>%i/etc/scram.d/opengl
60 < <Client>
61 < <Environment name=OPENGL_BASE default="/System/Library/Frameworks/OpenGL.framework/Versions/A"></Environment>
62 < <Environment name=INCLUDE default="$OPENGL_BASE/Headers"></Environment>
63 < <Environment name=LIBDIR default="$OPENGL_BASE/Libraries"></Environment>
64 < </Client>
58 > osx10* )
59 > cat << \EOF_TOOLFILE >>%i/etc/scram.d/opengl.xml
60 >    <client>
61 >      <environment name="OPENGL_BASE" default="/System/Library/Frameworks/OpenGL.framework/Versions/A"/>
62 >      <environment name="INCLUDE"     default="$OPENGL_BASE/Headers"/>
63 >      <environment name="LIBDIR"      default="$OPENGL_BASE/Libraries"/>
64 >    </client>
65   EOF_TOOLFILE
66   ;;
67   esac
68 < echo "</Tool>" >>%i/etc/scram.d/opengl
68 > echo "  </tool>" >>%i/etc/scram.d/opengl.xml
69  
70   # X11
71 < cat << \EOF_TOOLFILE >%i/etc/scram.d/x11
72 < <doc type=BuildSystem::ToolDoc version=1.1>
68 < <Tool name=X11 version=%x11_version>
71 > cat << \EOF_TOOLFILE >%i/etc/scram.d/x11.xml
72 >  <tool name="x11" version="%x11_version">
73   EOF_TOOLFILE
74   case %cmsplatf in
75 < slc3_* )
76 < cat << \EOF_TOOLFILE >>%i/etc/scram.d/x11
77 < <Client>
78 < <Environment name=INCLUDE value="/usr/X11R6/include"></Environment>
79 < <Environment name=LIBDIR value="/usr/X11R6/lib"></Environment>
80 < </Client>
81 < <lib name=Xt>
82 < <lib name=Xpm>
83 < <lib name=X11>
84 < <lib name=Xi>
85 < <lib name=Xext>
86 < <lib name=Xmu>
87 < <lib name=ICE>
88 < <lib name=SM>
75 > slc3_*|osx*)
76 > cat << \EOF_TOOLFILE >>%i/etc/scram.d/x11.xml
77 >    <client>
78 >      <environment name="INCLUDE" value="/usr/X11R6/include"/>
79 >      <environment name="LIBDIR" value="/usr/X11R6/lib"/>
80 >    </client>
81 >    <lib name="Xt"/>
82 >    <lib name="Xpm"/>
83 >    <lib name="X11"/>
84 >    <lib name="Xi"/>
85 >    <lib name="Xext"/>
86 >    <lib name="Xmu"/>
87 >    <lib name="ICE"/>
88 >    <lib name="SM"/>
89   EOF_TOOLFILE
90   ;;
91   esac
92 < cat << \EOF_TOOLFILE >>%i/etc/scram.d/x11
93 < <use name=sockets>
94 < </Tool>
92 > cat << \EOF_TOOLFILE >>%i/etc/scram.d/x11.xml
93 >    <use name="sockets"/>
94 >  </tool>
95   EOF_TOOLFILE
96  
97   # JCompiler
98   %define compiler_ver        %(echo %jcompiler_version | sed -e "s|\\.||g")
99 < cat << \EOF_TOOLFILE >>%i/etc/scram.d/jcompiler
100 < <doc type=BuildSystem::ToolDoc version=1.1>
101 < <Tool name=jcompiler version=%jcompiler_version type=compiler>
102 < <Client>
103 < <Environment name=JAVA_BASE></Environment>
104 < <Environment name=JAVAC value="$JAVA_BASE/bin/javac"></Environment>
105 < </Client>
106 < <Runtime name=JAVA_HOME default="$JAVA_BASE">
107 < <flags JAVAC_="$(JAVAC)">
108 < <flags JAVAC_o="$(JAVAC) -O">
109 < <flags JAVAC_d="$(JAVAC) -g">
110 < <Flags SCRAM_COMPILER_NAME="jsdk%compiler_ver">
111 < <Flags SCRAM_LANGUAGE_TYPE="JAVA">
108 < </Tool>
99 > cat << \EOF_TOOLFILE >>%i/etc/scram.d/jcompiler.xml
100 >  <tool name="jcompiler" version="%jcompiler_version" type="compiler">
101 >    <client>
102 >      <environment name="JAVA_BASE"/>
103 >      <environment name="JAVAC" value="$JAVA_BASE/bin/javac"/>
104 >    </client>
105 >    <flags javac_="$(JAVAC)"/>
106 >    <flags javac_o="$(JAVAC) -O"/>
107 >    <flags javac_d="$(JAVAC) -g"/>
108 >    <flags scram_compiler_name="jsdk%compiler_ver"/>
109 >    <flags scram_language_type="JAVA"/>
110 >    <runtime name="JAVA_HOME" default="$JAVA_BASE"/>
111 >  </tool>
112   EOF_TOOLFILE
113  
114   %post
115 < %{relocateConfig}etc/scram.d/sockets
113 < %{relocateConfig}etc/scram.d/opengl
114 < %{relocateConfig}etc/scram.d/x11
115 < %{relocateConfig}etc/scram.d/jcompiler
115 > %{relocateConfig}etc/scram.d/*.xml

Diff Legend

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