summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ACE.mwc1
-rw-r--r--ACE/ACEXML/ACEXML.mwc2
-rw-r--r--ACE/Kokyu/Kokyu.mwc2
-rw-r--r--ACE/ace/ace.mwc2
-rw-r--r--ACE/apps/apps.mwc2
-rwxr-xr-xACE/bin/zap_svn_id.pl1
-rw-r--r--ACE/contrib/minizip/minizip.mwc1
-rw-r--r--ACE/examples/examples.mwc2
-rw-r--r--ACE/performance-tests/perf.mwc2
-rw-r--r--ACE/protocols/examples/examples.mwc2
-rw-r--r--ACE/protocols/protocols.mwc2
-rw-r--r--ACE/protocols/tests/tests.mwc2
-rw-r--r--ACE/tests/tests.mwc2
-rw-r--r--CIAO/CIAO.mwc2
-rw-r--r--CIAO/CIAO_DAnCE.mwc2
-rw-r--r--CIAO/CIAO_TAO.mwc2
-rw-r--r--CIAO/CIAO_TAO_DAnCE.mwc2
-rw-r--r--CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc2
-rw-r--r--CIAO/CIAO_TAO_DAnCE_OpenDDS_shapes.mwc2
-rw-r--r--CIAO/CIAO_TAO_OpenDDS.mwc2
-rw-r--r--CIAO/examples/BasicSP/BasicSP.mwc2
-rw-r--r--CIAO/examples/DevGuideExamples/CIAO.mwc2
-rw-r--r--DAnCE/DAnCE_TAO.mwc2
-rw-r--r--TAO/DevGuideExamples/DevGuideExamples.mwc2
-rw-r--r--TAO/TAO.mwc2
-rw-r--r--TAO/TAO_ACE.mwc2
-rw-r--r--TAO/TAO_IDL/TAO_IDL.mwc2
-rw-r--r--TAO/TAO_IDL/TAO_IDL_ACE.mwc2
-rw-r--r--TAO/TAO_IDL/fe/fe_lookup.cpp2
-rw-r--r--TAO/examples/examples.mwc2
-rw-r--r--TAO/interop-tests/AnyTypeCode/atc.mwc1
-rw-r--r--TAO/interop-tests/CdrOutArg/coa.mwc1
-rw-r--r--TAO/orbsvcs/DevGuideExamples/DevGuideExamples.mwc2
-rw-r--r--TAO/orbsvcs/examples/examples.mwc2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/orbsvcs.mwc2
-rw-r--r--TAO/orbsvcs/performance-tests/perf.mwc2
-rw-r--r--TAO/orbsvcs/tests/tests.mwc2
-rw-r--r--TAO/performance-tests/perf.mwc2
-rw-r--r--TAO/tao/tao.mwc2
-rw-r--r--TAO/tests/tests.mwc2
-rw-r--r--TAO/utils/utils.mwc2
45 files changed, 4 insertions, 81 deletions
diff --git a/ACE/ACE.mwc b/ACE/ACE.mwc
index 1783b891807..d1781a285a0 100644
--- a/ACE/ACE.mwc
+++ b/ACE/ACE.mwc
@@ -1,4 +1,3 @@
-// $Id$
workspace {
exclude(automake) {
build
diff --git a/ACE/ACEXML/ACEXML.mwc b/ACE/ACEXML/ACEXML.mwc
index dd297256b34..70537148ebc 100644
--- a/ACE/ACEXML/ACEXML.mwc
+++ b/ACE/ACEXML/ACEXML.mwc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
workspace {
}
diff --git a/ACE/Kokyu/Kokyu.mwc b/ACE/Kokyu/Kokyu.mwc
index dd297256b34..70537148ebc 100644
--- a/ACE/Kokyu/Kokyu.mwc
+++ b/ACE/Kokyu/Kokyu.mwc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
workspace {
}
diff --git a/ACE/ace/ace.mwc b/ACE/ace/ace.mwc
index 0c1e23123f2..2304d23e35c 100644
--- a/ACE/ace/ace.mwc
+++ b/ACE/ace/ace.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
}
diff --git a/ACE/apps/apps.mwc b/ACE/apps/apps.mwc
index dd297256b34..70537148ebc 100644
--- a/ACE/apps/apps.mwc
+++ b/ACE/apps/apps.mwc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
workspace {
}
diff --git a/ACE/bin/zap_svn_id.pl b/ACE/bin/zap_svn_id.pl
index 564f3d1746c..2951ecb5bf0 100755
--- a/ACE/bin/zap_svn_id.pl
+++ b/ACE/bin/zap_svn_id.pl
@@ -66,5 +66,6 @@ BEGIN{undef $/;} s/ \* \n/ \*\n/smg;
BEGIN{undef $/;} s/\*\n\* \n\*\n/\*\n/smg;
BEGIN{undef $/;} s/ \*\n \*\n \*\n/ \*\n/smg;
BEGIN{undef $/;} s/ \*\n \*\/\n/ \*\/\n/smg;
+BEGIN{undef $/;} s/\/\/ \n/\/\/\n/smg;
diff --git a/ACE/contrib/minizip/minizip.mwc b/ACE/contrib/minizip/minizip.mwc
index 397b73c819f..d90104a2381 100644
--- a/ACE/contrib/minizip/minizip.mwc
+++ b/ACE/contrib/minizip/minizip.mwc
@@ -1,3 +1,2 @@
-// $Id$
workspace {
}
diff --git a/ACE/examples/examples.mwc b/ACE/examples/examples.mwc
index 975ad4e462d..fb54b5a70d7 100644
--- a/ACE/examples/examples.mwc
+++ b/ACE/examples/examples.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
// This doesn't work quite yet, because not all the projects
// can be created implicitly. To fix this, we can either create
diff --git a/ACE/performance-tests/perf.mwc b/ACE/performance-tests/perf.mwc
index dd297256b34..70537148ebc 100644
--- a/ACE/performance-tests/perf.mwc
+++ b/ACE/performance-tests/perf.mwc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
workspace {
}
diff --git a/ACE/protocols/examples/examples.mwc b/ACE/protocols/examples/examples.mwc
index dd297256b34..70537148ebc 100644
--- a/ACE/protocols/examples/examples.mwc
+++ b/ACE/protocols/examples/examples.mwc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
workspace {
}
diff --git a/ACE/protocols/protocols.mwc b/ACE/protocols/protocols.mwc
index dd297256b34..70537148ebc 100644
--- a/ACE/protocols/protocols.mwc
+++ b/ACE/protocols/protocols.mwc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
workspace {
}
diff --git a/ACE/protocols/tests/tests.mwc b/ACE/protocols/tests/tests.mwc
index dd297256b34..70537148ebc 100644
--- a/ACE/protocols/tests/tests.mwc
+++ b/ACE/protocols/tests/tests.mwc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
workspace {
}
diff --git a/ACE/tests/tests.mwc b/ACE/tests/tests.mwc
index e3eb1548302..509c299ff0b 100644
--- a/ACE/tests/tests.mwc
+++ b/ACE/tests/tests.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
exclude {
pharlap
diff --git a/CIAO/CIAO.mwc b/CIAO/CIAO.mwc
index dd297256b34..70537148ebc 100644
--- a/CIAO/CIAO.mwc
+++ b/CIAO/CIAO.mwc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
workspace {
}
diff --git a/CIAO/CIAO_DAnCE.mwc b/CIAO/CIAO_DAnCE.mwc
index a1d24e76292..63fb07b277d 100644
--- a/CIAO/CIAO_DAnCE.mwc
+++ b/CIAO/CIAO_DAnCE.mwc
@@ -1,5 +1,3 @@
-//$Id$
-
workspace {
ccm
ciao
diff --git a/CIAO/CIAO_TAO.mwc b/CIAO/CIAO_TAO.mwc
index dec452a5f65..1d8a8f4a319 100644
--- a/CIAO/CIAO_TAO.mwc
+++ b/CIAO/CIAO_TAO.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
$(ACE_ROOT)/ace
$(ACE_ROOT)/apps/gperf/src
diff --git a/CIAO/CIAO_TAO_DAnCE.mwc b/CIAO/CIAO_TAO_DAnCE.mwc
index 14bc3bccf6b..5c5f9a67316 100644
--- a/CIAO/CIAO_TAO_DAnCE.mwc
+++ b/CIAO/CIAO_TAO_DAnCE.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
$(ACE_ROOT)/ace
$(ACE_ROOT)/apps/gperf/src
diff --git a/CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc b/CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc
index de432017ac4..31289bdf92b 100644
--- a/CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc
+++ b/CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
$(ACE_ROOT)/ace
$(ACE_ROOT)/apps/gperf/src
diff --git a/CIAO/CIAO_TAO_DAnCE_OpenDDS_shapes.mwc b/CIAO/CIAO_TAO_DAnCE_OpenDDS_shapes.mwc
index 0df68dd28f7..74bf4978986 100644
--- a/CIAO/CIAO_TAO_DAnCE_OpenDDS_shapes.mwc
+++ b/CIAO/CIAO_TAO_DAnCE_OpenDDS_shapes.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
$(ACE_ROOT)/ace
$(ACE_ROOT)/apps/gperf/src
diff --git a/CIAO/CIAO_TAO_OpenDDS.mwc b/CIAO/CIAO_TAO_OpenDDS.mwc
index 7c7b1eb2574..6c4c0e3948d 100644
--- a/CIAO/CIAO_TAO_OpenDDS.mwc
+++ b/CIAO/CIAO_TAO_OpenDDS.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
$(ACE_ROOT)/ace
$(ACE_ROOT)/apps/gperf/src
diff --git a/CIAO/examples/BasicSP/BasicSP.mwc b/CIAO/examples/BasicSP/BasicSP.mwc
index 781791601d9..01382ab7983 100644
--- a/CIAO/examples/BasicSP/BasicSP.mwc
+++ b/CIAO/examples/BasicSP/BasicSP.mwc
@@ -1,5 +1,3 @@
-// $Id$
-
workspace {
BasicSP.mpc
BMClosedED/BMClosedED.mpc
diff --git a/CIAO/examples/DevGuideExamples/CIAO.mwc b/CIAO/examples/DevGuideExamples/CIAO.mwc
index dd297256b34..70537148ebc 100644
--- a/CIAO/examples/DevGuideExamples/CIAO.mwc
+++ b/CIAO/examples/DevGuideExamples/CIAO.mwc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
workspace {
}
diff --git a/DAnCE/DAnCE_TAO.mwc b/DAnCE/DAnCE_TAO.mwc
index 043bd9fcd93..e0b9bfa9fca 100644
--- a/DAnCE/DAnCE_TAO.mwc
+++ b/DAnCE/DAnCE_TAO.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
$(ACE_ROOT)/ace
$(ACE_ROOT)/apps/gperf/src
diff --git a/TAO/DevGuideExamples/DevGuideExamples.mwc b/TAO/DevGuideExamples/DevGuideExamples.mwc
index b07eebca11d..305b7e83e2d 100644
--- a/TAO/DevGuideExamples/DevGuideExamples.mwc
+++ b/TAO/DevGuideExamples/DevGuideExamples.mwc
@@ -1,4 +1,4 @@
-// $Id$
+//
workspace {
}
diff --git a/TAO/TAO.mwc b/TAO/TAO.mwc
index f731a80e427..cee1fadd2e5 100644
--- a/TAO/TAO.mwc
+++ b/TAO/TAO.mwc
@@ -1,5 +1,3 @@
-// $Id$
-
workspace {
exclude {
CIAO
diff --git a/TAO/TAO_ACE.mwc b/TAO/TAO_ACE.mwc
index e2a020a4d58..2b2020a933b 100644
--- a/TAO/TAO_ACE.mwc
+++ b/TAO/TAO_ACE.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
$(ACE_ROOT)/ace
$(ACE_ROOT)/apps/gperf/src
diff --git a/TAO/TAO_IDL/TAO_IDL.mwc b/TAO/TAO_IDL/TAO_IDL.mwc
index 74d6b32b888..84fb2a7efbc 100644
--- a/TAO/TAO_IDL/TAO_IDL.mwc
+++ b/TAO/TAO_IDL/TAO_IDL.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// Many existing MPC builds rely on this workspace. It is not
// necessary other than that.
workspace {
diff --git a/TAO/TAO_IDL/TAO_IDL_ACE.mwc b/TAO/TAO_IDL/TAO_IDL_ACE.mwc
index 0f0284af0cd..cc8c2e58a07 100644
--- a/TAO/TAO_IDL/TAO_IDL_ACE.mwc
+++ b/TAO/TAO_IDL/TAO_IDL_ACE.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
$(ACE_ROOT)/ace/ace.mpc
$(ACE_ROOT)/apps/gperf/src
diff --git a/TAO/TAO_IDL/fe/fe_lookup.cpp b/TAO/TAO_IDL/fe/fe_lookup.cpp
index bb12e25880d..f1cd561f3b9 100644
--- a/TAO/TAO_IDL/fe/fe_lookup.cpp
+++ b/TAO/TAO_IDL/fe/fe_lookup.cpp
@@ -1,4 +1,4 @@
-//
+//
#include "fe_private.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/examples/examples.mwc b/TAO/examples/examples.mwc
index fc3612c4312..9ab1bccd641 100644
--- a/TAO/examples/examples.mwc
+++ b/TAO/examples/examples.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
cmdline += -include $PWD
exclude {
diff --git a/TAO/interop-tests/AnyTypeCode/atc.mwc b/TAO/interop-tests/AnyTypeCode/atc.mwc
index e47003b82e6..52ffa1b80f2 100644
--- a/TAO/interop-tests/AnyTypeCode/atc.mwc
+++ b/TAO/interop-tests/AnyTypeCode/atc.mwc
@@ -1,4 +1,3 @@
-// $Id$
workspace {
tao/Demo.mpc
}
diff --git a/TAO/interop-tests/CdrOutArg/coa.mwc b/TAO/interop-tests/CdrOutArg/coa.mwc
index b66da202755..862c63037de 100644
--- a/TAO/interop-tests/CdrOutArg/coa.mwc
+++ b/TAO/interop-tests/CdrOutArg/coa.mwc
@@ -1,4 +1,3 @@
-// $Id$
workspace {
tao/CdrOutArg.mpc
}
diff --git a/TAO/orbsvcs/DevGuideExamples/DevGuideExamples.mwc b/TAO/orbsvcs/DevGuideExamples/DevGuideExamples.mwc
index b07eebca11d..305b7e83e2d 100644
--- a/TAO/orbsvcs/DevGuideExamples/DevGuideExamples.mwc
+++ b/TAO/orbsvcs/DevGuideExamples/DevGuideExamples.mwc
@@ -1,4 +1,4 @@
-// $Id$
+//
workspace {
}
diff --git a/TAO/orbsvcs/examples/examples.mwc b/TAO/orbsvcs/examples/examples.mwc
index 740f5fcd2ab..f1e562adce0 100644
--- a/TAO/orbsvcs/examples/examples.mwc
+++ b/TAO/orbsvcs/examples/examples.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
cmdline += -include $PWD/../tests // for notifytest.mpb
}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
index e1c5304964a..359b4d493df 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
@@ -4,8 +4,6 @@
/**
* @file LB_ClientComponent.h
*
- *
-
* @author Ossama Othman <ossama@uci.edu>
*/
//=============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
index 94cfed02739..0e1b4ec591c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
@@ -4,8 +4,6 @@
/**
* @file LB_Component.h
*
- *
-
* @author Ossama Othman <ossama@uci.edu>
*/
//=============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index 48175ee4fd7..fe81e8323e5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -4,8 +4,6 @@
/**
* @file LB_IORInterceptor.h
*
- *
-
* @author Ossama Othman <ossama@uci.edu>
*/
//=============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
index debeaf8235d..88168ce7e6e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
@@ -4,8 +4,6 @@
/**
* @file LB_ObjectReferenceFactory.h
*
- *
-
* @author Ossama Othman <ossama@uci.edu>
*/
//=============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.mwc b/TAO/orbsvcs/orbsvcs/orbsvcs.mwc
index 01faf104b82..5094df16004 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs.mwc
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
}
diff --git a/TAO/orbsvcs/performance-tests/perf.mwc b/TAO/orbsvcs/performance-tests/perf.mwc
index dd297256b34..70537148ebc 100644
--- a/TAO/orbsvcs/performance-tests/perf.mwc
+++ b/TAO/orbsvcs/performance-tests/perf.mwc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
workspace {
}
diff --git a/TAO/orbsvcs/tests/tests.mwc b/TAO/orbsvcs/tests/tests.mwc
index 244c1bef561..3e2e7b966e4 100644
--- a/TAO/orbsvcs/tests/tests.mwc
+++ b/TAO/orbsvcs/tests/tests.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
cmdline += -include $PWD
}
diff --git a/TAO/performance-tests/perf.mwc b/TAO/performance-tests/perf.mwc
index 244c1bef561..3e2e7b966e4 100644
--- a/TAO/performance-tests/perf.mwc
+++ b/TAO/performance-tests/perf.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
cmdline += -include $PWD
}
diff --git a/TAO/tao/tao.mwc b/TAO/tao/tao.mwc
index 01faf104b82..5094df16004 100644
--- a/TAO/tao/tao.mwc
+++ b/TAO/tao/tao.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
}
diff --git a/TAO/tests/tests.mwc b/TAO/tests/tests.mwc
index 244c1bef561..3e2e7b966e4 100644
--- a/TAO/tests/tests.mwc
+++ b/TAO/tests/tests.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
cmdline += -include $PWD
}
diff --git a/TAO/utils/utils.mwc b/TAO/utils/utils.mwc
index e6c25693aa5..720b162ef29 100644
--- a/TAO/utils/utils.mwc
+++ b/TAO/utils/utils.mwc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
workspace {
nslist
catior