summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@users.noreply.github.com>2016-10-11 12:46:13 +0200
committerGitHub <noreply@github.com>2016-10-11 12:46:13 +0200
commit5c16059dc99fd9a2feb7cd991c3fcae763abe5f4 (patch)
treefcac7e5e8e86f4115a94179130520b3c220dfdd4
parent0273e578281f29a99c62695983bebd6ffbdad629 (diff)
parent39650d84224ebb9e7a8af77af713de1ac1882323 (diff)
downloadATCD-5c16059dc99fd9a2feb7cd991c3fcae763abe5f4.tar.gz
Merge pull request #313 from jwillemsen/master
Simplify release script
-rwxr-xr-xACE/bin/make_release.py21
-rw-r--r--ACE/docs/bczar/bczar.html2
2 files changed, 2 insertions, 21 deletions
diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py
index 2ed7c760211..963cc12cd33 100755
--- a/ACE/bin/make_release.py
+++ b/ACE/bin/make_release.py
@@ -28,13 +28,6 @@ args=None
release"""
doc_root=None
-""" Full name of person performing release, obtained from the
-environment"""
-signature=None
-
-""" Full email address of person performing release. """
-mailid = None
-
""" A dict containing version information used for the release.
This dict contains entries of the form
COMPONENT_version
@@ -130,23 +123,13 @@ def ex (command):
def check_environment ():
from os import getenv
- global doc_root, signature, mailid, opts
+ global doc_root, opts
doc_root = getenv ("DOC_ROOT")
if (doc_root is None):
print "ERROR: Environment DOC_ROOT must be defined."
return False
- signature = getenv ("SIGNATURE")
- if (signature is None):
- print "ERROR: Must define SIGNATURE environment variable to your full name, used in changelogs."
- return False
-
- mailid = getenv ("MAILID")
- if (mailid is None):
- print "ERROR: Must define MAILID environment to your email address for changelogs."
- return False
-
return True
def vprint (string):
@@ -670,7 +653,7 @@ def export_wc (stage_dir):
print ("Retrieving MPC with tag " + tag)
ex ("git clone --depth 1 --branch " + tag + " " + opts.mpc_root + " " + stage_dir + "/MPC")
- # Settting up stage_dir
+ # Setting up stage_dir
print ("Moving ACE")
ex ("mv " + stage_dir + "/ACE_TAO/ACE " + stage_dir + "/ACE_wrappers")
print ("Moving TAO")
diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html
index 124acf116ad..c82c40e552d 100644
--- a/ACE/docs/bczar/bczar.html
+++ b/ACE/docs/bczar/bczar.html
@@ -225,8 +225,6 @@
mkdir DOC_ROOT<br>
cd DOC_ROOT<br>
export DOC_ROOT=$PWD<br>
- export SIGNATURE="Johnny Willemsen"<br>
- export MAILID=jwillemsen@remedy.nl<br>
git clone https://github.com/DOCGroup/ACE_TAO.git ACE_TAO<br>
git clone https://github.com/DOCGroup/MPC.git MPC<br>
cd ACE_TAO<br>