rpms/icecream/devel icecream.csh.in, 1.2, 1.3 icecream.sh.in, 1.2, 1.3 icecream.spec, 1.4, 1.5

[Michal Schmidt (michich)]

Author: michich

Update of /cvs/pkgs/rpms/icecream/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20776

Modified Files:
	icecream.csh.in icecream.sh.in icecream.spec 
Log Message:
* Thu Nov 29 2007 Michal Schmidt <mschmidt at redhat.com> - 0.8.0-6.20071101svn
- Rewritten the profile scripts to make icecream work together with ccache.



Index: icecream.csh.in
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.csh.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- icecream.csh.in	27 Nov 2007 22:36:12 -0000	1.2
+++ icecream.csh.in	30 Nov 2007 00:07:18 -0000	1.3
@@ -1,7 +1,21 @@
-# If icecream and ccache are installed, we must not put both in PATH
-# to prevent recursive invocations.
-# Note: ccache.csh (if present) will be sourced before icecream.csh
+# Leaves path unchanged if icecc is already there.
+# If ccache is there, adds icecc _after_ it.
+# Otherwise adds icecc to the beginning.
 
-if ( "$path" !~ *@LIBDIR@/icecc/bin* && "$path" !~ *@LIBDIR@/ccache* ) then
-	set path = ( @LIBDIR@/icecc/bin "$path" )
+if ( "$path" !~ *@LIBDIR@/icecc/bin* ) then
+	if ( "$path" !~ *@LIBDIR@/ccache* ) then
+		set path = ( @LIBDIR@/icecc/bin "$path" )
+	else
+		@ pos = 0
+		foreach item ( $path )
+			@ pos = $pos + 1
+			if ( $item == @LIBDIR@/ccache ) break
+		end
+		@ next_pos = $pos + 1
+		set path = ( $path[1-$pos] @LIBDIR@/icecc/bin \
+			$path[$next_pos-])
+		unset next_pos
+		unset pos
+		unset item
+	endif
 endif


Index: icecream.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.sh.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- icecream.sh.in	27 Nov 2007 22:36:12 -0000	1.2
+++ icecream.sh.in	30 Nov 2007 00:07:18 -0000	1.3
@@ -1,8 +1,9 @@
-# If icecream and ccache are installed, we must not put both in PATH
-# to prevent recursive invocations.
-# Note: ccache.sh (if present) will be sourced before icecream.sh
+# Leaves PATH unchanged if icecc is already there.
+# If ccache is there, adds icecc _after_ it.
+# Otherwise adds icecc to the beginning.
 
-if ! echo "$PATH" | /bin/grep -q "@LIBDIR@/icecc/bin\|@LIBDIR@/ccache"
-then
-	PATH="@LIBDIR@/icecc/bin:$PATH"
-fi
+PATH=`echo $PATH | /bin/sed -e \
+	'\%@LIBDIR@/icecc/bin% b
+	s%@LIBDIR@/ccache%&:@LIBDIR@/icecc/bin%
+	t
+	s%^%@LIBDIR@/icecc/bin:%'`


Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- icecream.spec	27 Nov 2007 22:36:12 -0000	1.4
+++ icecream.spec	30 Nov 2007 00:07:18 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		icecream
 Version:	0.8.0
-Release:	5.20071101svn%{?dist}
+Release:	6.20071101svn%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -210,6 +210,9 @@
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Thu Nov 29 2007 Michal Schmidt <mschmidt at redhat.com> - 0.8.0-6.20071101svn
+- Rewritten the profile scripts to make icecream work together with ccache.
+
 * Tue Nov 27 2007 Michal Schmidt <mschmidt at redhat.com> - 0.8.0-5.20071101svn
 - SELinux: Allow iceccd to contact the scheduler via UDP.
 - Don't add icecream to PATH in the profile scripts if ccache is installed