summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormbrudka <mbrudka@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-12-04 13:32:57 +0000
committermbrudka <mbrudka@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-12-04 13:32:57 +0000
commit106db0bdb481330862e50f8b8f97a2858fa84908 (patch)
treec8388ee04b781abe0d17df515dc2f912aad34b6e
parent3546ef64b83fb6fbef4695ea9579c0b6e73d7b01 (diff)
downloadATCD-106db0bdb481330862e50f8b8f97a2858fa84908.tar.gz
ChangeLogTag: Sat Dec 4 14:28:54 2004 Marek Brudka <mbrudka@aster.pl>
-rw-r--r--ChangeLog61
-rw-r--r--bin/MakeProjectCreator/config/global.features3
2 files changed, 36 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index 1727a542aa9..65c99f806ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,33 +1,38 @@
+Sat Dec 4 14:28:54 2004 Marek Brudka <mbrudka@aster.pl>
+
+ * bin/MakeProjectCreator/config/global.features (Module):
+ Added comment about -features option.
+
Fri Dec 3 23:10:39 2004 Marek Brudka <mbrudka@aster.pl>
- * bin/MakeProjectCreator/config/tao_qtreactor.mpb (Added):
- * bin/MakeProjectCreator/config/ace_xt.mpb (Added):
- * bin/MakeProjectCreator/config/ace_x11.mpb (Added):
- * bin/MakeProjectCreator/config/ace_tk.mpb (Added):
- * bin/MakeProjectCreator/config/ace_qtreactor.mpb (Added):
- * bin/MakeProjectCreator/config/ace_gtk.mpb (Added):
- * bin/MakeProjectCreator/config/ace_gl.mpb (Added):
- * bin/MakeProjectCreator/config/ace_fltk.mpb (Added):
- * ace/ace_xtreactor.mpc (Added):
- * ace/ace_tkreactor.mpc (Added):
- * ace/ace_qtreactor.mpc (Added):
- * ace/ace_flreactor.mpc (Added):
-
- * tests/tests.mpc (Modified):
- * include/makeinclude/wrapper_macros.GNU (Modified):
- * include/makeinclude/platform_sunos5_sunc++.GNU (Modified):
- * include/makeinclude/platform_sunos5_g++.GNU (Modified):
- * include/makeinclude/platform_lynxos.GNU (Modified):
- * include/makeinclude/platform_linux_pgi.GNU (Modified):
- * include/makeinclude/platform_linux_icc.GNU (Modified):
- * include/makeinclude/platform_linux_borland.GNU (Modified):
- * include/makeinclude/platform_linux.GNU (Modified):
- * bin/MakeProjectCreator/config/acedefaults.mpb (Modified):
- * bin/MakeProjectCreator/config/ace_qt.mpb (Modified):
- * ace/ace.mwc (Modified):
- * ace/ace.mpc (Modified):
- Initial changes related with the separation of reactors into distinct libraries.
- Many thanks to Raphael Bossek <raphael.bossek@gmx.de> for this patch.
+ * bin/MakeProjectCreator/config/tao_qtreactor.mpb (Added):
+ * bin/MakeProjectCreator/config/ace_xt.mpb (Added):
+ * bin/MakeProjectCreator/config/ace_x11.mpb (Added):
+ * bin/MakeProjectCreator/config/ace_tk.mpb (Added):
+ * bin/MakeProjectCreator/config/ace_qtreactor.mpb (Added):
+ * bin/MakeProjectCreator/config/ace_gtk.mpb (Added):
+ * bin/MakeProjectCreator/config/ace_gl.mpb (Added):
+ * bin/MakeProjectCreator/config/ace_fltk.mpb (Added):
+ * ace/ace_xtreactor.mpc (Added):
+ * ace/ace_tkreactor.mpc (Added):
+ * ace/ace_qtreactor.mpc (Added):
+ * ace/ace_flreactor.mpc (Added):
+
+ * tests/tests.mpc (Modified):
+ * include/makeinclude/wrapper_macros.GNU (Modified):
+ * include/makeinclude/platform_sunos5_sunc++.GNU (Modified):
+ * include/makeinclude/platform_sunos5_g++.GNU (Modified):
+ * include/makeinclude/platform_lynxos.GNU (Modified):
+ * include/makeinclude/platform_linux_pgi.GNU (Modified):
+ * include/makeinclude/platform_linux_icc.GNU (Modified):
+ * include/makeinclude/platform_linux_borland.GNU (Modified):
+ * include/makeinclude/platform_linux.GNU (Modified):
+ * bin/MakeProjectCreator/config/acedefaults.mpb (Modified):
+ * bin/MakeProjectCreator/config/ace_qt.mpb (Modified):
+ * ace/ace.mwc (Modified):
+ * ace/ace.mpc (Modified):
+ Initial changes related with the separation of reactors into distinct libraries.
+ Many thanks to Raphael Bossek <raphael.bossek@gmx.de> for this patch.
Thu Dec 2 13:38:33 2004 Chad Elliott <elliott_c@ociweb.com>
diff --git a/bin/MakeProjectCreator/config/global.features b/bin/MakeProjectCreator/config/global.features
index f14c60a0739..509b0ca8788 100644
--- a/bin/MakeProjectCreator/config/global.features
+++ b/bin/MakeProjectCreator/config/global.features
@@ -11,6 +11,9 @@
// 2) Create a feature file anywhere you like with the features you want and
// use the -feature_file option to specify where it is located.
//
+// Feature definitions from this file are always overwritten by -features
+// command option of mwc.pl.
+//
// This file is somewhat akin to the platform_macros.GNU file in that build
// settings can be set here.