Merge remote branch 'upstream/master'

Conflicts:
	etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
	etherpad/src/etherpad/control/pro/pro_main_control.js
	etherpad/src/etherpad/control/pro_help_control.js
	etherpad/src/etherpad/globals.js
	etherpad/src/etherpad/legacy_urls.js
	etherpad/src/etherpad/pne/pne_utils.js
	etherpad/src/etherpad/pro/pro_utils.js
	etherpad/src/main.js
	etherpad/src/plugins/fileUpload/templates/fileUpload.ejs
	etherpad/src/plugins/testplugin/templates/page.ejs
	etherpad/src/static/css/pad2_ejs.css
	etherpad/src/static/css/pro-help.css
	etherpad/src/static/img/jun09/pad/protop.gif
	etherpad/src/static/js/store.js
	etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
	etherpad/src/themes/default/templates/main/home.ejs
	etherpad/src/themes/default/templates/pro-help/main.ejs
	etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
	infrastructure/com.etherpad/licensing.scala
	trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
	trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
	trunk/etherpad/src/static/css/home-opensource.css
	trunk/etherpad/src/static/js/ace.js
	trunk/etherpad/src/static/js/linestylefilter_client.js
	trunk/etherpad/src/templates/email/eepnet_license_info.ejs
	trunk/etherpad/src/templates/pad/pad_body2.ejs
	trunk/etherpad/src/templates/pad/pad_content.ejs
	trunk/etherpad/src/templates/pad/padfull_body.ejs
	trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs

1 files changed, 66 insertions, 0 deletions

diff --git a/infrastructure/bin/compilecache.sh b/infrastructure/bin/compilecache.sh
new file mode 100755
index 0000000..6e42a50
--- /dev/null
+++ b/infrastructure/bin/compilecache.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+#  Copyright 2009 Google Inc.
+#  
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#  
+#       http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS-IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+CP_CMD="cp -R -u"
+if [ `uname` == "Darwin" ]; then
+	CP_CMD="/bin/cp -R -n"
+elif [ `uname` == "SunOS" ]; then
+	CP_CMD="cp -R" #Solaris cp does not have '-u'
+fi
+
+function cacheonfiles {
+	NAME=$1; FILES=$2; FUNC=$3; NOCOPY=1;
+	if [ -z "$4" ]; then
+		NOCOPY=0
+	fi
+	REBUILD=0
+	BPATH=buildcache/$NAME
+	FILETEST=$BPATH/t
+	if [ ! -f $FILETEST ]; then
+		REBUILD=1
+	else
+		for a in $FILES; do
+			if [ $FILETEST -ot $a ]; then
+				echo $a has changed, rebuilding $NAME
+				REBUILD=1
+			fi
+		done
+	fi
+	if [ $REBUILD -eq 1 ]; then
+		if [ -d $BPATH ]; then
+			rm -rf $BPATH
+		fi
+		mkdir -p $BPATH
+		$FUNC $BPATH
+		pushd $BPATH >> /dev/null
+		touch t
+		popd >> /dev/null
+	else
+		echo using cached $NAME...
+	fi
+	if [ $NOCOPY -ne 1 ]; then
+		for a in $BPATH/*; do
+			if [ -d $a ]; then
+				$CP_CMD $a build/
+			elif [ -f $a ]; then
+				cp $a build/
+			else
+				echo unknown file type $a
+				exit 1
+			fi
+		done
+	fi
+}