From 7512e3acfbfdec65c30cafeab2c0560a25e2630e Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Mon, 18 Dec 2006 03:34:39 +0000
Subject: [PATCH] prep for M4 builds
---
releng.control/cc_config.xml | 4 +++-
releng.control/getFromCVS-relengControl.sh | 12 ++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 7e52344ec..f62837c61 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -351,7 +351,9 @@
<property
name="build.distribution"
value="wtp" />
-
+ <property
+ name="build.pack-all-in-one"
+ value="true" />
</ant>
</schedule>
diff --git a/releng.control/getFromCVS-relengControl.sh b/releng.control/getFromCVS-relengControl.sh
index c1565b0ef..d1dbd84fc 100644
--- a/releng.control/getFromCVS-relengControl.sh
+++ b/releng.control/getFromCVS-relengControl.sh
@@ -10,19 +10,19 @@
# for a local build, there should never be a need to check it back in to CVS.
#
-echo "save serialized state"
+echo " saving serialized state ..."
cp releng.control/*.ser .
-echo "remove all of releng.control"
+echo " removing all of releng.control ..."
rm -fr releng.control
-echo "check out head of releng.control from cvs"
+echo " checking out head of releng.control from cvs ..."
cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/webtools export -r HEAD releng.control
-echo "restore serialized state"
+echo " restoring serialized state ..."
mv *.ser releng.control
-# make sure releng.control files are executable and in proper format
-dos2unix releng.control/*.sh* releng.control/**/*.properties releng.control/*.xml
+echo " making sure releng.control files are executable and have proper EOL format ..."
+dos2unix -quiet -keepdate releng.control/*.sh* releng.control/**/*.properties releng.control/*.xml
chmod +x releng.control/*.sh
--
GitLab