diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2009-06-22 14:34:25 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2009-06-22 14:34:25 +0000 |
| commit | db90171a586a5b530077e2e1a7a6d699dad9a06f (patch) | |
| tree | 545322275d34be372b404627010e0aab94763a40 | |
| parent | 2243355512259e300b3c2d418fa3e35f13b0ed9b (diff) | |
| download | MPC-ACE+TAO+CIAO-5_7_0.tar.gz | |
ChangeLogTag:Mon Jun 22 09:33:40 CDT 2009 Phil Mesnier <mesnier_p@ociweb.com>ACE+TAO+CIAO-5_7_0
61 files changed, 1807 insertions, 1235 deletions
@@ -1,1112 +1,26 @@ -Thu Apr 9 21:37:52 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com> - - * config/udm.mpb: - - Fuzz fix. - -Thu Apr 9 16:57:57 UTC 2009 James H. Hill <hillj@isis.vanderbilt.edu> - - * config/udm.mpb: - - Mapped 'commandflags' -> 'udmflags' - -Thu Apr 9 16:48:31 UTC 2009 James H. Hill <hillj@isis.vanderbilt.edu> - - * config/udm.mpb: - - Bug fix in the project specification. - -Thu Apr 9 16:42:43 UTC 2009 James H. Hill <hillj@isis.vanderbilt.edu> - - * config/udm.mpb: - - UDM base project. - -Tue Apr 7 09:33:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> - - * config/qt4_core.mpb: - * config/qt4_designer.mpb: - * config/qt4_designercomponents.mpb: - * config/qt4_gui.mpb: - * config/qt4_network.mpb: - * config/qt4_opengl.mpb: - * config/qt4_qt3support.mpb: - * config/qt4_sql.mpb: - * config/qt4_svg.mpb: - * config/qt4_test.mpb: - * config/qt4_xml.mpb: - All Qt4libs are appended with 4 - -Wed Apr 1 16:10:22 UTC 2009 Ciju John <johnc at ociweb dot com> - - * config/qt4_core.mpb: - Wrong include path got checked in. This fixes it. - -Wed Apr 1 15:56:35 UTC 2009 Ciju John <johnc at ociweb dot com> - - * config/qt4_core.mpb: - * config/qt4_gui.mpb: - Qt4 libs are appended with '4'. - -Thu Mar 26 12:48:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/MakeProjectCreator.pdf: - First updates applied - -Mon Mar 16 21:33:14 UTC 2009 Steven Stallion <stallions@ociweb.com> - - * config/erlang.mpb: - - Updated erlang base project to default to typical gnuace - behavior for generated artifacts. - -Sun Mar 15 19:36:54 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> - - * config/lzo1.mpb: - Fixed lib names - -Wed Mar 11 13:51:08 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/MakeProjectCreator.pdf: - This work is based on the TAO 1.4a TAO Developers Guide chapter - on MPC published by OCI. The goal is to improve this - document with time to serve as the authoritative reference/documentation - for MPC users. - - Thanks to OCI for making this chapter publicly available and allowing - us to modify it. - -Wed Mar 11 09:15:08 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> - - * config/bzip2.mpb: - * config/lzo1.mpb: - Fixed these base projects so that they also work with gnuace - -Tue Mar 10 13:34:36 UTC 2009 Adam Mitz <mitza@ociweb.com> - - * modules/GUID.pm: - - Fixed a bug where 64-bit implementations of Perl would generate - duplicate GUID values. (Bugzilla #3614) - -Mon Mar 9 07:04:08 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> - - * config/bzip2.mpb: - * config/lzo1.mpb: - * config/lzo2.mpb: - * config/zlib.mpb: - On windows we need some different library names - -Sat Mar 7 18:55:08 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> - - * config/lzo1.mpb: - Added lzo1 base project - -Sat Feb 28 03:46:19 UTC 2009 James H. Hill <hillj@isis.vanderbilt.edu> - - * config/pcre.mpb: - * config/pcreposix.mpb: - - Base projects for using PCRE. - -Tue Feb 24 04:23:34 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> - - * config/xerces.mpb: - - Added !xerces2, !xerces3 feature to disable xerces dependent builds - if neither feature is present. - -Mon Feb 23 16:03:15 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> - - * config/qt4_qt3support.mpb: - Added base project for qt4_qt3support - -Tue Feb 17 13:17:28 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> - - * config/xerces3.mpb: - - Removed this file. - -Wed Feb 11 16:21:48 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> - - * config/global.features: - * config/xerces.mpb: - - Disabled xerces{2,3} by default and removed the requires lines - from the xerces features. Thanks to Adam Mitz for pointing this out. - -Tue Feb 10 20:36:47 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> - - * config/xerces.mpb: - - Split this base project into two features - xerces2 and xerces3 - to allow support for both versions. - -Mon Jan 19 22:30:47 UTC 2009 James H. Hill <hillj@isis.vanderbilt.edu> - - * config/iiopnet.mpb: - - Base project for using IIOP.NET. - -Mon Jan 12 11:10:09 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> - - * config/nddslib.mpb: - Added vc10 - -Sun Jan 11 17:26:09 UTC 2009 Abdullah Sowayan <sowayan@gmail.com> - - * config/nddslib.mpb: - - Minor enhancement. - -Sun Jan 11 17:21:17 UTC 2009 Abdullah Sowayan <sowayan@gmail.com> - - * config/nddslib.mpb: - - Added Visual Studio 2010 (vc10) support - -Sun Jan 11 17:09:44 UTC 2009 Abdullah Sowayan <sowayan@gmail.com> - - * config/ndds_ts_defaults.mpb: - * config/nddsexe.mpb: - * config/nddsexe_with_idl.mpb: - * config/nddslib.mpb: - * config/nddslib_with_idl.mpb: - - New files, base projects for using RTI's NDDS - C++ DDS implementation. - -Sat Jan 3 22:02:02 UTC 2009 Steven Stallion <stallions@ociweb.com> - - * config/erlang.mpb: - - Updated base project type for erlang projects. - -Wed Dec 31 23:01:33 UTC 2008 Steven Stallion <stallions@ociweb.com> - - * config/erlang_otp.mpb: - - Dropped default -I include from erlang_otp projects. - -Tue Dec 30 23:23:03 UTC 2008 Steven Stallion <stallions@ociweb.com> - - * config/erlang.mpb: - * config/erlang_otp.mpb: - - Updated Erlang support. Output is now propertly cleaned when - the clean target is called on gnuace platforms. - -Wed Dec 24 22:20:40 UTC 2008 Steven Stallion <stallions@ociweb.com> - - * config/erlang.mpb: - * config/erlang_otp.mpb: - - Added support for Erlang. Two new projects are available: - erlang, and erlang_otp. erlang provides basic Erlang support, - and erlang_otp provides support for projects which use the otp - layout. - -Thu Dec 18 21:39:03 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/MakeWorkspaceCreator.pm: - - Fixed a bug with my change yesterday relating to the "bundle" - target. - - * templates/make.net.mpd: - - Added a strip command to the bundle commands. - -Thu Dec 18 09:29:36 UTC 2008 James H. Hill <hillj@isis.vanderbilt.edu> - - * config/xerces3.mpb: - - Base project for Xerces-C 3.x - -Tue Dec 16 02:54:55 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * docs/MPC.sgml: - * docs/README: - * docs/USAGE: - - Updated documentation. - - * modules/Options.pm: - - Sort project types keeping like types in numerical order. - - * modules/MakeWorkspaceCreator.pm: - * templates/make.net.mpd: - * templates/make.net.mpt: - - Added a bundle target for C# to bundle an executable into a native - application. - -Fri Nov 28 10:55:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * templates/wb26wrmakefile.mpd: - Don't copy the lib/exe when we need to install them in the current - directory - -Mon Nov 17 10:50:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * templates/nmake.mpd: - * templates/vc7.mpd: - * templates/vc8.mpd: - Added escape charachter to MPC_LIB_MODIFIER value - -Mon Nov 17 08:33:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/templates/common.txt: - * templates/nmake.mpd: - * templates/vc7.mpd: - * templates/vc8.mpd: - Add macro_for_lib_modifier. Whis template variable is set the - vc7/vc8/vc9/vc10/nmake templatess add MPC_LIB_MODIFIER to the - compiler flags with the current lib_modifier as value - -Tue Nov 11 10:40:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * config/boost_base.mpd: - Use $(BOOST_ROOT)/. again - -Mon Nov 10 10:45:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * config/boost_date_time.mpb: - * config/boost_filesystem.mpb: - * config/boost_iostreams.mpb: - * config/boost_prg_exec_monitor.mpb: - * config/boost_program_options.mpb: - * config/boost_regex.mpb: - * config/boost_serialization.mpb: - * config/boost_signals.mpb: - * config/boost_system.mpb: - * config/boost_test_exec_monitor.mpb: - * config/boost_thread.mpb: - * config/boost_unit_test_framework.mpb: - * config/boost_wave.mpb: - * config/gacutil.mpb: - * config/mpich.mpb: - * config/odbc.mpb: - * config/openssl.mpb: - * config/splicelib.mpb: - * config/sqlite3.mpb: - * config/swig_perl.mpb: - * config/xerces.mpb: - * docs/README: - * docs/USAGE: - * modules/VC10ProjectCreator.pm: - * modules/VC10WorkspaceCreator.pm: - Added Visual Studio 2010 (vc10) support - -Fri Nov 7 18:39:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * templates/wb26wrmakefile.mpd: - * templates/wb26wrproject.mpd: - Improved standard build support - -Fri Nov 7 13:00:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * templates/wb26wrmakefile.mpd: - The OBJECTS variable is dependent on the project name - -Thu Nov 6 18:41:58 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com> - - * templates/wb26wrmakefile.mpd: - - Fixed pre_build rule by using SUB_OBJECTS instead of OBJECTS_example. - Thanks to Laszlo Morocz <laszlo dot morocz at lmco dot com) for providing the fix. - -Thu Nov 6 15:42:06 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu> - - * config/splice_ts_defaults.mpb: - * config/spliceexe.mpb: - * config/spliceexe_with_idl.mpb: - * config/splicelib.mpb: - * config/splicelib_with_idl.mpb: - - New files, base projects for using PrismTech's OpenSplice - C++ DDS implementation. Currently, the files are specialized - for using OpenSplice integrated with a CORBA implementation, - and assume that OpenSplice's custom library for this purpose - (in $OSPL_HOME/custom_lib/ccpp) has been compiled after - installation. - -Thu Nov 6 10:54:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * templates/wb26wrmakefile.mpd: - * templates/wb26wrproject.mpd: - Put all object names in a file and pass these to the Librarian to - prevent a long command when a lot of objects are linked together - -Tue Nov 4 10:01:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * templates/bmake.mpd: - Reverted change of yesterday, breaks other things - - * config/boost_base.mpd: - Use $(BOOST_ROOT) instead of $(BOOST_ROOT)/., it confused CodeGear - C++ - -Mon Nov 3 21:50:41 UTC 2008 James H. Hill <hillj@isis.vanderbilt.edu> - - * config/sqlite3.mpb: - Added a 'requires' statement to the base project. - -Mon Nov 3 19:51:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * templates/bmake.mpd: - Use '' around include paths so that we can handle directories - with spaces in the name - -Sun Oct 26 17:09:42 UTC 2008 James H. Hill <hillj@isis.vanderbilt.edu> - - * config/sqlite3.mpb: - - Base project for using SQLite. For Windows-based projects, you - will need to use LIB to generate the import library for the - .dll. - -Thu Oct 23 13:01:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * templates/bmake.mpd: - Don't print all clean commands on the console - -Fri Oct 17 19:07:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * modules/BCB2009ProjectCreator.pm - * modules/BCB2009WorkspaceCreator.pm - * templates/bcb2009.mpd - * templates/bcb2009dll.mpt - * templates/bcb2009exe.mpt - New generator for C++ Builder 2009 - - * templates/bcb2007.mpd - Fixed bug in resource_file generation - -Wed Oct 15 15:03:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> +Wed Jun 17 18:37:31 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * templates/vc8platforms.mpt: - SuperSonic also uses unicode - - * config/openssl.mpb: - * config/xerces.mpb: - Removed reference to borland template which has been removed - - * config/qt3.mpb: - Added this file. Just derived on qt but makes it easier to - explicitly derive from qt3 or qt4 - -Tue Oct 14 11:47:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * templates/vc8platforms.mpt: - Updated SuperSonic SDK settings - -Fri Oct 10 08:58:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * templates/vc8platforms.mpt: - Add iphlpapi to WinCE6 - -Thu Oct 9 15:14:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * templates/vc8platforms.mpt: - Define UNDER_CE as $(CEVER) with WinCE6 - -Thu Oct 9 09:28:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * templates/vc8platforms.mpt: - Added Windows Mobile 6 Professional SDK (ARMV4I) - -Tue Oct 7 14:08:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - Revert change below, doesn't work as expected - - Tue Oct 7 13:55:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - * templates/nmakedll.mpt: - * templates/nmakeexe.mpt: - Include vc8platforms so that we can easily generate nmake projects for - WinCE platforms - -Tue Oct 7 13:55:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * templates/nmakedll.mpt: - * templates/nmakeexe.mpt: - Include vc8platforms so that we can easily generate nmake projects for - WinCE platforms - - * templates/vc8platforms.mpt: - Added new WinCE mobile platform - -Sat Oct 4 20:52:22 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * config/qt.mpb: - - Added support for building 64-bit. - - * modules/ProjectCreator.pm: - - Fixed a bug where Source_File scoped specific variable setting was - broken for any language but C++. - - * templates/make.net.mpd: - - Added macro settings for cat, cp, mv and /dev/null. - -Mon Sep 29 13:34:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * templates/bmake.mpd: - * templates/bmakecommon.mpt: - Added a unicode modifier so that the libs do get a u in the name - when we build with unicode - -Wed Sep 17 02:40:00 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * docs/README: - - Fixed a spelling error. - - * modules/MakeProjectCreator.pm: - * templates/make.net.mpd: - * templates/make.net.mpt: - - Changed the default csharp compiler to gmcs and added support for - the libs keyword and the packages template variable. - - * modules/ProjectCreator.pm: - - Always write the project if the user has provided a verbatim - within the project. - -Tue Sep 16 21:18:01 UTC 2008 Phil Mesnier <mesnier_p@ociweb.com> - - * modules/NMakeWorkspaceCreator.pm: - * modules/TemplateParser.pm: - * modules/VC7WorkspaceCreator.pm: - * templates/vc8.mpd: - - These changes all improve support for building cross-compiled - WinCE projects using Visual Studio. This specifically allows - for the exclusion of native-only apps, such as TAO_IDL from - building and deployment on cross compile targets. Also improves - the establishment of the correct WinCE 5 or WinCE 6 entry point - and sets the character set flag correctly. - -Tue Sep 16 08:35:19 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * config/ruby.mpb: - New base project for Ruby. - - * modules/BMakeWorkspaceCreator.pm: - Make sure we get unique names when we generate bmake with other - project types in one tree - - * templates/bmakedll.mpt: - * templates/bmakedllexe.mpt: - * templates/bmakelib.mpt: - * templates/bmakelibexe.mpt: - Changed extensions to get unique names with the bmake - so that we don't try to load a msvc dll when it also exists - -Mon Sep 15 20:50:19 UTC 2008 Adam Mitz <mitza@ociweb.com> - - * modules/Driver.pm: - - Added quotes around 'dynamic_types' in the diagnostic message. - -Sat Sep 13 15:50:22 UTC 2008 Adam Mitz <mitza@ociweb.com> - - * modules/Driver.pm: - - Change a warning to a non-warning diagnostic when a dynamic_types - path (from MPC.cfg) can't be found. This is a normal condition when - the dynamic_types path is based on an environment variable that may - not be set. + Explicitly set charset to get CharacterSet set when using + multiple platforms -Fri Sep 12 12:56:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> +Tue May 26 19:01:53 UTC 2009 Adam Mitz <mitza@ociweb.com> - Reverted change below, brakes VMS support - - Tue Sep 9 18:46:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - * mwc.pl: - * mpc.pl: - Use FindBin::RealScript to get the real script name, that also - works when we have a symbolic link with a different name to - one of these scripts. This fixes bugzilla 3407 - -Tue Sep 9 18:46:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * mwc.pl: - * mpc.pl: - Use FindBin::RealScript to get the real script name, that also - works when we have a symbolic link with a different name to - one of these scripts. This fixes bugzilla 3407 - -Fri Aug 22 07:04:17 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * mwc.pl: - * mpc.pl: - Use RealBin to get the location of this script, that gives the - real location also in case we use a symbolic link to these - scripts. - -Wed Aug 20 19:19:17 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * devtools/document_template.pl: - * devtools/highlight_template.pl: - Added missing shebang lines to fix rpm packaging warnings - -Wed Aug 20 08:33:17 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * clone_build_tree.pl: - * combine_dsw.pl: - * create_base.pl: - * depgen.pl: - * generate_export_header.pl: - * mpc.pl: - * mwc.pl: - * prj_install.pl: - * registry.pl: - * vs_postclean.pl: - Added missing shebang lines to fix rpm packaging warnings - -Wed Aug 13 19:31:17 UTC 2008 James H. Hill <hillj@isis.vanderbilt.edu> - - * config/gacutil.mpb: - - Bug fix where the path of the assembly to register, i.e., - the sharedname, was incorrect. This was resolved by using the - absolute pathname for the assembly instead of the relative - pathname. - -Wed Jul 30 14:52:28 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * config/lzo2.mbp: - Base project for lzo2 compression library - -Wed Jul 30 14:43:28 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * templates/wb26wrmakefile.mpd: - Convert a few environment variables to use / instead of \ - -Wed Jul 23 10:19:28 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> - - * config/gsl.mpb: - Added base project for GNU Scientific Library - -Fri Jul 18 19:09:10 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/Driver.pm: - * modules/FeatureParser.pm: - * modules/ProjectCreator.pm: - * modules/VC8ProjectCreator.pm: - * modules/WorkspaceCreator.pm: - - More non-functional code cleanup changes. - -Fri Jul 18 18:22:41 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/ProjectCreator.pm: - - Fixed a bug with the 'output_basename' template variable. For - Windows based project types, the input file used back-slashes and - taking basename() of that sort of text on UNIX will not result in - the expected value. We must ensure that the text passed to - basename() always has forward slashes. - -Fri Jul 18 17:58:58 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * templates/make.net.mpd: - - Fixed a bug where TARGETDIR was not set if there was no exeout set - and the project was an executable. - - * templates/automake.mpd: - * templates/bmake.mpd: - * templates/cccommon.mpt: - * templates/nmake.mpd: - * templates/vc7.mpd: - * templates/vc8vb.mpd: - * templates/wb26wrmakefile.mpd: - - Removed trailing white-space. - -Fri Jul 18 17:22:56 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/ProjectCreator.pm: - - Fixed a bug with the 'output_dirname' template variable. For - Windows based project types, the input file used back-slashes and - taking dirname() of that sort of text on UNIX will not result in - the expected value. We must ensure that the text passed to - dirname() always has forward slashes. - -Fri Jul 18 16:03:52 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * clone_build_tree.pl: - * combine_dsw.pl: - * create_base.pl: - * prj_install.pl: - * registry.pl: - * vs_postclean.pl: - * devtools/document_template.pl: - * devtools/highlight_template.pl: - * generate_export_header.pl: - * modules/AutomakeProjectCreator.pm: - * modules/AutomakeWorkspaceCreator.pm: - * modules/BCB2007ProjectCreator.pm: - * modules/BCB2007WorkspaceCreator.pm: - * modules/BDS4ProjectCreator.pm: - * modules/BDS4WorkspaceCreator.pm: - * modules/BMakeProjectCreator.pm: - * modules/BMakeWorkspaceCreator.pm: - * modules/CCProjectCreator.pm: - * modules/CCWorkspaceCreator.pm: - * modules/ConfigParser.pm: - * modules/Creator.pm: - * modules/DirectoryManager.pm: - * modules/Driver.pm: - * modules/EM3ProjectCreator.pm: - * modules/EM3WorkspaceCreator.pm: - * modules/FeatureParser.pm: - * modules/GHSProjectCreator.pm: - * modules/GHSWorkspaceCreator.pm: - * modules/HTMLProjectCreator.pm: - * modules/HTMLWorkspaceCreator.pm: - * modules/MPC.pm: - * modules/MWC.pm: - * modules/MakeProjectBase.pm: - * modules/MakeProjectCreator.pm: - * modules/MakeWorkspaceBase.pm: - * modules/MakeWorkspaceCreator.pm: - * modules/NMakeProjectCreator.pm: - * modules/NMakeWorkspaceCreator.pm: - * modules/Options.pm: - * modules/OutputMessage.pm: - * modules/Parser.pm: - * modules/ProjectCreator.pm: - * modules/SLEProjectCreator.pm: - * modules/SLEWorkspaceCreator.pm: - * modules/StringProcessor.pm: - * modules/TemplateInputReader.pm: - * modules/TemplateParser.pm: - * modules/VC6ProjectCreator.pm: - * modules/VC6WorkspaceCreator.pm: - * modules/VC71ProjectCreator.pm: - * modules/VC71WorkspaceCreator.pm: - * modules/VC7ProjectCreator.pm: - * modules/VC7WorkspaceCreator.pm: - * modules/VC8ProjectCreator.pm: - * modules/VC8WorkspaceCreator.pm: - * modules/VCProjectBase.pm: - * modules/WB26ProjectCreator.pm: - * modules/WB26WorkspaceCreator.pm: - * modules/WinProjectBase.pm: - * modules/WinWorkspaceBase.pm: - * modules/WorkspaceCreator.pm: - * modules/WorkspaceHelper.pm: - * modules/XMLProjectBase.pm: - - Cleaned up the code and added comments. There were no functional - changes made. - -Thu Jul 17 15:10:48 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/ProjectCreator.pm: - - We need to pass the 'commandflags' setting to the command helper, - not the hash map containing all of the type settings. - -Thu Jul 17 13:50:33 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/ProjectCreator.pm: - - Fixed a bug where a command helper returns output files for a - particular component type and file, but they were not taken into - account within the project. - - Also, fixed another bug relating to the group determiniation of - automatically added files. In doing so, the components for other - component types were being defined but set to an empty set which - was causing problems with automatically adding file to these - components. - -Wed Jul 16 16:11:33 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/CommandHelper.pm: - - Fixed a comment. - - * modules/ProjectCreator.pm: - - Delay replacing <%...%> that contain project keywords until they - are used by the template. Doing this allows the values to be used - regardless of the order in which keywords are processed within the - project. - -Tue Jul 15 16:08:40 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/CommandHelper.pm: - - Extended the interface to allow the helper to provide "tied" - custom files. - - * modules/ProjectCreator.pm: - - Made the following changes: - - 1) Added an optimization to generated_source_listed() to avoid - attempting to add custom generated files if they couldn't - possibly be generated. - 2) Added the ability for a command helper to "tie" files together - so that they are processed closely together. - 3) Fixed a bug where an output file could end up being listed more - than once in the custom output files value. - -Fri Jul 11 18:13:36 UTC 2008 Adam Mitz <mitza@ociweb.com> - - * vs_postclean.pl: - - " becomes ", not '. - -Fri Jul 11 15:18:27 UTC 2008 Adam Mitz <mitza@ociweb.com> - - * docs/README: - - Cleaned up some typos (stray semicolons) - - * vs_postclean.pl: - - Restore current directory after changing it. - Translate &, etc. - Added support for solutions, all referenced projects will be cleaned. - -Fri Jul 11 14:56:44 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * docs/README: - * modules/ProjectCreator.pm: - - Added a pseudo template variable, rmdir, which will be defined - depending upon the project type. It will be 'rmdir /s/q' on - Windows and 'rm -rf' on UNIX. - - * modules/AutomakeWorkspaceCreator.pm: - - Fixed a bug where the configure.ac.Makefiles did not contain the - correct names if the -name_modifier option was used. - - * modules/WorkspaceCreator.pm: - - Reduced op code count. - -Fri Jul 11 14:30:53 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * docs/README: * modules/ProjectCreator.pm: - Added a pseudo template variable, slash, which will be defined - depending upon the project type. - - * templates/make.net.mpt: - * templates/makedll.mpt: - - Rely on the slash psuedo template variable instead of defining one - in these template input files. - -Fri Jul 11 11:10:00 UTC 2008 Simon Massey <sma at prismtech dot com> - - * templates/make.net.mpt: - - Added dollar-Id-dollar to appease a non-MPC related script that, for - some reason, insists on applying it's influence on MPC. - -Thu Jul 10 22:34:12 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * vs_postclean.pl: - - Added a script to perform the postclean step for Visual Studio - projects. - -Thu Jul 10 19:03:14 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/Depgen/DependencyEditor.pm: - * modules/Depgen/DependencyGenerator.pm: - * modules/Depgen/DependencyWriter.pm: - * modules/Depgen/DependencyWriterFactory.pm: - * modules/Depgen/Driver.pm: - * modules/Depgen/MakeDependencyWriter.pm: - * modules/Depgen/MakeObjectGenerator.pm: - * modules/Depgen/NMakeDependencyWriter.pm: - * modules/Depgen/NMakeObjectGenerator.pm: - * modules/Depgen/ObjectGenerator.pm: - * modules/Depgen/ObjectGeneratorFactory.pm: - * modules/Depgen/Preprocessor.pm: - - Cleaned up the code and reduced op code count. - - * templates/vc7.mpd: - * templates/vc8.mpd: - - Added a VCPostCleanEventTool, which doesn't exist in Visual - Studio, to hold the 'postclean' settings. This is mainly here to - enable another script to come along and perform the postclean - function. + Changed hard-coded 'resource_files' to a call to get_resource_files, + which is a new method on ProjectCreator. get_resource_files + determines the name of 'resource_files' for the current language + based on the %language hash (for C# and VB this is 'resx_files'). -Thu Jul 10 18:28:33 UTC 2008 Chad Elliott <elliott_c@ociweb.com> +Mon May 25 11:03:31 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> - * docs/README: - * modules/ProjectCreator.pm: - - Added a new feature, pre_dirname, which is similar to pre_filename - except that the value is prepended to the output directory for - generated files. If a separate directory is desired, the - pre_dirname setting should end in a slash. - -Thu Jul 10 15:28:50 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * devtools/document_template.pl: - - Fixed a bug where template variables used within template - functions were ignored. - - * docs/README: - * modules/ProjectCreator.pm: - - Added the ability to utilize project settings within the - Define_Custom command, commandflags, dependent, output_option, - and postcommand settings. - -Thu Jul 10 14:29:44 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/MakeProjectCreator.pm: - * templates/make.net.mpd: - * templates/make.net.mpt: - * docs/templates/make.net.txt: - - Added support for compiling C# code using Mono. - - * modules/Creator.pm: - * modules/ProjectCreator.pm: - * modules/StringProcessor.pm: - * modules/TemplateParser.pm: - * modules/VC9ProjectCreator.pm: - * modules/VC9WorkspaceCreator.pm: - - Decreased op code count. - -Wed Jul 9 13:46:02 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/AutomakeProjectCreator.pm: - * modules/MakeProjectBase.pm: - * modules/Parser.pm: - - Reduce op code count. - - * modules/CommandHelper.pm: - - Added a debug message to assist users in figuring out why their - helper isn't being picked up. - - * modules/Creator.pm: - - Modified recursive_directory_list() to skip .svn and CVS - directories. - - * modules/ProjectCreator.pm: - - Fixed a very old and incorrect assumption that output file names - generated as part of a custom definition had to be longer than the - length of the input file name. - -Tue Jul 8 15:35:29 UTC 2008 Steve Huston <shuston@riverace.com> - - * templates/vc8.mpd: Allow a project to be a "make output" type using - the VCNMakeTool section instead of the usual compile, link, etc. - sections. This allows one to drive nmake-type projects from a - VC project. Also, enable setting the DebugInformationFormat even - when doing an optimize/Release build. Thanks to Kelly Hickel for - contributing these. - -Tue Jul 8 13:09:22 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/ProjectCreator.pm: - - Fixed a bug in my change from Thu Jul 3 11:46:23 UTC 2008. Files - were not being automatically added when they didn't exist on the - file system. - -Mon Jul 7 17:00:33 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * docs/README: - * modules/ProjectCreator.pm: - - MPC had always assumed that output files went into the same - directory as the input file (unless specified otherwise through - gendir). Now, in the Define_Custom for the command, this - assumption can be modified. If 'output_follows_input' is set to - 0, it will assume that output files go into the same directory as - the project (unless specified otherwise through gendir). - -Mon Jul 7 13:10:46 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/ProjectCreator.pm: - - Modified the behavior of adding to prebuild, postbuild, and - postclean. Values that are added are now separated via the - command separator for the project type. This will assure that - multiple commands are executed separately (and unconditionally). - -Thu Jul 3 16:36:30 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * docs/README: - * modules/Creator.pm: - * modules/ProjectCreator.pm: - - Added a new keyword, postclean, which is similar to postbuild - except that it is executed during the realclean target. - - * templates/bmake.mpd: - * templates/html.mpd: - * templates/make.mpd: - * templates/nmake.mpd: - - Added the use of postclean. - -Thu Jul 3 14:49:52 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/ProjectCreator.pm: - - For the previous change to generate_default_components(), we only - need to do this if the list of component tags was not provided to - the method. - -Thu Jul 3 11:46:23 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/ProjectCreator.pm: - - Fixed an issue where a chain of three or more Custom_Define's - would not have the right default input/output. - -Wed Jul 2 16:35:22 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/CommandHelper.pm: - * modules/ProjectCreator.pm: - - Modified the helper to be keyed off of the define custom name - instead of the define custom command name. - -Wed Jul 2 14:04:39 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/CommandHelper.pm: - * modules/ProjectCreator.pm: - - Added a command helper that can be dynamically loaded to assist - the project creator in determining which files will be generated - by a command. This is useful when the output of a file can not be - represented by the usual Define_Custom syntax. - -Mon Jun 30 14:55:51 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * modules/StringProcessor.pm: - - Added a simple fgrep function that will find a string in an array - reference. - - * modules/ProjectCreator.pm: - - Fixed a bug where custom defines that generate output that can be - used as automatic input to other custom defines did not work - properly. Now, they are automatically added when possible. - -Fri Jun 27 12:59:39 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * config/ixml.mpb: - * config/upnp.mpb: - - Added base projects for use with the open source project Linux SDK - for UPnP Devices. - - * docs/README: - * modules/ProjectCreator.pm: - - Split the functionality of the 'automatic' keyword into to two. - 'automatic_in' now specifies that input files are automatically - added and 'automatic_out' specifies that generated output files - are automatically added to the project. These both default to - true as 'automatic' did. 'automatic' is still accepted, but - deprecated. - -Wed Jun 25 21:38:16 UTC 2008 Adam Mitz <mitza@ociweb.com> - - * docs/README: - - Documented the following changes. - - * modules/ProjectCreator.pm: - * modules/VC7ProjectCreator.pm: - * modules/WinProjectBase.pm: - - Added the <%cmdsep%> pseudovariable that can be used in prebuild, - postbuild, and postcommand. It works like <%and%> and <%or%> but it - unconditionally runs the right-hand side command. - For postcommand, added <%input_dirname%> and <%output_dirname%> which - work like their <%*_basename%> counterparts but return the directory - portion of the file name. - -Thu Jun 19 01:27:55 UTC 2008 James H. Hill <hillj@isis.vanderbilt.edu> - - * config/boost_system.mpb: - - Base project for using the Boost system library. - -Tue Jun 17 17:16:07 UTC 2008 Chad Elliott <elliott_c@ociweb.com> - - * docs/templates/make.txt: - - Document the 'depgen_flags' template variable. - - * combine_dsw.pl: - * create_base.pl: - * depgen.pl: - * generate_export_header.pl: - * mpc.pl: - * mwc.pl: - * prj_install.pl: - * registry.pl: - * modules/ConfigParser.pm: - * modules/Creator.pm: - * modules/DirectoryManager.pm: - * modules/Driver.pm: - * modules/FeatureParser.pm: - * modules/GUID.pm: - * modules/MakeWorkspaceBase.pm: - * modules/Options.pm: - * modules/OutputMessage.pm: - * modules/Parser.pm: - * modules/ProjectCreator.pm: - * modules/StringProcessor.pm: - * modules/TemplateInputReader.pm: - * modules/TemplateParser.pm: - * modules/VCProjectBase.pm: - * modules/Version.pm: - * modules/WinProjectBase.pm: - * modules/WinWorkspaceBase.pm: - * modules/WorkspaceCreator.pm: - * modules/WorkspaceHelper.pm: - - Removed unnecessary parenthesis around variable declarations. - This provides a very minor performance increase due to reduced - perl op codes. - -Tue Jun 10 14:45:18 UTC 2008 Adam Mitz <mitza@ociweb.com> - - * templates/make.mpd: - * templates/makedll.mpt: - - Enhanced support for MinGW with "-type make". + * templates/vc8platforms.mpt: + Added a new target and corrected some wince versions -Fri May 30 15:54:22 UTC 2008 Chad Elliott <elliott_c@ociweb.com> +Sun May 24 18:46:31 UTC 2009 Chad Elliott <elliott_c@ociweb.com> - * MPC version 3.6.0 released. + * MPC version 3.7.0 released. Local Variables: mode: change-log diff --git a/clone_build_tree.pl b/clone_build_tree.pl index ec624001..a374ed5f 100755 --- a/clone_build_tree.pl +++ b/clone_build_tree.pl @@ -82,7 +82,7 @@ sub findCallback { ! /^.*\.pdb\z/s && ! /^.*\.pch\z/s && ! /^.*\.log\z/s && - ! /^.*\.d\z/s + ! ( -f $_ && /^.*\.d\z/s ) ); if ($matches) { diff --git a/config/boost_date_time.mpb b/config/boost_date_time.mpb index 0621ffd2..9e7165f6 100644 --- a/config/boost_date_time.mpb +++ b/config/boost_date_time.mpb @@ -2,7 +2,7 @@ // $Id$ project: boost_base { - specific(!vc6, !vc7, !vc71, !vc8, !vc9, !vc10, !nmake, !em3, !bmake, !bds4) { + specific(!prop:windows) { lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_date_time$(BOOST_CFG) } } diff --git a/config/boost_filesystem.mpb b/config/boost_filesystem.mpb index e010ae55..144da5de 100644 --- a/config/boost_filesystem.mpb +++ b/config/boost_filesystem.mpb @@ -2,7 +2,7 @@ // $Id$ project: boost_base { - specific(!vc6, !vc7, !vc71, !vc8, !vc9, !vc10, !nmake, !em3, !bmake, !bds4) { + specific(!prop:windows) { lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_filesystem$(BOOST_CFG) } } diff --git a/config/boost_iostreams.mpb b/config/boost_iostreams.mpb index bc47affc..2e439122 100644 --- a/config/boost_iostreams.mpb +++ b/config/boost_iostreams.mpb @@ -2,7 +2,7 @@ // $Id$ project: boost_base { - specific(!vc6, !vc7, !vc71, !vc8, !vc9, !vc10, !nmake, !em3, !bmake, !bds4) { + specific(!prop:windows) { lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_iostreams$(BOOST_CFG) } } diff --git a/config/boost_prg_exec_monitor.mpb b/config/boost_prg_exec_monitor.mpb index 6c67db4f..b7c7bc14 100644 --- a/config/boost_prg_exec_monitor.mpb +++ b/config/boost_prg_exec_monitor.mpb @@ -2,7 +2,7 @@ // $Id$ project: boost_base { - specific(!vc6, !vc7, !vc71, !vc8, !vc9, !vc10, !nmake, !em3, !bmake, !bds4) { + specific(!prop:windows) { lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_prg_exec_monitor$(BOOST_CFG) } } diff --git a/config/boost_program_options.mpb b/config/boost_program_options.mpb index 526ee1b4..de449951 100644 --- a/config/boost_program_options.mpb +++ b/config/boost_program_options.mpb @@ -2,7 +2,7 @@ // $Id$ project: boost_base { - specific(!vc6, !vc7, !vc71, !vc8, !vc9, !vc10, !nmake, !em3, !bmake, !bds4) { + specific(!prop:windows) { lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_program_options$(BOOST_CFG) } } diff --git a/config/boost_regex.mpb b/config/boost_regex.mpb index 7e95d934..0a5b9bab 100644 --- a/config/boost_regex.mpb +++ b/config/boost_regex.mpb @@ -2,7 +2,7 @@ // $Id$ project: boost_base { - specific(!vc6, !vc7, !vc71, !vc8, !vc9, !vc10, !nmake, !em3, !bmake, !bds4) { + specific(!prop:windows) { lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_regex$(BOOST_CFG) } } diff --git a/config/boost_serialization.mpb b/config/boost_serialization.mpb index 402bea59..9196bd92 100644 --- a/config/boost_serialization.mpb +++ b/config/boost_serialization.mpb @@ -2,7 +2,7 @@ // $Id$ project: boost_base { - specific(!vc6, !vc7, !vc71, !vc8, !vc9, !vc10, !nmake, !em3, !bmake, !bds4) { + specific(!prop:windows) { lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_serialization$(BOOST_CFG) } } diff --git a/config/boost_signals.mpb b/config/boost_signals.mpb index fe273b37..63707ad2 100644 --- a/config/boost_signals.mpb +++ b/config/boost_signals.mpb @@ -2,7 +2,7 @@ // $Id$ project: boost_base { - specific(!vc6, !vc7, !vc71, !vc8, !vc9, !vc10, !nmake, !em3, !bmake, !bds4) { + specific(!prop:windows) { lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_signals$(BOOST_CFG) } } diff --git a/config/boost_system.mpb b/config/boost_system.mpb index 6f3f616e..ba95ed2b 100644 --- a/config/boost_system.mpb +++ b/config/boost_system.mpb @@ -2,7 +2,7 @@ // $Id$ project: boost_base { - specific(!vc6, !vc7, !vc71, !vc8, !vc9, !vc10, !nmake, !em3, !bmake, !bds4) { + specific(!prop:windows) { lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_system$(BOOST_CFG) } } diff --git a/config/boost_test_exec_monitor.mpb b/config/boost_test_exec_monitor.mpb index 020960c3..06de4742 100644 --- a/config/boost_test_exec_monitor.mpb +++ b/config/boost_test_exec_monitor.mpb @@ -2,7 +2,7 @@ // $Id$ project: boost_base { - specific(!vc6, !vc7, !vc71, !vc8, !vc9, !vc10, !nmake, !em3, !bmake, !bds4) { + specific(!prop:windows) { lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_test_exec_monitor$(BOOST_CFG) } } diff --git a/config/boost_thread.mpb b/config/boost_thread.mpb index 931e6fe4..a3d0c7cc 100644 --- a/config/boost_thread.mpb +++ b/config/boost_thread.mpb @@ -2,7 +2,7 @@ // $Id$ project: boost_base { - specific(!vc6, !vc7, !vc71, !vc8, !vc9, !vc10, !nmake, !em3, !bmake, !bds4) { + specific(!prop:windows) { lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_thread$(BOOST_CFG) } } diff --git a/config/boost_unit_test_framework.mpb b/config/boost_unit_test_framework.mpb index 9a41f1f4..bea8d7b1 100644 --- a/config/boost_unit_test_framework.mpb +++ b/config/boost_unit_test_framework.mpb @@ -3,9 +3,9 @@ project: boost_base { // Starting with boost 1.34 auto linking is enabled. - // !vc6 and !vc7 are left out of this list because it is likely that + // vc6 and vc7 are added to this list because it is likely that // any vc6 or vc7 users are using an older pre-auto-linking version. - specific(!vc71, !vc8, !vc9, !vc10, !nmake, !em3, !bmake, !bds4) { + specific(!prop:windows, vc6, vc7) { lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) } } diff --git a/config/boost_wave.mpb b/config/boost_wave.mpb index ee80c7a0..dcf8664b 100644 --- a/config/boost_wave.mpb +++ b/config/boost_wave.mpb @@ -2,7 +2,7 @@ // $Id$ project: boost_base { - specific(!vc6, !vc7, !vc71, !vc8, !vc9, !vc10, !nmake, !em3, !bmake, !bds4) { + specific(!prop:windows) { lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_wave$(BOOST_CFG) } } diff --git a/config/bzip2.mpb b/config/bzip2.mpb index c8b61daa..e2f51492 100644 --- a/config/bzip2.mpb +++ b/config/bzip2.mpb @@ -5,13 +5,10 @@ feature(bzip2) { includes += $(BZIP2_ROOT)/include libpaths += $(BZIP2_ROOT)/lib macros += USE_BZIP2 - specific (em3, vc6, vc7, vc71, vc8, vc9, vc10, nmake) { - lit_libs += bzip2 - } - specific(bmake, bds4) { + + specific(prop:windows) { lit_libs += bzip2 - } - specific (gnuace, make, sle, automake, ghs) { + } else { lit_libs += bz2 } } diff --git a/config/lzo1.mpb b/config/lzo1.mpb index 13b620e0..dd145771 100644 --- a/config/lzo1.mpb +++ b/config/lzo1.mpb @@ -4,13 +4,9 @@ feature(lzo1) { includes += $(LZO1_ROOT)/include libpaths += $(LZO1_ROOT)/lib - specific (em3, vc6, vc7, vc71, vc8, vc9, vc10, nmake) { + specific (prop:microsoft) { lit_libs += liblzo - } - specific(bmake, bds4) { - lit_libs += lzo - } - specific (gnuace, make, sle, automake, ghs) { + } else { lit_libs += lzo } } diff --git a/config/mpich.mpb b/config/mpich.mpb index 8de01d1c..69bb8f9c 100644 --- a/config/mpich.mpb +++ b/config/mpich.mpb @@ -5,7 +5,7 @@ project { libpaths += $(MPI_ROOT)/lib requires += mpi - specific(vc6, vc7, vc71, vc8, vc9, vc10) { + specific(prop:windows) { lit_libs += mpi } else { lit_libs += mpich pmpich diff --git a/config/nddslib.mpb b/config/nddslib.mpb index 777f3e60..ce95fbd6 100644 --- a/config/nddslib.mpb +++ b/config/nddslib.mpb @@ -2,15 +2,13 @@ // $Id$ project { - libs += nddscpp nddsc nddscore - libpaths += $(NDDSHOME)/lib/$(NDDSARCHITECTURE) - includes += $(NDDSHOME)/include $(NDDSHOME)/include/ndds + libs += nddscpp nddsc nddscore + libpaths += $(NDDSHOME)/lib/$(NDDSARCHITECTURE) + includes += $(NDDSHOME)/include $(NDDSHOME)/include/ndds - specific(nmake, vc71, vc8, vc9, vc10) { - macros += RTI_WIN32 NDDS_DLL_VARIABLE - } - - specific(make, gnuace) { - macros += RTI_UNIX + specific(prop:windows) { + macros += RTI_WIN32 NDDS_DLL_VARIABLE + } else { + macros += RTI_UNIX } } diff --git a/config/odbc.mpb b/config/odbc.mpb index e91316e3..b1873dd0 100644 --- a/config/odbc.mpb +++ b/config/odbc.mpb @@ -1,7 +1,7 @@ // $Id$ project { - specific(vc6, vc7, vc71, vc8, vc9, vc10, nmake) { + specific(prop:windows) { // Out of the box, Windows supports ODBC since ODBC originated // on Windows. We, however, need to ensure that UnixODBC and // iODBC are not enabled. We may be able to drop the 'avoids' diff --git a/config/openssl.mpb b/config/openssl.mpb index 81fc8958..88a6d9e4 100644 --- a/config/openssl.mpb +++ b/config/openssl.mpb @@ -9,24 +9,24 @@ feature(openssl) { includes += $(SSL_ROOT)/include libpaths += $(SSL_ROOT)/lib - specific(gnuace, make, sle, automake, ghs) { + specific(prop:windows) { + lit_libs += libeay32 ssleay32 + includes += $(SSL_ROOT)/inc32 + libpaths += $(SSL_ROOT)/out32dll $(SSL_ROOT)/out32 + } else { lit_libs += ssl crypto // Some Linux OpenSSL installations compile in Kerberos support. Add // the Kerberos include path to preprocessor include path. includes += /usr/kerberos/include - } else { - lit_libs += libeay32 ssleay32 - includes += $(SSL_ROOT)/inc32 - libpaths += $(SSL_ROOT)/out32dll $(SSL_ROOT)/out32 } // Some prepackaged installations of OpenSSL have libraries in different // locations. - specific(bmake) { + specific(prop:borland) { libpaths += $(SSL_ROOT)/lib/Builder5 } - specific(nmake, vc6, vc7, vc71, vc8, vc9, vc10) { + specific(prop:microsoft) { libpaths += $(SSL_ROOT)/lib/VC } } diff --git a/config/splicelib.mpb b/config/splicelib.mpb index 35acf765..62d1f22f 100644 --- a/config/splicelib.mpb +++ b/config/splicelib.mpb @@ -11,7 +11,11 @@ project { $(OSPL_HOME)/include/dcps/C++/CCPP/$(SPLICE_ORB) \ $(OSPL_HOME)/custom_lib/ccpp - specific(nmake, vc71, vc8, vc9, vc10) { + specific(prop:microsoft) { DisableSpecificWarnings += 4101 } + + verbatim(gnuace, macros) { + override no_hidden_visibility = 1 + } } diff --git a/config/sqlite3.mpb b/config/sqlite3.mpb index 6fb3c18a..aeee567e 100644 --- a/config/sqlite3.mpb +++ b/config/sqlite3.mpb @@ -2,13 +2,7 @@ project { requires += sqlite3 - includes += $(SQLITE_ROOT)/include libpaths += $(SQLITE_ROOT)/lib - - specific (vc6, vc7, vc71, vc8, vc9, vc10, nmake) { - lit_libs += sqlite3 - } else { - libs += sqlite3 - } + lit_libs += sqlite3 } diff --git a/config/swig_perl.mpb b/config/swig_perl.mpb index 15557eb2..e3d655b6 100644 --- a/config/swig_perl.mpb +++ b/config/swig_perl.mpb @@ -13,7 +13,7 @@ project { requires += swig_perl includes += $(PERL5_INCLUDE)/. libpaths += $(PERL5_INCLUDE)/. - specific(bds4, bmake, nmake, vc6, vc7, vc71, vc8, vc9, vc10) { + specific(prop:windows) { lit_libs += $(PERL5_LIB) } } diff --git a/config/udm.mpb b/config/udm.mpb index ecc39d98..c4b8a9e6 100644 --- a/config/udm.mpb +++ b/config/udm.mpb @@ -11,12 +11,12 @@ project : xerces { midl_includes += $(GME_ROOT) $(GME_ROOT)/Interfaces . } - specific (nmake, vc71, vc8, vc9, vc10) { + specific(prop:microsoft) { compile_flags += /wd4251 } - Define_Custom (UDM) { - automatic = 0 + Define_Custom(UDM) { + automatic = 1 dependent = $(UDM_PATH)/bin/Udm command = <%quote%>$(UDM_PATH)<%quote%>/bin/Udm inputext = .xml diff --git a/config/xerces.mpb b/config/xerces.mpb index f7b317f5..338bdb54 100644 --- a/config/xerces.mpb +++ b/config/xerces.mpb @@ -8,7 +8,7 @@ feature(xerces2) { includes += $(XERCESCROOT)/include libpaths += $(XERCESCROOT)/lib - specific (em3, vc6, vc7, vc71, vc8, vc9, vc10, nmake) { + specific(prop:microsoft) { xerceslib = xerces-c_2 // Linking the optimized version of xerces-c_2 into a debug application @@ -16,10 +16,10 @@ feature(xerces2) { // will link in the debug version for the "Debug" configuration. Debug::xerceslib = xerces-c_2D } - specific(bmake, bds4) { + specific(prop:borland) { xerceslib = XercesLib } - specific (gnuace, make, sle, automake, ghs) { + specific(!prop:windows) { macros += XML_USE_PTHREADS xerceslib = xerces-c } @@ -33,7 +33,7 @@ feature(xerces3) { includes += $(XERCESCROOT)/include libpaths += $(XERCESCROOT)/lib - specific (em3, vc6, vc7, vc71, vc8, vc9, vc10, nmake) { + specific(prop:microsoft) { xerceslib = xerces-c_3 // Linking the optimized version of xerces-c_2 into a debug application @@ -41,10 +41,10 @@ feature(xerces3) { // will link in the debug version for the "Debug" configuration. Debug::xerceslib = xerces-c_3D } - specific(bmake, bds4) { + specific(prop:borland) { xerceslib = XercesLib } - specific (gnuace, make, sle, automake, ghs) { + specific(!prop:windows) { macros += XML_USE_PTHREADS xerceslib = xerces-c } diff --git a/config/zlib.mpb b/config/zlib.mpb index 0d5842f2..619da08a 100644 --- a/config/zlib.mpb +++ b/config/zlib.mpb @@ -8,10 +8,10 @@ feature(zlib) { // @@ Notice: If you are building with Cygwin, you may need to manually // change the following library to zlib. - specific(gnuace, make, sle, automake, ghs) { - lit_libs += z - } else { + specific(prop:windows) { zlibname = zlib lit_libs += $(ZLIBNAME) + } else { + lit_libs += z } } diff --git a/config/zzip.mpb b/config/zzip.mpb index ac8fb0be..39125e50 100644 --- a/config/zzip.mpb +++ b/config/zzip.mpb @@ -9,9 +9,9 @@ feature(zzip): zlib { // @@ Notice: If you are building with Cygwin, you may need to manually // change the following library to zziplib. - specific(gnuace, make, sle, automake, ghs) { - lit_libs += zzip - } else { + specific(prop:windows) { libs += zziplib + } else { + lit_libs += zzip } } diff --git a/devtools/document_template.pl b/devtools/document_template.pl index 277a5b37..bd143511 100755 --- a/devtools/document_template.pl +++ b/devtools/document_template.pl @@ -118,6 +118,11 @@ sub display_template { $def .= StringProcessor::process_special(undef, $ikey); } } + + ## Convert < and > to html friendly codes + $desc =~ s/</</g; + $desc =~ s/>/>/g; + print $fh " <tr>\n", " <td>$key</td>\n", " <td>", (defined $def ? $def : ' '), "</td>\n", diff --git a/docs/README b/docs/README index 851e3116..cd21fe79 100644 --- a/docs/README +++ b/docs/README @@ -264,16 +264,17 @@ verbatim This allows arbitrary information to be place in a generated inside double quotes. specific This scope allows assignments that are specific to a - particular project type. The syntax is as follows: + particular project type or property. The syntax is as + follows: - specific(<project type> [, <project type> ...]) { + specific(<proj_type|prop:prop_name> [, <proj_type|prop:prop_name> ...]) { lit_libs += c ... } or - specific(<project type> [, <project type> ...]) { + specific(<proj_type|prop:prop_name> [, <proj_type|prop:prop_name> ...]) { lit_libs += c ... } else { @@ -287,6 +288,32 @@ specific This scope allows assignments that are specific to a the specific to be evaluated for all types except the type specified. + The following property names are available: borland, make, + microsoft, and windows. The table below shows which + properties apply to which project types. + + | borland | make | microsoft | windows | + ---------+---------+------+-----------+---------| + automake | | X | | | + bcb2007 | X | | | X | + bcb2009 | X | | | X | + bds4 | X | | | X | + bmake | X | X | | X | + cc | | | | X | + em3 | | | X | X | + ghs | | | | ? | + make | | X | | | + nmake | | X | X | X | + vc6 | | | X | X | + vc7 | | | X | X | + vc71 | | | X | X | + vc8 | | | X | X | + vc9 | | | X | X | + vc10 | | | X | X | + + ? - indicates that this is controled by the MPC_GHS_UNIX + environment variable. + If a keyword is not recognized as a valid MPC keyword, it is interpreted as a template value modifier. In this situation, this construct has the exact same restrictions as diff --git a/docs/fm/MakeProjectCreator.fm b/docs/fm/MakeProjectCreator.fm Binary files differnew file mode 100644 index 00000000..724084f2 --- /dev/null +++ b/docs/fm/MakeProjectCreator.fm diff --git a/docs/fm/images/OCILOGO_bw_book.eps b/docs/fm/images/OCILOGO_bw_book.eps Binary files differnew file mode 100644 index 00000000..708fd10a --- /dev/null +++ b/docs/fm/images/OCILOGO_bw_book.eps diff --git a/docs/fm/images/mpc.fig b/docs/fm/images/mpc.fig new file mode 100644 index 00000000..34053cba --- /dev/null +++ b/docs/fm/images/mpc.fig @@ -0,0 +1,74 @@ +#FIG 3.2 +Landscape +Center +Inches +Letter +100.00 +Single +-2 +1200 2 +6 150 150 6075 5400 +6 150 150 6075 5400 +6 150 150 6075 5400 +6 4200 2550 4875 2850 +2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 6 + 4200 2700 4650 2700 4650 2850 4875 2700 4650 2550 4650 2700 +-6 +6 1350 2550 2325 2850 +2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 6 + 1350 2700 2100 2700 2100 2850 2325 2700 2100 2550 2100 2700 +-6 +6 4875 1875 6075 3525 +2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5 + 4875 1875 6075 1875 6075 3525 4875 3525 4875 1875 +4 0 0 50 0 0 16 0.0000 4 225 930 4950 3225 dsp, etc.)\001 +4 0 0 50 0 0 16 0.0000 4 225 735 4950 3000 vcproj,\001 +4 0 0 50 0 0 16 0.0000 4 210 1035 4950 2775 (Makefile,\001 +4 0 0 50 0 0 16 0.0000 4 165 390 5250 2400 File\001 +4 0 0 50 0 0 16 0.0000 4 225 690 5100 2175 Project\001 +-6 +6 2325 2025 4200 3300 +2 4 0 1 0 7 50 0 -1 0.000 0 0 7 0 0 5 + 4200 3300 4200 2025 2325 2025 2325 3300 4200 3300 +4 0 0 50 0 0 16 0.0000 4 225 1305 2625 2625 Make Project\001 +4 0 0 50 0 0 16 0.0000 4 165 750 2850 2850 Creator\001 +-6 +6 150 3825 1350 5400 +5 1 0 1 0 7 50 0 -1 0.000 0 1 0 0 750.000 4050.000 150 5175 750 5325 1350 5175 +1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 750 3937 600 112 150 3825 1350 4050 +2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 + 150 3975 150 5175 +2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 + 1350 3975 1350 5175 +4 0 0 50 0 0 16 0.0000 4 225 930 300 4500 Template\001 +4 0 0 50 0 0 16 0.0000 4 225 960 300 4725 Input File\001 +-6 +6 150 1950 1350 3525 +5 1 0 1 0 7 50 0 -1 0.000 0 1 0 0 750.000 2175.000 150 3300 750 3450 1350 3300 +1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 750 2062 600 112 150 1950 1350 2175 +2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 + 150 2100 150 3300 +2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 + 1350 2100 1350 3300 +4 0 0 50 0 0 16 0.0000 4 225 930 300 2625 Template\001 +4 0 0 50 0 0 16 0.0000 4 165 390 525 2850 File\001 +-6 +6 150 150 1350 1725 +5 1 0 1 0 7 50 0 -1 0.000 0 1 0 0 750.000 375.000 150 1500 750 1650 1350 1500 +1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 750 262 600 112 150 150 1350 375 +2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 + 150 300 150 1500 +2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 + 1350 300 1350 1500 +4 0 0 50 0 0 16 0.0000 4 165 390 525 1125 File\001 +4 0 0 50 0 0 16 0.0000 4 165 525 450 900 MPC\001 +-6 +6 1350 900 1650 4575 +2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 4 + 1350 900 1650 900 1650 4575 1350 4575 +-6 +-6 +-6 +-6 +4 0 0 50 0 0 12 0.0000 4 15 135 450 2925 \001 +4 0 0 50 0 0 12 0.0000 4 15 45 5025 2775 \001 diff --git a/docs/fm/images/mpc.gif b/docs/fm/images/mpc.gif Binary files differnew file mode 100644 index 00000000..a2b78e70 --- /dev/null +++ b/docs/fm/images/mpc.gif diff --git a/docs/fm/images/mpc_mtiff.eps b/docs/fm/images/mpc_mtiff.eps Binary files differnew file mode 100644 index 00000000..925cdb68 --- /dev/null +++ b/docs/fm/images/mpc_mtiff.eps diff --git a/docs/fm/images/mwc.fig b/docs/fm/images/mwc.fig new file mode 100644 index 00000000..af204e93 --- /dev/null +++ b/docs/fm/images/mwc.fig @@ -0,0 +1,46 @@ +#FIG 3.2 +Landscape +Center +Inches +Letter +100.00 +Single +-2 +1200 2 +6 225 225 6375 1875 +6 1425 900 2025 1200 +2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 6 + 1425 1050 1800 1050 1800 1200 2025 1050 1800 900 1800 1050 +-6 +6 4275 900 4875 1200 +2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 6 + 4275 1050 4650 1050 4650 1200 4875 1050 4650 900 4650 1050 +-6 +6 225 300 1425 1875 +6 225 300 1425 1875 +5 1 0 1 0 7 50 0 -1 0.000 0 1 0 0 825.000 525.000 225 1650 825 1800 1425 1650 +1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 825 412 600 112 225 300 1425 525 +2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 + 1425 450 1425 1650 +2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 + 225 450 225 1650 +-6 +4 0 0 50 0 0 16 0.0000 4 165 390 600 1275 File\001 +4 0 0 50 0 0 16 0.0000 4 165 630 450 1050 MWC\001 +-6 +6 2025 375 4275 1650 +2 4 0 1 0 7 50 0 -1 0.000 0 0 7 0 0 5 + 4275 1650 4275 375 2025 375 2025 1650 4275 1650 +4 0 0 50 0 0 16 0.0000 4 165 750 2775 1200 Creator\001 +4 0 0 50 0 0 16 0.0000 4 225 1710 2325 975 Make Workspace\001 +-6 +6 4875 225 6375 1875 +2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5 + 4875 225 6375 225 6375 1875 4875 1875 4875 225 +4 0 0 50 0 0 16 0.0000 4 225 1095 5025 600 Workspace\001 +4 0 0 50 0 0 16 0.0000 4 165 390 5400 825 File\001 +4 0 0 50 0 0 16 0.0000 4 210 1035 5100 1125 (Makefile,\001 +4 0 0 50 0 0 16 0.0000 4 180 915 5100 1425 dsw, sln,\001 +4 0 0 50 0 0 16 0.0000 4 210 480 5100 1650 etc.)\001 +-6 +-6 diff --git a/docs/fm/images/mwc.gif b/docs/fm/images/mwc.gif Binary files differnew file mode 100644 index 00000000..79f3a6c4 --- /dev/null +++ b/docs/fm/images/mwc.gif diff --git a/docs/fm/images/mwc_mtiff.eps b/docs/fm/images/mwc_mtiff.eps Binary files differnew file mode 100644 index 00000000..44002530 --- /dev/null +++ b/docs/fm/images/mwc_mtiff.eps diff --git a/docs/templates/vc8csharp.txt b/docs/templates/vc8csharp.txt index fb2e6b22..1768d087 100644 --- a/docs/templates/vc8csharp.txt +++ b/docs/templates/vc8csharp.txt @@ -13,6 +13,8 @@ prversion = This setting specifies the ProductVersion in the generated .csproj f registerforcominterop = This setting corresponds to the Build Output property "Register for COM interop". The boolean values true and false correspond to enabling or disabling the feature in the IDE. schemaversion = This setting specifies the SchemaVersion in the generated .csproj file. startupobject = This corresponds to the Application property "Startup object". +toolsversion = The ToolsVersion attribute of the Project XML element. trace = This setting corresponds to the Build General property "Conditional Compilation Constants". If this boolean template variable is set, the TRACE constant will be defined. warning_level = This corresponds to the Build General property "Warning level". Valid values are 0 through 4. winapp = This boolean template variable indicates whether the application target is for the Console or Windows subsystem. +xmlheader = Enable the <?xml ...?> header.
\ No newline at end of file diff --git a/history/ChangeLog-3_6 b/history/ChangeLog-3_6 new file mode 100644 index 00000000..2ca55abe --- /dev/null +++ b/history/ChangeLog-3_6 @@ -0,0 +1,1248 @@ +Sun May 24 18:43:56 UTC 2009 Chad Elliott <elliott_c@ociweb.com> + + * devtools/document_template.pl: + + Added code to convert less than and greater than signs into html + friendly codes. + +Fri May 22 07:51:05 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/vc8platforms.mpt: + Added some more WinCE SDKs + +Wed May 13 18:03:05 UTC 2009 Adam Mitz <mitza@ociweb.com> + + * modules/VC9ProjectCreator.pm: + * templates/vc8csharp.mpd: + * docs/templates/vc8csharp.txt: + + Added support for Visual C# with -type vc9 (Visual Studio 2008). + +Thu May 7 21:12:17 UTC 2009 Adam Mitz <mitza@ociweb.com> + + * modules/Driver.pm: + + Removed a debugging print statement. + +Thu May 7 19:18:24 UTC 2009 Chad Elliott <elliott_c@ociweb.com> + + * modules/ConfigParser.pm: + * modules/Driver.pm: + + Modified the locate_dynamic_directories code to only warn the user + if the path doesn't contain environment variables or the + environment variables that it does contain are set. + + * modules/ProjectCreator.pm: + + Fixed a perl warning about an uninitialized variable. + +Thu May 7 15:39:17 UTC 2009 Chad Elliott <elliott_c@ociweb.com> + + * docs/README: + * modules/BCB2007ProjectCreator.pm: + * modules/BDS4ProjectCreator.pm: + * modules/BMakeProjectCreator.pm: + * modules/BorlandProjectBase.pm: + * modules/GHSProjectCreator.pm: + * modules/MakeProjectBase.pm: + * modules/NMakeProjectCreator.pm: + * modules/ProjectCreator.pm: + * modules/VCProjectBase.pm: + * modules/WinProjectBase.pm: + + Modified the 'specific' clause to accept "properties" in addition + to project types. Maintaining project type lists within the base + projects was getting out of hand. A simpler approach is to apply + properties to groups of project types, such as project types that + are only used on Windows. These properties are referenced within + the 'specific' clause instead of project types. See the README + for more details. + + * config/boost_date_time.mpb: + * config/boost_filesystem.mpb: + * config/boost_iostreams.mpb: + * config/boost_prg_exec_monitor.mpb: + * config/boost_program_options.mpb: + * config/boost_regex.mpb: + * config/boost_serialization.mpb: + * config/boost_signals.mpb: + * config/boost_system.mpb: + * config/boost_test_exec_monitor.mpb: + * config/boost_thread.mpb: + * config/boost_unit_test_framework.mpb: + * config/boost_wave.mpb: + * config/bzip2.mpb: + * config/lzo1.mpb: + * config/mpich.mpb: + * config/nddslib.mpb: + * config/odbc.mpb: + * config/openssl.mpb: + * config/splicelib.mpb: + * config/sqlite3.mpb: + * config/swig_perl.mpb: + * config/udm.mpb: + * config/xerces.mpb: + * config/zlib.mpb: + * config/zzip.mpb: + + Modified all of these base projects to use properties instead of + project types within the 'specific' clauses. + + * modules/VC10ProjectCreator.pm: + * modules/VC10WorkspaceCreator.pm: + * modules/VC9WorkspaceCreator.pm: + + Removed duplicated code. + +Tue May 5 17:37:29 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> + + * config/splicelib.mpb: + + Added verbatim line for gnuace that turns off visibility + discrimination. OpenSpliceDDS doesn't yet support versions + of g++ that handle hidden visibility. + +Fri May 1 14:09:49 UTC 2009 Adam Mitz <mitza@ociweb.com> + + * clone_build_tree.pl: + + Don't skip directories ending in .d since ACE now contains rc.d + and init.d directories. + +Wed Apr 29 11:39:32 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/vc8platforms.mpt: + Add eBox 2300 and 4300 Windows CE 6 + +Fri Apr 24 20:37:40 UTC 2009 James H. Hill <hillj@isis.vanderbilt.edu> + + * config/udm.mpb: + + Changed 'automatic' to 1. + +Fri Apr 17 15:20:32 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/fm/*: + Added FrameMaker 8 files for the MPC pdf file. When making changes + make sure track changes is enabled. + + This documentation is based on original work contributed by + Object Computing, Inc. (OCI), St. Louis, MO, USA, + http://www.ociweb.com. + +Thu Apr 9 21:37:52 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com> + + * config/udm.mpb: + + Fuzz fix. + +Thu Apr 9 16:57:57 UTC 2009 James H. Hill <hillj@isis.vanderbilt.edu> + + * config/udm.mpb: + + Mapped 'commandflags' -> 'udmflags' + +Thu Apr 9 16:48:31 UTC 2009 James H. Hill <hillj@isis.vanderbilt.edu> + + * config/udm.mpb: + + Bug fix in the project specification. + +Thu Apr 9 16:42:43 UTC 2009 James H. Hill <hillj@isis.vanderbilt.edu> + + * config/udm.mpb: + + UDM base project. + +Tue Apr 7 09:33:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * config/qt4_core.mpb: + * config/qt4_designer.mpb: + * config/qt4_designercomponents.mpb: + * config/qt4_gui.mpb: + * config/qt4_network.mpb: + * config/qt4_opengl.mpb: + * config/qt4_qt3support.mpb: + * config/qt4_sql.mpb: + * config/qt4_svg.mpb: + * config/qt4_test.mpb: + * config/qt4_xml.mpb: + All Qt4libs are appended with 4 + +Wed Apr 1 16:10:22 UTC 2009 Ciju John <johnc at ociweb dot com> + + * config/qt4_core.mpb: + Wrong include path got checked in. This fixes it. + +Wed Apr 1 15:56:35 UTC 2009 Ciju John <johnc at ociweb dot com> + + * config/qt4_core.mpb: + * config/qt4_gui.mpb: + Qt4 libs are appended with '4'. + +Thu Mar 26 12:48:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/MakeProjectCreator.pdf: + First updates applied + +Mon Mar 16 21:33:14 UTC 2009 Steven Stallion <stallions@ociweb.com> + + * config/erlang.mpb: + + Updated erlang base project to default to typical gnuace + behavior for generated artifacts. + +Sun Mar 15 19:36:54 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * config/lzo1.mpb: + Fixed lib names + +Wed Mar 11 13:51:08 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/MakeProjectCreator.pdf: + This work is based on the TAO 1.4a TAO Developers Guide chapter + on MPC published by OCI. The goal is to improve this + document with time to serve as the authoritative reference/documentation + for MPC users. + + Thanks to OCI for making this chapter publicly available and allowing + us to modify it. + +Wed Mar 11 09:15:08 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * config/bzip2.mpb: + * config/lzo1.mpb: + Fixed these base projects so that they also work with gnuace + +Tue Mar 10 13:34:36 UTC 2009 Adam Mitz <mitza@ociweb.com> + + * modules/GUID.pm: + + Fixed a bug where 64-bit implementations of Perl would generate + duplicate GUID values. (Bugzilla #3614) + +Mon Mar 9 07:04:08 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * config/bzip2.mpb: + * config/lzo1.mpb: + * config/lzo2.mpb: + * config/zlib.mpb: + On windows we need some different library names + +Sat Mar 7 18:55:08 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * config/lzo1.mpb: + Added lzo1 base project + +Sat Feb 28 03:46:19 UTC 2009 James H. Hill <hillj@isis.vanderbilt.edu> + + * config/pcre.mpb: + * config/pcreposix.mpb: + + Base projects for using PCRE. + +Tue Feb 24 04:23:34 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> + + * config/xerces.mpb: + + Added !xerces2, !xerces3 feature to disable xerces dependent builds + if neither feature is present. + +Mon Feb 23 16:03:15 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * config/qt4_qt3support.mpb: + Added base project for qt4_qt3support + +Tue Feb 17 13:17:28 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> + + * config/xerces3.mpb: + + Removed this file. + +Wed Feb 11 16:21:48 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> + + * config/global.features: + * config/xerces.mpb: + + Disabled xerces{2,3} by default and removed the requires lines + from the xerces features. Thanks to Adam Mitz for pointing this out. + +Tue Feb 10 20:36:47 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> + + * config/xerces.mpb: + + Split this base project into two features - xerces2 and xerces3 + to allow support for both versions. + +Mon Jan 19 22:30:47 UTC 2009 James H. Hill <hillj@isis.vanderbilt.edu> + + * config/iiopnet.mpb: + + Base project for using IIOP.NET. + +Mon Jan 12 11:10:09 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * config/nddslib.mpb: + Added vc10 + +Sun Jan 11 17:26:09 UTC 2009 Abdullah Sowayan <sowayan@gmail.com> + + * config/nddslib.mpb: + + Minor enhancement. + +Sun Jan 11 17:21:17 UTC 2009 Abdullah Sowayan <sowayan@gmail.com> + + * config/nddslib.mpb: + + Added Visual Studio 2010 (vc10) support + +Sun Jan 11 17:09:44 UTC 2009 Abdullah Sowayan <sowayan@gmail.com> + + * config/ndds_ts_defaults.mpb: + * config/nddsexe.mpb: + * config/nddsexe_with_idl.mpb: + * config/nddslib.mpb: + * config/nddslib_with_idl.mpb: + + New files, base projects for using RTI's NDDS + C++ DDS implementation. + +Sat Jan 3 22:02:02 UTC 2009 Steven Stallion <stallions@ociweb.com> + + * config/erlang.mpb: + + Updated base project type for erlang projects. + +Wed Dec 31 23:01:33 UTC 2008 Steven Stallion <stallions@ociweb.com> + + * config/erlang_otp.mpb: + + Dropped default -I include from erlang_otp projects. + +Tue Dec 30 23:23:03 UTC 2008 Steven Stallion <stallions@ociweb.com> + + * config/erlang.mpb: + * config/erlang_otp.mpb: + + Updated Erlang support. Output is now propertly cleaned when + the clean target is called on gnuace platforms. + +Wed Dec 24 22:20:40 UTC 2008 Steven Stallion <stallions@ociweb.com> + + * config/erlang.mpb: + * config/erlang_otp.mpb: + + Added support for Erlang. Two new projects are available: + erlang, and erlang_otp. erlang provides basic Erlang support, + and erlang_otp provides support for projects which use the otp + layout. + +Thu Dec 18 21:39:03 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/MakeWorkspaceCreator.pm: + + Fixed a bug with my change yesterday relating to the "bundle" + target. + + * templates/make.net.mpd: + + Added a strip command to the bundle commands. + +Thu Dec 18 09:29:36 UTC 2008 James H. Hill <hillj@isis.vanderbilt.edu> + + * config/xerces3.mpb: + + Base project for Xerces-C 3.x + +Tue Dec 16 02:54:55 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * docs/MPC.sgml: + * docs/README: + * docs/USAGE: + + Updated documentation. + + * modules/Options.pm: + + Sort project types keeping like types in numerical order. + + * modules/MakeWorkspaceCreator.pm: + * templates/make.net.mpd: + * templates/make.net.mpt: + + Added a bundle target for C# to bundle an executable into a native + application. + +Fri Nov 28 10:55:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/wb26wrmakefile.mpd: + Don't copy the lib/exe when we need to install them in the current + directory + +Mon Nov 17 10:50:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/nmake.mpd: + * templates/vc7.mpd: + * templates/vc8.mpd: + Added escape charachter to MPC_LIB_MODIFIER value + +Mon Nov 17 08:33:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/templates/common.txt: + * templates/nmake.mpd: + * templates/vc7.mpd: + * templates/vc8.mpd: + Add macro_for_lib_modifier. Whis template variable is set the + vc7/vc8/vc9/vc10/nmake templatess add MPC_LIB_MODIFIER to the + compiler flags with the current lib_modifier as value + +Tue Nov 11 10:40:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * config/boost_base.mpd: + Use $(BOOST_ROOT)/. again + +Mon Nov 10 10:45:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * config/boost_date_time.mpb: + * config/boost_filesystem.mpb: + * config/boost_iostreams.mpb: + * config/boost_prg_exec_monitor.mpb: + * config/boost_program_options.mpb: + * config/boost_regex.mpb: + * config/boost_serialization.mpb: + * config/boost_signals.mpb: + * config/boost_system.mpb: + * config/boost_test_exec_monitor.mpb: + * config/boost_thread.mpb: + * config/boost_unit_test_framework.mpb: + * config/boost_wave.mpb: + * config/gacutil.mpb: + * config/mpich.mpb: + * config/odbc.mpb: + * config/openssl.mpb: + * config/splicelib.mpb: + * config/sqlite3.mpb: + * config/swig_perl.mpb: + * config/xerces.mpb: + * docs/README: + * docs/USAGE: + * modules/VC10ProjectCreator.pm: + * modules/VC10WorkspaceCreator.pm: + Added Visual Studio 2010 (vc10) support + +Fri Nov 7 18:39:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/wb26wrmakefile.mpd: + * templates/wb26wrproject.mpd: + Improved standard build support + +Fri Nov 7 13:00:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/wb26wrmakefile.mpd: + The OBJECTS variable is dependent on the project name + +Thu Nov 6 18:41:58 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com> + + * templates/wb26wrmakefile.mpd: + + Fixed pre_build rule by using SUB_OBJECTS instead of OBJECTS_example. + Thanks to Laszlo Morocz <laszlo dot morocz at lmco dot com) for providing the fix. + +Thu Nov 6 15:42:06 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu> + + * config/splice_ts_defaults.mpb: + * config/spliceexe.mpb: + * config/spliceexe_with_idl.mpb: + * config/splicelib.mpb: + * config/splicelib_with_idl.mpb: + + New files, base projects for using PrismTech's OpenSplice + C++ DDS implementation. Currently, the files are specialized + for using OpenSplice integrated with a CORBA implementation, + and assume that OpenSplice's custom library for this purpose + (in $OSPL_HOME/custom_lib/ccpp) has been compiled after + installation. + +Thu Nov 6 10:54:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/wb26wrmakefile.mpd: + * templates/wb26wrproject.mpd: + Put all object names in a file and pass these to the Librarian to + prevent a long command when a lot of objects are linked together + +Tue Nov 4 10:01:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/bmake.mpd: + Reverted change of yesterday, breaks other things + + * config/boost_base.mpd: + Use $(BOOST_ROOT) instead of $(BOOST_ROOT)/., it confused CodeGear + C++ + +Mon Nov 3 21:50:41 UTC 2008 James H. Hill <hillj@isis.vanderbilt.edu> + + * config/sqlite3.mpb: + Added a 'requires' statement to the base project. + +Mon Nov 3 19:51:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/bmake.mpd: + Use '' around include paths so that we can handle directories + with spaces in the name + +Sun Oct 26 17:09:42 UTC 2008 James H. Hill <hillj@isis.vanderbilt.edu> + + * config/sqlite3.mpb: + + Base project for using SQLite. For Windows-based projects, you + will need to use LIB to generate the import library for the + .dll. + +Thu Oct 23 13:01:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/bmake.mpd: + Don't print all clean commands on the console + +Fri Oct 17 19:07:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * modules/BCB2009ProjectCreator.pm + * modules/BCB2009WorkspaceCreator.pm + * templates/bcb2009.mpd + * templates/bcb2009dll.mpt + * templates/bcb2009exe.mpt + New generator for C++ Builder 2009 + + * templates/bcb2007.mpd + Fixed bug in resource_file generation + +Wed Oct 15 15:03:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/vc8platforms.mpt: + SuperSonic also uses unicode + + * config/openssl.mpb: + * config/xerces.mpb: + Removed reference to borland template which has been removed + + * config/qt3.mpb: + Added this file. Just derived on qt but makes it easier to + explicitly derive from qt3 or qt4 + +Tue Oct 14 11:47:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/vc8platforms.mpt: + Updated SuperSonic SDK settings + +Fri Oct 10 08:58:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/vc8platforms.mpt: + Add iphlpapi to WinCE6 + +Thu Oct 9 15:14:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/vc8platforms.mpt: + Define UNDER_CE as $(CEVER) with WinCE6 + +Thu Oct 9 09:28:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/vc8platforms.mpt: + Added Windows Mobile 6 Professional SDK (ARMV4I) + +Tue Oct 7 14:08:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + Revert change below, doesn't work as expected + + Tue Oct 7 13:55:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + * templates/nmakedll.mpt: + * templates/nmakeexe.mpt: + Include vc8platforms so that we can easily generate nmake projects for + WinCE platforms + +Tue Oct 7 13:55:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/nmakedll.mpt: + * templates/nmakeexe.mpt: + Include vc8platforms so that we can easily generate nmake projects for + WinCE platforms + + * templates/vc8platforms.mpt: + Added new WinCE mobile platform + +Sat Oct 4 20:52:22 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * config/qt.mpb: + + Added support for building 64-bit. + + * modules/ProjectCreator.pm: + + Fixed a bug where Source_File scoped specific variable setting was + broken for any language but C++. + + * templates/make.net.mpd: + + Added macro settings for cat, cp, mv and /dev/null. + +Mon Sep 29 13:34:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/bmake.mpd: + * templates/bmakecommon.mpt: + Added a unicode modifier so that the libs do get a u in the name + when we build with unicode + +Wed Sep 17 02:40:00 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * docs/README: + + Fixed a spelling error. + + * modules/MakeProjectCreator.pm: + * templates/make.net.mpd: + * templates/make.net.mpt: + + Changed the default csharp compiler to gmcs and added support for + the libs keyword and the packages template variable. + + * modules/ProjectCreator.pm: + + Always write the project if the user has provided a verbatim + within the project. + +Tue Sep 16 21:18:01 UTC 2008 Phil Mesnier <mesnier_p@ociweb.com> + + * modules/NMakeWorkspaceCreator.pm: + * modules/TemplateParser.pm: + * modules/VC7WorkspaceCreator.pm: + * templates/vc8.mpd: + + These changes all improve support for building cross-compiled + WinCE projects using Visual Studio. This specifically allows + for the exclusion of native-only apps, such as TAO_IDL from + building and deployment on cross compile targets. Also improves + the establishment of the correct WinCE 5 or WinCE 6 entry point + and sets the character set flag correctly. + +Tue Sep 16 08:35:19 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * config/ruby.mpb: + New base project for Ruby. + + * modules/BMakeWorkspaceCreator.pm: + Make sure we get unique names when we generate bmake with other + project types in one tree + + * templates/bmakedll.mpt: + * templates/bmakedllexe.mpt: + * templates/bmakelib.mpt: + * templates/bmakelibexe.mpt: + Changed extensions to get unique names with the bmake + so that we don't try to load a msvc dll when it also exists + +Mon Sep 15 20:50:19 UTC 2008 Adam Mitz <mitza@ociweb.com> + + * modules/Driver.pm: + + Added quotes around 'dynamic_types' in the diagnostic message. + +Sat Sep 13 15:50:22 UTC 2008 Adam Mitz <mitza@ociweb.com> + + * modules/Driver.pm: + + Change a warning to a non-warning diagnostic when a dynamic_types + path (from MPC.cfg) can't be found. This is a normal condition when + the dynamic_types path is based on an environment variable that may + not be set. + +Fri Sep 12 12:56:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + Reverted change below, brakes VMS support + + Tue Sep 9 18:46:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + * mwc.pl: + * mpc.pl: + Use FindBin::RealScript to get the real script name, that also + works when we have a symbolic link with a different name to + one of these scripts. This fixes bugzilla 3407 + +Tue Sep 9 18:46:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * mwc.pl: + * mpc.pl: + Use FindBin::RealScript to get the real script name, that also + works when we have a symbolic link with a different name to + one of these scripts. This fixes bugzilla 3407 + +Fri Aug 22 07:04:17 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * mwc.pl: + * mpc.pl: + Use RealBin to get the location of this script, that gives the + real location also in case we use a symbolic link to these + scripts. + +Wed Aug 20 19:19:17 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * devtools/document_template.pl: + * devtools/highlight_template.pl: + Added missing shebang lines to fix rpm packaging warnings + +Wed Aug 20 08:33:17 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * clone_build_tree.pl: + * combine_dsw.pl: + * create_base.pl: + * depgen.pl: + * generate_export_header.pl: + * mpc.pl: + * mwc.pl: + * prj_install.pl: + * registry.pl: + * vs_postclean.pl: + Added missing shebang lines to fix rpm packaging warnings + +Wed Aug 13 19:31:17 UTC 2008 James H. Hill <hillj@isis.vanderbilt.edu> + + * config/gacutil.mpb: + + Bug fix where the path of the assembly to register, i.e., + the sharedname, was incorrect. This was resolved by using the + absolute pathname for the assembly instead of the relative + pathname. + +Wed Jul 30 14:52:28 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * config/lzo2.mbp: + Base project for lzo2 compression library + +Wed Jul 30 14:43:28 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * templates/wb26wrmakefile.mpd: + Convert a few environment variables to use / instead of \ + +Wed Jul 23 10:19:28 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * config/gsl.mpb: + Added base project for GNU Scientific Library + +Fri Jul 18 19:09:10 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/Driver.pm: + * modules/FeatureParser.pm: + * modules/ProjectCreator.pm: + * modules/VC8ProjectCreator.pm: + * modules/WorkspaceCreator.pm: + + More non-functional code cleanup changes. + +Fri Jul 18 18:22:41 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/ProjectCreator.pm: + + Fixed a bug with the 'output_basename' template variable. For + Windows based project types, the input file used back-slashes and + taking basename() of that sort of text on UNIX will not result in + the expected value. We must ensure that the text passed to + basename() always has forward slashes. + +Fri Jul 18 17:58:58 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * templates/make.net.mpd: + + Fixed a bug where TARGETDIR was not set if there was no exeout set + and the project was an executable. + + * templates/automake.mpd: + * templates/bmake.mpd: + * templates/cccommon.mpt: + * templates/nmake.mpd: + * templates/vc7.mpd: + * templates/vc8vb.mpd: + * templates/wb26wrmakefile.mpd: + + Removed trailing white-space. + +Fri Jul 18 17:22:56 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/ProjectCreator.pm: + + Fixed a bug with the 'output_dirname' template variable. For + Windows based project types, the input file used back-slashes and + taking dirname() of that sort of text on UNIX will not result in + the expected value. We must ensure that the text passed to + dirname() always has forward slashes. + +Fri Jul 18 16:03:52 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * clone_build_tree.pl: + * combine_dsw.pl: + * create_base.pl: + * prj_install.pl: + * registry.pl: + * vs_postclean.pl: + * devtools/document_template.pl: + * devtools/highlight_template.pl: + * generate_export_header.pl: + * modules/AutomakeProjectCreator.pm: + * modules/AutomakeWorkspaceCreator.pm: + * modules/BCB2007ProjectCreator.pm: + * modules/BCB2007WorkspaceCreator.pm: + * modules/BDS4ProjectCreator.pm: + * modules/BDS4WorkspaceCreator.pm: + * modules/BMakeProjectCreator.pm: + * modules/BMakeWorkspaceCreator.pm: + * modules/CCProjectCreator.pm: + * modules/CCWorkspaceCreator.pm: + * modules/ConfigParser.pm: + * modules/Creator.pm: + * modules/DirectoryManager.pm: + * modules/Driver.pm: + * modules/EM3ProjectCreator.pm: + * modules/EM3WorkspaceCreator.pm: + * modules/FeatureParser.pm: + * modules/GHSProjectCreator.pm: + * modules/GHSWorkspaceCreator.pm: + * modules/HTMLProjectCreator.pm: + * modules/HTMLWorkspaceCreator.pm: + * modules/MPC.pm: + * modules/MWC.pm: + * modules/MakeProjectBase.pm: + * modules/MakeProjectCreator.pm: + * modules/MakeWorkspaceBase.pm: + * modules/MakeWorkspaceCreator.pm: + * modules/NMakeProjectCreator.pm: + * modules/NMakeWorkspaceCreator.pm: + * modules/Options.pm: + * modules/OutputMessage.pm: + * modules/Parser.pm: + * modules/ProjectCreator.pm: + * modules/SLEProjectCreator.pm: + * modules/SLEWorkspaceCreator.pm: + * modules/StringProcessor.pm: + * modules/TemplateInputReader.pm: + * modules/TemplateParser.pm: + * modules/VC6ProjectCreator.pm: + * modules/VC6WorkspaceCreator.pm: + * modules/VC71ProjectCreator.pm: + * modules/VC71WorkspaceCreator.pm: + * modules/VC7ProjectCreator.pm: + * modules/VC7WorkspaceCreator.pm: + * modules/VC8ProjectCreator.pm: + * modules/VC8WorkspaceCreator.pm: + * modules/VCProjectBase.pm: + * modules/WB26ProjectCreator.pm: + * modules/WB26WorkspaceCreator.pm: + * modules/WinProjectBase.pm: + * modules/WinWorkspaceBase.pm: + * modules/WorkspaceCreator.pm: + * modules/WorkspaceHelper.pm: + * modules/XMLProjectBase.pm: + + Cleaned up the code and added comments. There were no functional + changes made. + +Thu Jul 17 15:10:48 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/ProjectCreator.pm: + + We need to pass the 'commandflags' setting to the command helper, + not the hash map containing all of the type settings. + +Thu Jul 17 13:50:33 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/ProjectCreator.pm: + + Fixed a bug where a command helper returns output files for a + particular component type and file, but they were not taken into + account within the project. + + Also, fixed another bug relating to the group determiniation of + automatically added files. In doing so, the components for other + component types were being defined but set to an empty set which + was causing problems with automatically adding file to these + components. + +Wed Jul 16 16:11:33 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/CommandHelper.pm: + + Fixed a comment. + + * modules/ProjectCreator.pm: + + Delay replacing <%...%> that contain project keywords until they + are used by the template. Doing this allows the values to be used + regardless of the order in which keywords are processed within the + project. + +Tue Jul 15 16:08:40 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/CommandHelper.pm: + + Extended the interface to allow the helper to provide "tied" + custom files. + + * modules/ProjectCreator.pm: + + Made the following changes: + + 1) Added an optimization to generated_source_listed() to avoid + attempting to add custom generated files if they couldn't + possibly be generated. + 2) Added the ability for a command helper to "tie" files together + so that they are processed closely together. + 3) Fixed a bug where an output file could end up being listed more + than once in the custom output files value. + +Fri Jul 11 18:13:36 UTC 2008 Adam Mitz <mitza@ociweb.com> + + * vs_postclean.pl: + + " becomes ", not '. + +Fri Jul 11 15:18:27 UTC 2008 Adam Mitz <mitza@ociweb.com> + + * docs/README: + + Cleaned up some typos (stray semicolons) + + * vs_postclean.pl: + + Restore current directory after changing it. + Translate &, etc. + Added support for solutions, all referenced projects will be cleaned. + +Fri Jul 11 14:56:44 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * docs/README: + * modules/ProjectCreator.pm: + + Added a pseudo template variable, rmdir, which will be defined + depending upon the project type. It will be 'rmdir /s/q' on + Windows and 'rm -rf' on UNIX. + + * modules/AutomakeWorkspaceCreator.pm: + + Fixed a bug where the configure.ac.Makefiles did not contain the + correct names if the -name_modifier option was used. + + * modules/WorkspaceCreator.pm: + + Reduced op code count. + +Fri Jul 11 14:30:53 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * docs/README: + * modules/ProjectCreator.pm: + + Added a pseudo template variable, slash, which will be defined + depending upon the project type. + + * templates/make.net.mpt: + * templates/makedll.mpt: + + Rely on the slash psuedo template variable instead of defining one + in these template input files. + +Fri Jul 11 11:10:00 UTC 2008 Simon Massey <sma at prismtech dot com> + + * templates/make.net.mpt: + + Added dollar-Id-dollar to appease a non-MPC related script that, for + some reason, insists on applying it's influence on MPC. + +Thu Jul 10 22:34:12 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * vs_postclean.pl: + + Added a script to perform the postclean step for Visual Studio + projects. + +Thu Jul 10 19:03:14 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/Depgen/DependencyEditor.pm: + * modules/Depgen/DependencyGenerator.pm: + * modules/Depgen/DependencyWriter.pm: + * modules/Depgen/DependencyWriterFactory.pm: + * modules/Depgen/Driver.pm: + * modules/Depgen/MakeDependencyWriter.pm: + * modules/Depgen/MakeObjectGenerator.pm: + * modules/Depgen/NMakeDependencyWriter.pm: + * modules/Depgen/NMakeObjectGenerator.pm: + * modules/Depgen/ObjectGenerator.pm: + * modules/Depgen/ObjectGeneratorFactory.pm: + * modules/Depgen/Preprocessor.pm: + + Cleaned up the code and reduced op code count. + + * templates/vc7.mpd: + * templates/vc8.mpd: + + Added a VCPostCleanEventTool, which doesn't exist in Visual + Studio, to hold the 'postclean' settings. This is mainly here to + enable another script to come along and perform the postclean + function. + +Thu Jul 10 18:28:33 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * docs/README: + * modules/ProjectCreator.pm: + + Added a new feature, pre_dirname, which is similar to pre_filename + except that the value is prepended to the output directory for + generated files. If a separate directory is desired, the + pre_dirname setting should end in a slash. + +Thu Jul 10 15:28:50 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * devtools/document_template.pl: + + Fixed a bug where template variables used within template + functions were ignored. + + * docs/README: + * modules/ProjectCreator.pm: + + Added the ability to utilize project settings within the + Define_Custom command, commandflags, dependent, output_option, + and postcommand settings. + +Thu Jul 10 14:29:44 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/MakeProjectCreator.pm: + * templates/make.net.mpd: + * templates/make.net.mpt: + * docs/templates/make.net.txt: + + Added support for compiling C# code using Mono. + + * modules/Creator.pm: + * modules/ProjectCreator.pm: + * modules/StringProcessor.pm: + * modules/TemplateParser.pm: + * modules/VC9ProjectCreator.pm: + * modules/VC9WorkspaceCreator.pm: + + Decreased op code count. + +Wed Jul 9 13:46:02 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/AutomakeProjectCreator.pm: + * modules/MakeProjectBase.pm: + * modules/Parser.pm: + + Reduce op code count. + + * modules/CommandHelper.pm: + + Added a debug message to assist users in figuring out why their + helper isn't being picked up. + + * modules/Creator.pm: + + Modified recursive_directory_list() to skip .svn and CVS + directories. + + * modules/ProjectCreator.pm: + + Fixed a very old and incorrect assumption that output file names + generated as part of a custom definition had to be longer than the + length of the input file name. + +Tue Jul 8 15:35:29 UTC 2008 Steve Huston <shuston@riverace.com> + + * templates/vc8.mpd: Allow a project to be a "make output" type using + the VCNMakeTool section instead of the usual compile, link, etc. + sections. This allows one to drive nmake-type projects from a + VC project. Also, enable setting the DebugInformationFormat even + when doing an optimize/Release build. Thanks to Kelly Hickel for + contributing these. + +Tue Jul 8 13:09:22 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/ProjectCreator.pm: + + Fixed a bug in my change from Thu Jul 3 11:46:23 UTC 2008. Files + were not being automatically added when they didn't exist on the + file system. + +Mon Jul 7 17:00:33 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * docs/README: + * modules/ProjectCreator.pm: + + MPC had always assumed that output files went into the same + directory as the input file (unless specified otherwise through + gendir). Now, in the Define_Custom for the command, this + assumption can be modified. If 'output_follows_input' is set to + 0, it will assume that output files go into the same directory as + the project (unless specified otherwise through gendir). + +Mon Jul 7 13:10:46 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/ProjectCreator.pm: + + Modified the behavior of adding to prebuild, postbuild, and + postclean. Values that are added are now separated via the + command separator for the project type. This will assure that + multiple commands are executed separately (and unconditionally). + +Thu Jul 3 16:36:30 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * docs/README: + * modules/Creator.pm: + * modules/ProjectCreator.pm: + + Added a new keyword, postclean, which is similar to postbuild + except that it is executed during the realclean target. + + * templates/bmake.mpd: + * templates/html.mpd: + * templates/make.mpd: + * templates/nmake.mpd: + + Added the use of postclean. + +Thu Jul 3 14:49:52 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/ProjectCreator.pm: + + For the previous change to generate_default_components(), we only + need to do this if the list of component tags was not provided to + the method. + +Thu Jul 3 11:46:23 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/ProjectCreator.pm: + + Fixed an issue where a chain of three or more Custom_Define's + would not have the right default input/output. + +Wed Jul 2 16:35:22 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/CommandHelper.pm: + * modules/ProjectCreator.pm: + + Modified the helper to be keyed off of the define custom name + instead of the define custom command name. + +Wed Jul 2 14:04:39 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/CommandHelper.pm: + * modules/ProjectCreator.pm: + + Added a command helper that can be dynamically loaded to assist + the project creator in determining which files will be generated + by a command. This is useful when the output of a file can not be + represented by the usual Define_Custom syntax. + +Mon Jun 30 14:55:51 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * modules/StringProcessor.pm: + + Added a simple fgrep function that will find a string in an array + reference. + + * modules/ProjectCreator.pm: + + Fixed a bug where custom defines that generate output that can be + used as automatic input to other custom defines did not work + properly. Now, they are automatically added when possible. + +Fri Jun 27 12:59:39 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * config/ixml.mpb: + * config/upnp.mpb: + + Added base projects for use with the open source project Linux SDK + for UPnP Devices. + + * docs/README: + * modules/ProjectCreator.pm: + + Split the functionality of the 'automatic' keyword into to two. + 'automatic_in' now specifies that input files are automatically + added and 'automatic_out' specifies that generated output files + are automatically added to the project. These both default to + true as 'automatic' did. 'automatic' is still accepted, but + deprecated. + +Wed Jun 25 21:38:16 UTC 2008 Adam Mitz <mitza@ociweb.com> + + * docs/README: + + Documented the following changes. + + * modules/ProjectCreator.pm: + * modules/VC7ProjectCreator.pm: + * modules/WinProjectBase.pm: + + Added the <%cmdsep%> pseudovariable that can be used in prebuild, + postbuild, and postcommand. It works like <%and%> and <%or%> but it + unconditionally runs the right-hand side command. + For postcommand, added <%input_dirname%> and <%output_dirname%> which + work like their <%*_basename%> counterparts but return the directory + portion of the file name. + +Thu Jun 19 01:27:55 UTC 2008 James H. Hill <hillj@isis.vanderbilt.edu> + + * config/boost_system.mpb: + + Base project for using the Boost system library. + +Tue Jun 17 17:16:07 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * docs/templates/make.txt: + + Document the 'depgen_flags' template variable. + + * combine_dsw.pl: + * create_base.pl: + * depgen.pl: + * generate_export_header.pl: + * mpc.pl: + * mwc.pl: + * prj_install.pl: + * registry.pl: + * modules/ConfigParser.pm: + * modules/Creator.pm: + * modules/DirectoryManager.pm: + * modules/Driver.pm: + * modules/FeatureParser.pm: + * modules/GUID.pm: + * modules/MakeWorkspaceBase.pm: + * modules/Options.pm: + * modules/OutputMessage.pm: + * modules/Parser.pm: + * modules/ProjectCreator.pm: + * modules/StringProcessor.pm: + * modules/TemplateInputReader.pm: + * modules/TemplateParser.pm: + * modules/VCProjectBase.pm: + * modules/Version.pm: + * modules/WinProjectBase.pm: + * modules/WinWorkspaceBase.pm: + * modules/WorkspaceCreator.pm: + * modules/WorkspaceHelper.pm: + + Removed unnecessary parenthesis around variable declarations. + This provides a very minor performance increase due to reduced + perl op codes. + +Tue Jun 10 14:45:18 UTC 2008 Adam Mitz <mitza@ociweb.com> + + * templates/make.mpd: + * templates/makedll.mpt: + + Enhanced support for MinGW with "-type make". + +Fri May 30 15:54:22 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * MPC version 3.6.0 released. + +Local Variables: +mode: change-log +add-log-time-format: (lambda () (progn (setq tz (getenv TZ)) (set-time-zone-rule UTC) (setq time (format-time-string %a %b %e %H:%M:%S %Z %Y (current-time))) (set-time-zone-rule tz) time)) +indent-tabs-mode: nil +End: diff --git a/modules/BCB2007ProjectCreator.pm b/modules/BCB2007ProjectCreator.pm index a5f1d870..ead8b1c1 100644 --- a/modules/BCB2007ProjectCreator.pm +++ b/modules/BCB2007ProjectCreator.pm @@ -13,11 +13,11 @@ package BCB2007ProjectCreator; use strict; use ProjectCreator; -use WinProjectBase; +use BorlandProjectBase; use XMLProjectBase; use vars qw(@ISA); -@ISA = qw(XMLProjectBase WinProjectBase ProjectCreator); +@ISA = qw(XMLProjectBase BorlandProjectBase ProjectCreator); # ************************************************************ # Subroutine Section diff --git a/modules/BDS4ProjectCreator.pm b/modules/BDS4ProjectCreator.pm index e0c4be42..a3fea2f9 100644 --- a/modules/BDS4ProjectCreator.pm +++ b/modules/BDS4ProjectCreator.pm @@ -13,11 +13,11 @@ package BDS4ProjectCreator; use strict; use ProjectCreator; -use WinProjectBase; +use BorlandProjectBase; use XMLProjectBase; use vars qw(@ISA); -@ISA = qw(XMLProjectBase WinProjectBase ProjectCreator); +@ISA = qw(XMLProjectBase BorlandProjectBase ProjectCreator); # ************************************************************ # Subroutine Section diff --git a/modules/BMakeProjectCreator.pm b/modules/BMakeProjectCreator.pm index 6b1e9631..6ef1e7f1 100644 --- a/modules/BMakeProjectCreator.pm +++ b/modules/BMakeProjectCreator.pm @@ -13,11 +13,11 @@ package BMakeProjectCreator; use strict; use ProjectCreator; -use WinProjectBase; +use BorlandProjectBase; use MakeProjectBase; use vars qw(@ISA); -@ISA = qw(MakeProjectBase WinProjectBase ProjectCreator); +@ISA = qw(MakeProjectBase BorlandProjectBase ProjectCreator); # ************************************************************ # Data Section @@ -89,4 +89,23 @@ sub get_dll_template_input_file { } +sub get_properties { + my $self = shift; + + ## Create the map of properties that we support. + my $props = {}; + + ## Merge in properties from all base projects + foreach my $base (@ISA) { + my $func = $base . '::get_properties'; + my $p = $self->$func(); + foreach my $key (keys %$p) { + $$props{$key} = $$p{$key}; + } + } + + return $props; +} + + 1; diff --git a/modules/BorlandProjectBase.pm b/modules/BorlandProjectBase.pm new file mode 100644 index 00000000..396e24ef --- /dev/null +++ b/modules/BorlandProjectBase.pm @@ -0,0 +1,36 @@ +package BorlandProjectBase; + +# ************************************************************ +# Description : A Borland base module for Borland Project Creators +# Author : Chad Elliott +# Create Date : 5/5/2009 +# ************************************************************ + +# ************************************************************ +# Pragmas +# ************************************************************ + +use strict; +use WinProjectBase; + +our @ISA = qw(WinProjectBase); + +# ************************************************************ +# Subroutine Section +# ************************************************************ + +sub get_properties { + my $self = shift; + + ## Get the base class properties and add the properties that we + ## support. + my $props = $self->WinProjectBase::get_properties(); + + ## All projects that use this base class are for Borland compilers. + $$props{'borland'} = 1; + + return $props; +} + + +1; diff --git a/modules/ConfigParser.pm b/modules/ConfigParser.pm index 08d0c5f8..17b33320 100644 --- a/modules/ConfigParser.pm +++ b/modules/ConfigParser.pm @@ -27,6 +27,7 @@ sub new { ## Set up the internal data members $self->{'values'} = {}; + $self->{'clean'} = {}; $self->{'valid'} = $valid; $self->{'warned'} = {}; @@ -44,22 +45,26 @@ sub parse_line { ## Save the name, removing any trailing white space, and the value ## too. my $name = $1; - my $value = $2; + my $clean = $2; $name =~ s/\s+$//; ## Pre-process the name and value $name = $self->preprocess($name); - $value = $self->preprocess($value); + my $value = $self->preprocess($clean); $name =~ s/\\/\//g; ## Store the name value pair if (!defined $self->{'valid'}) { ## There are no valid names, so all names are valid. - $self->{'values'}->{$name} = $value if ($name ne ''); + if ($name ne '') { + $self->{'values'}->{$name} = $value; + $self->{'clean'}->{$name} = $clean; + } } elsif (defined $self->{'valid'}->{lc($name)}) { ## This is a valid value, so we can store it. $self->{'values'}->{lc($name)} = $value; + $self->{'clean'}->{lc($name)} = $clean; } else { $error = "Invalid keyword: $name"; @@ -86,6 +91,13 @@ sub get_value { } +sub get_unprocessed { + ## Try the tag first and if that doesn't work make it all lower-case. + my($self, $tag) = @_; + return $self->{'clean'}->{$tag} || $self->{'clean'}->{lc($tag)}; +} + + sub preprocess { my($self, $str) = @_; diff --git a/modules/Driver.pm b/modules/Driver.pm index 5ca3a739..3a2a419b 100644 --- a/modules/Driver.pm +++ b/modules/Driver.pm @@ -82,19 +82,25 @@ sub locate_default_type { sub locate_dynamic_directories { - my($self, $dtypes) = @_; + my($self, $cfg, $label) = @_; + my $dtypes = $cfg->get_value($label); if (defined $dtypes) { + my $count = 0; my @directories; + my @unprocessed = split(/\s*,\s*/, $cfg->get_unprocessed($label)); foreach my $dir (split(/\s*,\s*/, $dtypes)) { if (-d $dir) { if (-d "$dir/modules" || -d "$dir/config" || -d "$dir/templates") { push(@directories, $dir); } } - else { - $self->diagnostic("'dynamic_types' directory $dir not found."); + elsif (!(defined $unprocessed[$count] && + $unprocessed[$count] =~ s/\$[\(\w\)]+//g && + $unprocessed[$count] eq $dir)) { + $self->diagnostic("'$label' directory $dir not found."); } + $count++; } return \@directories; } @@ -271,8 +277,7 @@ sub run { ## After we read the config file, see if the user has provided ## dynamic types - my $dynamic = $self->locate_dynamic_directories( - $cfg->get_value('dynamic_types')); + my $dynamic = $self->locate_dynamic_directories($cfg, 'dynamic_types'); if (defined $dynamic) { ## If so, add in the creators found in the dynamic directories $self->add_dynamic_creators($dynamic); diff --git a/modules/GHSProjectCreator.pm b/modules/GHSProjectCreator.pm index 9b4bfd3e..af29cd80 100644 --- a/modules/GHSProjectCreator.pm +++ b/modules/GHSProjectCreator.pm @@ -151,4 +151,18 @@ sub get_dll_template_input_file { } +sub get_properties { + my $self = shift; + + ## Get the base class properties and add the properties that we + ## support. + my $props = $self->ProjectCreator::get_properties(); + + ## This project creator can work for UNIX and Windows. Set the + ## property based on the environment variable. + $$props{'windows'} = 1 if (!defined $ENV{$ghsunix}); + + return $props; +} + 1; diff --git a/modules/MakeProjectBase.pm b/modules/MakeProjectBase.pm index 7ddcf81f..cc84ca8f 100644 --- a/modules/MakeProjectBase.pm +++ b/modules/MakeProjectBase.pm @@ -33,4 +33,19 @@ sub project_file_prefix { return 'Makefile.'; } + +sub get_properties { + my $self = shift; + + ## Get the base class properties and add the properties that we + ## support. + my $props = $self->ProjectCreator::get_properties(); + + ## All projects that use this base class are 'make' based. + $$props{'make'} = 1; + + return $props; +} + + 1; diff --git a/modules/NMakeProjectCreator.pm b/modules/NMakeProjectCreator.pm index c0284111..8371142b 100644 --- a/modules/NMakeProjectCreator.pm +++ b/modules/NMakeProjectCreator.pm @@ -41,4 +41,25 @@ sub get_dll_template_input_file { } +sub get_properties { + my $self = shift; + + ## Create the map of properties that we support. This is a reproduced + ## property from the VCProjectBase and out of laziness I have not made + ## a base project for just this property. + my $props = {'microsoft' => 1}; + + ## Merge in properties from all base projects + foreach my $base (@ISA) { + my $func = $base . '::get_properties'; + my $p = $self->$func(); + foreach my $key (keys %$p) { + $$props{$key} = $$p{$key}; + } + } + + return $props; +} + + 1; diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm index 872ecc34..e6f2a263 100644 --- a/modules/ProjectCreator.pm +++ b/modules/ProjectCreator.pm @@ -184,6 +184,8 @@ my %cppma = ('source_files' => ['buildflags', ], ); +my $cppresource = 'resource_files'; + # ************************************************************ # C# Specific Component Settings # ************************************************************ @@ -206,6 +208,8 @@ my %csma = ('source_files' => [ 'dependent_upon', ], ); +my $csresource = 'resx_files'; + # ************************************************************ # Java Specific Component Settings # ************************************************************ @@ -231,6 +235,8 @@ my %vbvc = ('source_files' => [ "\\.vb" ], my %vbma = ('source_files' => [ 'subtype' ], ); +my $vbresource = 'resx_files'; + # ************************************************************ # Language Specific Component Settings # ************************************************************ @@ -242,10 +248,20 @@ my %vbma = ('source_files' => [ 'subtype' ], # 2 Assignments available in standard file types # 3 The entry point for executables # 4 The language uses a C preprocessor -my %language = ('cplusplus' => [ \%cppvc, \%cppec, \%cppma, 'main', 1 ], - 'csharp' => [ \%csvc, {}, \%csma, 'Main', 0 ], - 'java' => [ \%jvc, {}, {} , 'main', 0 ], - 'vb' => [ \%vbvc, {}, \%vbma, 'Main', 0 ], +# 5 Name of the tag for 'resource_files' for this language +# * This is special because it gets treated like source_files in that +# a project with only these files is a library/exe not "custom only". +my %language = ('cplusplus' => [ \%cppvc, \%cppec, \%cppma, 'main', 1, + $cppresource ], + + 'csharp' => [ \%csvc, {}, \%csma, 'Main', 0, + $csresource ], + + 'java' => [ \%jvc, {}, {}, 'main', 0, + 'resource_files' ], + + 'vb' => [ \%vbvc, {}, \%vbma, 'Main', 0, + $vbresource ], ); my %mains; @@ -675,6 +691,47 @@ sub get_process_project_type { } +sub matches_specific_scope { + my($self, $elements) = @_; + + ## First check for properties that correspond to the current project + ## type. Elements that begin with "prop:" indicate a property. + my $list = ''; + my $props = $self->get_properties(); + foreach my $prop (split(/\s*,\s*/, $elements)) { + my $not = ($prop =~ s/^!\s*//); + if ($prop =~/(.+):(.+)/) { + if ($1 eq 'prop') { + $prop = $2; + if ($not) { + return $self->{'pctype'} if (!$$props{$prop}); + } + else { + return $self->{'pctype'} if ($$props{$prop}); + } + } + else { + $self->warning("$prop is not recognized."); + } + } + else { + $list .= ($not ? '!' : '') . $prop . ','; + } + } + + ## If none of the elements match a property, then check the type + ## against the current project type or the default component name + ## (which is what it would be set to if a specific clause is used with + ## out parenthesis). + my $type = $self->get_process_project_type($list); + return $self->{'pctype'} if ($type eq $self->{'pctype'} || + $type eq $self->get_default_component_name()); + + ## Nothing matched + return undef; +} + + sub parse_line { my($self, $ih, $line) = @_; my($status, @@ -878,9 +935,8 @@ sub parse_line { $loc, $add); } elsif ($comp eq 'specific') { - my $type = $self->get_process_project_type($name); - if ($type eq $self->{'pctype'} || - $type eq $self->get_default_component_name()) { + my $type = $self->matches_specific_scope($name); + if (defined $type) { ($status, $errorString) = $self->parse_scope( $ih, $comp, $type, $self->{'valid_names'}, @@ -2595,7 +2651,7 @@ sub generate_default_target_names { ## default to a library if there are source or resource files if (!defined $exename) { if (!defined $sources[0]) { - @sources = $self->get_component_list('resource_files', 1); + @sources = $self->get_component_list($self->get_resource_tag(), 1); } if (defined $sources[0]) { if (!$shared_empty) { @@ -2725,7 +2781,7 @@ sub remove_extra_pch_listings { sub sift_files { my($self, $files, $exts, $pchh, $pchc, $tag, $array, $alldir) = @_; my @saved; - my $saverc = (!$alldir && $tag eq 'resource_files'); + my $saverc = (!$alldir && $tag eq $self->get_resource_tag()); my $havec = (defined $self->{'exclude_components'}->{$tag}); foreach my $ext (@$exts) { @@ -4223,7 +4279,7 @@ sub need_to_write_project { ## The order here is important, we must check for source or resource ## files first and then for custom input files. - foreach my $key ('source_files', 'resource_files', + foreach my $key ('source_files', $self->get_resource_tag(), keys %{$self->{'generated_exts'}}) { my $names = $self->{$key}; foreach my $name (keys %$names) { @@ -5070,6 +5126,15 @@ sub add_main_function { return undef; } +sub get_resource_tag { + my($self) = @_; + my $lang = $self->get_language(); + if (!defined $lang) { + return 'resource_files'; # backwards compatibility if no lang. + } + return $language{$lang}->[5]; +} + # ************************************************************ # Accessors used by support scripts # ************************************************************ @@ -5254,4 +5319,8 @@ sub warn_useless_project { return 1; } +sub get_properties { + return {}; +} + 1; diff --git a/modules/TemplateParser.pm b/modules/TemplateParser.pm index 8213b94e..6441433c 100644 --- a/modules/TemplateParser.pm +++ b/modules/TemplateParser.pm @@ -1748,7 +1748,7 @@ sub collect_data { ## For VC7+ to properly work with wince, which is cross compiled, ## a new platform-specific token is added, nocross, which is used - ## to determine if a project is even to be built for non-native + ## to determine if a project is even to be built for non-native ## targets. Additionally, custom-only projects are built but not ## deployed, thus these are added to the project_info mix $prjc->update_project_info($self, 1, ['custom_only']); diff --git a/modules/VC10ProjectCreator.pm b/modules/VC10ProjectCreator.pm index b6e5a23d..caf93286 100644 --- a/modules/VC10ProjectCreator.pm +++ b/modules/VC10ProjectCreator.pm @@ -12,20 +12,9 @@ package VC10ProjectCreator; use strict; -use VC8ProjectCreator; +use VC9ProjectCreator; use vars qw(@ISA); -@ISA = qw(VC8ProjectCreator); - -my %config = ('vcversion' => '9.00'); - -# ************************************************************ -# Subroutine Section -# ************************************************************ - -sub get_configurable { - my($self, $name) = @_; - return $config{$name}; -} +@ISA = qw(VC9ProjectCreator); 1; diff --git a/modules/VC10WorkspaceCreator.pm b/modules/VC10WorkspaceCreator.pm index 6fa35da2..89c50c5a 100644 --- a/modules/VC10WorkspaceCreator.pm +++ b/modules/VC10WorkspaceCreator.pm @@ -13,19 +13,10 @@ package VC10WorkspaceCreator; use strict; use VC10ProjectCreator; -use VC8WorkspaceCreator; +use VC9WorkspaceCreator; use vars qw(@ISA); -@ISA = qw(VC8WorkspaceCreator); - -# ************************************************************ -# Data Section -# ************************************************************ - -my %lang_map = ('cplusplus' => 'Visual C#', - 'csharp' => 'Visual C#', - 'vb' => 'Visual Basic', - 'java' => 'Visual J#'); +@ISA = qw(VC9WorkspaceCreator); # ************************************************************ # Subroutine Section diff --git a/modules/VC7WorkspaceCreator.pm b/modules/VC7WorkspaceCreator.pm index e3f21c8f..be389f73 100644 --- a/modules/VC7WorkspaceCreator.pm +++ b/modules/VC7WorkspaceCreator.pm @@ -197,7 +197,7 @@ sub write_comps { if (index($cfg, 'Win32') >= 0 || index($cfg, 'x64') >= 0) { $deployable = 0; $buildable = 1; - } elsif ($custom_only) { + } elsif ($custom_only) { $deployable = 0; } if (defined $anycpu) { diff --git a/modules/VC9ProjectCreator.pm b/modules/VC9ProjectCreator.pm index 272325b2..fea5ee31 100644 --- a/modules/VC9ProjectCreator.pm +++ b/modules/VC9ProjectCreator.pm @@ -17,7 +17,11 @@ use VC8ProjectCreator; use vars qw(@ISA); @ISA = qw(VC8ProjectCreator); -my %config = ('vcversion' => '9.00'); +my %config = ('vcversion' => '9.00', + 'prversion' => '9.0.30729', + 'toolsversion' => '3.5', + 'xmlheader' => 1, + ); # ************************************************************ # Subroutine Section diff --git a/modules/VC9WorkspaceCreator.pm b/modules/VC9WorkspaceCreator.pm index 5722c397..e0a5ba6b 100644 --- a/modules/VC9WorkspaceCreator.pm +++ b/modules/VC9WorkspaceCreator.pm @@ -19,15 +19,6 @@ use vars qw(@ISA); @ISA = qw(VC8WorkspaceCreator); # ************************************************************ -# Data Section -# ************************************************************ - -my %lang_map = ('cplusplus' => 'Visual C#', - 'csharp' => 'Visual C#', - 'vb' => 'Visual Basic', - 'java' => 'Visual J#'); - -# ************************************************************ # Subroutine Section # ************************************************************ diff --git a/modules/VCProjectBase.pm b/modules/VCProjectBase.pm index 5d5d5191..47786b49 100644 --- a/modules/VCProjectBase.pm +++ b/modules/VCProjectBase.pm @@ -44,4 +44,18 @@ sub dependency_is_filename { } +sub get_properties { + my $self = shift; + + ## Get the base class properties and add the properties that we + ## support. + my $props = $self->WinProjectBase::get_properties(); + + ## All projects that use this base class are for Microsoft compilers. + $$props{'microsoft'} = 1; + + return $props; +} + + 1; diff --git a/modules/Version.pm b/modules/Version.pm index 00ac9c53..7edc61a5 100644 --- a/modules/Version.pm +++ b/modules/Version.pm @@ -17,7 +17,7 @@ use strict; # ************************************************************ ## This is the starting major and minor version -my $version = '3.6'; +my $version = '3.7'; my $once = 1; # ************************************************************ diff --git a/modules/WinProjectBase.pm b/modules/WinProjectBase.pm index 6f3877b9..0ef49418 100644 --- a/modules/WinProjectBase.pm +++ b/modules/WinProjectBase.pm @@ -102,4 +102,18 @@ sub file_sorter { } +sub get_properties { + my $self = shift; + + ## Get the base class properties and add the properties that we + ## support. + my $props = $self->ProjectCreator::get_properties(); + + ## All projects that use this base class are for Windows. + $$props{'windows'} = 1; + + return $props; +} + + 1; diff --git a/templates/vc8csharp.mpd b/templates/vc8csharp.mpd index 3ff809a9..ad4459e6 100644 --- a/templates/vc8csharp.mpd +++ b/templates/vc8csharp.mpd @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<%if(xmlheader)%><?xml version="1.0" encoding="utf-8"?> +<%endif%><Project<%if(toolsversion)%> ToolsVersion="<%toolsversion%>"<%endif%> DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion><%prversion("8.0.50727")%></ProductVersion> diff --git a/templates/vc8platforms.mpt b/templates/vc8platforms.mpt index 304a8c44..1425224d 100644 --- a/templates/vc8platforms.mpt +++ b/templates/vc8platforms.mpt @@ -72,9 +72,9 @@ Windows Mobile 6 Standard SDK (ARMV4I) { platform_defines = _WIN32_WCE=$(CEVER) UNDER_CE=$(CEVER) WINCE _WINDOWS $(PLATFORMDEFINES) link_options = /subsystem:windowsce,5.02 lit_libs += iphlpapi - CharacterSet = "1" subsystem = "0" TargetMachine = "0" + charset = 1 } Windows Mobile 6 Professional SDK (ARMV4I) { @@ -84,9 +84,9 @@ Windows Mobile 6 Professional SDK (ARMV4I) { platform_defines = _WIN32_WCE=$(CEVER) UNDER_CE=$(CEVER) WINCE _WINDOWS $(PLATFORMDEFINES) link_options = /subsystem:windowsce,5.02 lit_libs += iphlpapi - CharacterSet = "1" subsystem = "0" TargetMachine = "0" + charset = 1 } SuperSonic_CE6 (ARMV4I) { @@ -98,5 +98,77 @@ SuperSonic_CE6 (ARMV4I) { lit_libs += iphlpapi subsystem = "0" TargetMachine = "3" + charset = 1 } +eBox4300_WINCE600_SDK (x86) { + unicode = 1 + output_subdir = eBox4300_WINCE600_SDK + cpu_defines = $(ARCHFAM) $(_ARCHFAM_) + platform_defines = UNDER_CE=$(CEVER) _WIN32_WCE=$(CEVER) WINCE _WINDOWS _UNICODE UNICODE + link_options = /subsystem:windowsce,6.0 + lit_libs += iphlpapi + subsystem = "0" + TargetMachine = "0" + charset = 1 +} + +eBox2300_WINCE600_SDK (x86) { + unicode = 1 + output_subdir = eBox2300_WINCE600_SDK + cpu_defines = $(ARCHFAM) $(_ARCHFAM_) + platform_defines = UNDER_CE=$(CEVER) _WIN32_WCE=$(CEVER) WINCE _WINDOWS _UNICODE UNICODE + link_options = /subsystem:windowsce,6.0 + lit_libs += iphlpapi + subsystem = "0" + TargetMachine = "0" + charset = 1 +} + +Beckhoff_HMI_500 (x86) { + unicode = 1 + output_subdir = Beckhoff_HMI_500 (x86) + cpu_defines = $(ARCHFAM) $(_ARCHFAM_) + platform_defines = UNDER_CE=$(CEVER) _WIN32_WCE=$(CEVER) WINCE _WINDOWS _UNICODE UNICODE + link_options = /subsystem:windowsce,5.00 + lit_libs += iphlpapi + subsystem = "0" + TargetMachine = "0" + charset = 1 +} + +Beckhoff_HMI_500 (ARMV4I) { + unicode = 1 + output_subdir = Beckhoff_HMI_500 (ARMV4i) + cpu_defines = $(ARCHFAM) $(_ARCHFAM_) + platform_defines = UNDER_CE=$(CEVER) _WIN32_WCE=$(CEVER) WINCE _WINDOWS _UNICODE UNICODE + link_options = /subsystem:windowsce,5.00 + lit_libs += iphlpapi + subsystem = "0" + TargetMachine = "0" + charset = 1 +} + +BR APC620 PPC700 CE 5.00 V1.2 (x86) { + unicode = 1 + output_subdir = BR APC620 + PPC700 CE 5.00 V1.2 (x86) + cpu_defines = $(ARCHFAM) $(_ARCHFAM_) + platform_defines = UNDER_CE=$(CEVER) _WIN32_WCE=$(CEVER) WINCE _WINDOWS _UNICODE UNICODE + link_options = /subsystem:windowsce,5.00 + lit_libs += iphlpapi + subsystem = "0" + TargetMachine = "0" + charset = 1 +} + +STANDARDSDK_500 (x86) { + unicode = 1 + output_subdir = STANDARDSDK_500_x86 + cpu_defines = $(ARCHFAM) $(_ARCHFAM_) + platform_defines = UNDER_CE=$(CEVER) _WIN32_WCE=$(CEVER) WINCE _WINDOWS _UNICODE UNICODE + link_options = /subsystem:windowsce,5.00 + lit_libs += iphlpapi + subsystem = "0" + TargetMachine = "0" + charset = 1 +} |
