rev 18933 - kde-extras/icecream/trunk/debian

Fathi Boudra fabo at alioth.debian.org
Wed Sep 14 13:23:48 UTC 2011


Author: fabo
Date: 2011-09-14 13:23:48 +0000 (Wed, 14 Sep 2011)
New Revision: 18933

Modified:
   kde-extras/icecream/trunk/debian/changelog
   kde-extras/icecream/trunk/debian/icecc.conf
   kde-extras/icecream/trunk/debian/icecc.default
   kde-extras/icecream/trunk/debian/icecc.init
Log:
Add ICECREAM_ALLOW_REMOTE support.

Modified: kde-extras/icecream/trunk/debian/changelog
===================================================================
--- kde-extras/icecream/trunk/debian/changelog	2011-09-14 13:09:26 UTC (rev 18932)
+++ kde-extras/icecream/trunk/debian/changelog	2011-09-14 13:23:48 UTC (rev 18933)
@@ -1,3 +1,9 @@
+icecc (0.9.7-3) UNRELEASED; urgency=low
+
+  * Add ICECREAM_ALLOW_REMOTE support.
+
+ -- Fathi Boudra <fabo at debian.org>  Wed, 14 Sep 2011 16:10:47 +0300
+
 icecc (0.9.7-2) unstable; urgency=low
 
   * Fix GCC 4.6 support. It reverts to use the correc -print-file-name option.

Modified: kde-extras/icecream/trunk/debian/icecc.conf
===================================================================
--- kde-extras/icecream/trunk/debian/icecc.conf	2011-09-14 13:09:26 UTC (rev 18932)
+++ kde-extras/icecream/trunk/debian/icecc.conf	2011-09-14 13:23:48 UTC (rev 18933)
@@ -22,10 +22,20 @@
 # You can overwrite here the number of jobs to run in parallel. Per
 # default this depends on the number of (virtual) CPUs installed. 
 #
+# Note: a value of "0" is actually interpreted as "1", however it
+# also sets ICECREAM_ALLOW_REMOTE="no".
+#
 # ICECC_MAX_JOBS=""
 ICECC_MAX_JOBS=""
 
+# 
+# Specifies whether jobs submitted by other nodes are allowed to run on
+# this one.
 #
+# ICECREAM_ALLOW_REMOTE="yes"
+ICECREAM_ALLOW_REMOTE="yes"
+
+#
 # This is the directory where the icecc daemon stores the environments
 # it compiles in. In a big network this can grow quite a bit, so use some
 # path if your /tmp is small - but the user icecc has to write to it.

Modified: kde-extras/icecream/trunk/debian/icecc.default
===================================================================
--- kde-extras/icecream/trunk/debian/icecc.default	2011-09-14 13:09:26 UTC (rev 18932)
+++ kde-extras/icecream/trunk/debian/icecc.default	2011-09-14 13:23:48 UTC (rev 18933)
@@ -5,21 +5,18 @@
 # should icecc be started on boot?
 #
 # START_ICECC="true"
-
 START_ICECC="true"
 
 #
 # Nice level of running compilers
 #
 # ICECC_NICE_LEVEL="5"
-
 ICECC_NICE_LEVEL="5"
 
 #
 # icecc daemon log file
 #
-# ICECC_LOG_FILE="/var/log/iceccd"
-
+# ICECC_LOG_FILE="/var/log/iceccd.log"
 ICECC_LOG_FILE="/var/log/iceccd.log"
 
 #
@@ -28,38 +25,43 @@
 # for whatever reason.
 #
 # ICECC_NETNAME=""
-
 ICECC_NETNAME=""
 
 # 
 # You can overwrite here the number of jobs to run in parallel. Per
-# default this depends on the number of (virtual) CPUs installed. 
+# default this depends on the number of (virtual) CPUs installed.
+# 
+# Note: a value of "0" is actually interpreted as "1", however it
+# also sets ICECREAM_ALLOW_REMOTE="no".
 #
 # ICECC_MAX_JOBS=""
-
 ICECC_MAX_JOBS=""
 
+# 
+# Specifies whether jobs submitted by other nodes are allowed to run on
+# this one.
 #
+# ICECREAM_ALLOW_REMOTE="yes"
+ICECREAM_ALLOW_REMOTE="yes"
+
+#
 # This is the directory where the icecc daemon stores the environments
 # it compiles in. In a big network this can grow quite a bit, so use some
 # path if your /tmp is small - but the user icecc has to write to it.
 # 
 # ICECC_BASEDIR="/var/cache/icecc"
-
 ICECC_BASEDIR="/var/cache/icecc"
 
 #
 # Start also the scheduler?
 #
 # START_ICECC_SCHEDULER="false"
-
 START_ICECC_SCHEDULER="false"
 
 #
 # icecc scheduler log file
 #
-# ICECC_SCHEDULER_LOG_FILE="/var/log/icecc_scheduler"
-
+# ICECC_SCHEDULER_LOG_FILE="/var/log/icecc_scheduler.log"
 ICECC_SCHEDULER_LOG_FILE="/var/log/icecc_scheduler.log"
 
 #
@@ -67,5 +69,4 @@
 # of a firewall) you can specify it.
 #
 # ICECC_SCHEDULER_HOST=""
-
 ICECC_SCHEDULER_HOST=""

Modified: kde-extras/icecream/trunk/debian/icecc.init
===================================================================
--- kde-extras/icecream/trunk/debian/icecc.init	2011-09-14 13:09:26 UTC (rev 18932)
+++ kde-extras/icecream/trunk/debian/icecc.init	2011-09-14 13:23:48 UTC (rev 18933)
@@ -45,13 +45,22 @@
 	if test -n "$ICECC_BASEDIR"; then
 		basedir="-b $ICECC_BASEDIR"
 	fi
+	noremote=
+	if test "$ICECC_ALLOW_REMOTE" = "no"; then
+		noremote="--no-remote"
+	fi
 	maxjobs=
 	if test -n "$ICECC_MAX_JOBS"; then
-		maxjobs="-m $ICECC_MAX_JOBS"
+		if test "$ICECC_MAX_JOBS" -eq 0; then
+			maxjobs="-m 1"
+			noremote="--no-remote"
+		else
+			maxjobs="-m $ICECC_MAX_JOBS"
+		fi
 	fi
 
 	start-stop-daemon --start --quiet --exec $DAEMON -- \
-	-d $logfile $nice $scheduler $netname -u icecc $basedir $maxjobs
+	-d $logfile $nice $scheduler $netname -u icecc -b $basedir $maxjobs $noremote
 }
 
 stop_icecc_daemon() {




More information about the pkg-kde-commits mailing list