diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2015-05-15 10:56:11 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2015-05-15 10:56:11 +0200 |
| commit | 4f9054decf2026decd0340a54b461fffc73058e4 (patch) | |
| tree | 7c4dd63febf27916ef687a9ee19cad2059b95366 /ACE | |
| parent | 1b7987cf5c72f63f8d6d4e41595cdee7160de8ef (diff) | |
| download | ATCD-4f9054decf2026decd0340a54b461fffc73058e4.tar.gz | |
Package vc12 and vc14 solutions
* ACE/NEWS:
* ACE/bin/make_release.py:
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/NEWS | 3 | ||||
| -rwxr-xr-x | ACE/bin/make_release.py | 9 |
2 files changed, 8 insertions, 4 deletions
@@ -4,6 +4,9 @@ USER VISIBLE CHANGES BETWEEN ACE-6.3.2 and ACE-6.3.3 . Visual Studio 2015 has adequate C++11 support, because of this ACE_HAS_CPP11 is now defined with this compiler +. As part of the release script we now generate vc12 and vc14 + solution files which are packaged as part of the release + USER VISIBLE CHANGES BETWEEN ACE-6.3.1 and ACE-6.3.2 ==================================================== diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py index e8d8dfb17cb..429f82527e4 100755 --- a/ACE/bin/make_release.py +++ b/ACE/bin/make_release.py @@ -940,8 +940,8 @@ def generate_workspaces (stage_dir): mpc_option += ' -relative CIAO_ROOT=' + stage_dir + '/ACE_wrappers/TAO/CIAO ' mpc_option += ' -relative DANCE_ROOT=' + stage_dir + '/ACE_wrappers/TAO/DAnCE ' msvc_exclude_option = ' -exclude TAO/CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc,TAO/CIAO/CIAO_TAO_OpenDDS.mwc,TAO/CIAO/CIAO_TAO_DAnCE_OpenDDS_shapes.mwc ' - vc11_option = ' -name_modifier *_vc11 ' vc12_option = ' -name_modifier *_vc12 ' + vc14_option = ' -name_modifier *_vc14 ' redirect_option = str () if not opts.verbose: @@ -950,12 +950,13 @@ def generate_workspaces (stage_dir): print "\tGenerating GNUmakefiles...." ex (mpc_command + " -type gnuace " + exclude_option + workers_option + mpc_option + redirect_option) - print "\tGenerating VC11 solutions..." - ex (mpc_command + " -type vc11 " + msvc_exclude_option + mpc_option + workers_option + vc11_option + redirect_option) - print "\tGenerating VC12 solutions..." ex (mpc_command + " -type vc12 " + msvc_exclude_option + mpc_option + workers_option + vc12_option + redirect_option) + print "\tGenerating VC14 solutions..." + ex (mpc_command + " -type vc14 " + msvc_exclude_option + mpc_option + workers_option + vc14_option + redirect_option) + + print "\tCorrecting permissions for all generated files..." ex ("find ./ -name '*.vc[p,w]' -or -name '*.bmak' -or -name '*.vcproj' -or -name '*.sln' -or -name '*.vcxproj' -or -name '*.filters' -or -name 'GNUmake*' | xargs chmod 0644") |