summaryrefslogtreecommitdiff
path: root/ACE/bin/make_release.py
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/bin/make_release.py')
-rwxr-xr-xACE/bin/make_release.py27
1 files changed, 5 insertions, 22 deletions
diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py
index 433f45a6612..de1c8301744 100755
--- a/ACE/bin/make_release.py
+++ b/ACE/bin/make_release.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python2.5
+#!/usr/bin/python
# @file make_release.py
# @author William R. Otte <wotte@dre.vanderbilt.edu>
@@ -111,8 +111,6 @@ def parse_args ():
parser.add_option ("--verbose", dest="verbose", action="store_true",
help="Print out actions as they are being performed",
default=False)
- parser.add_option ("--override-host", dest="override_host", action="store_true",
- help="Override the default release host. Not reccomended", default=False)
(options, arguments) = parser.parse_args ()
if options.action is None:
@@ -165,12 +163,6 @@ def check_environment ():
print "ERROR: Must define MAILID environment to your email address for changelogs."
return False
- from socket import gethostname
-
- if ((not opts.override_host) and gethostname () != "anduril.dre.vanderbilt.edu"):
- print "ERROR: Must run script on anduril.dre.vanderbilt.edu"
- return False
-
return True
def vprint (string):
@@ -862,9 +854,6 @@ 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/CIAO/DAnCE '
- static_vc71_option = ' -static -name_modifier *_vc71_Static -apply_project -exclude TAO/CIAO '
- static_vc71_option += mpc_option
-
static_vc8_option = ' -static -name_modifier *_vc8_Static -apply_project -exclude TAO/CIAO '
static_vc8_option += mpc_option
@@ -873,7 +862,6 @@ def generate_workspaces (stage_dir):
vc9_option = ' -name_modifier *_vc9 '
vc8_option = ' -name_modifier *_vc8 '
- vc71_option = ' -name_modifier *_vc71 '
# Build option string for VC8 platforms
ce_option = ' -name_modifier *_vc8_WinCE -features "uses_wchar=1,wince=1" '
@@ -881,12 +869,16 @@ def generate_workspaces (stage_dir):
ce_option += ' -value_template platforms+=\'"Windows Mobile 5.0 Smartphone SDK (ARMV4I)"\' '
ce_option += ' -value_template platforms+=\'"Windows Mobile 6 Standard SDK (ARMV4I)"\' '
ce_option += ' -value_template platforms+=\'"Windows Mobile 6 Professional SDK (ARMV4I)"\' '
+ ce_option += ' -exclude TAO/CIAO '
redirect_option = str ()
if not opts.verbose:
redirect_option = " >> ../mpc.log 2>&1"
# Generate GNUmakefiles
+ print "\tBootstrapping autotools support"
+ ex ("bin/bootstrap " + redirect_option)
+
print "\tGenerating GNUmakefiles...."
ex (mpc_command + " -type gnuace " + exclude_option + mpc_option + redirect_option)
@@ -899,21 +891,12 @@ def generate_workspaces (stage_dir):
print "\tGenerating VC8 Windows CE solutions..."
ex (mpc_command + " -type vc8 " + mpc_option + ce_option + redirect_option)
- print "\tGenerating VC71 solutions..."
- ex (mpc_command + " -type vc71 " + mpc_option + vc71_option + redirect_option)
-
- print "\tGenerating VC71 Static solutions"
- ex (mpc_command + " -type vc71 " + static_vc71_option + redirect_option)
-
print "\tGenerating VC8 Static solutions"
ex (mpc_command + " -type vc8 " + static_vc8_option + redirect_option)
print "\tGenerating VC9 Static solutions"
ex (mpc_command + " -type vc9 " + static_vc9_option + redirect_option)
- print "\tBootstrapping autotools support"
- ex ("bin/bootstrap " + 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 'GNUmake*' | xargs chmod 0644")