add release Ant target

Author: vladak

build.xml

@@ -95,6 +95,7 @@ Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
     <property name="distname" value="opengrok"/>
     <property name="src.dir" location="src"/>
     <property name="src.generatedsrc.dir" location="generatedsrc"/>
+    <property name="tardest" value="${distname}-${version}.tar.gz"/>
 
     <property name="findbugs.home" value="${user.home}/.ant/lib/findbugs"/>
     <property name="checkstyle.home" value="${user.home}/.ant/lib/checkstyle"/>
@@ -507,7 +508,7 @@ Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
     </target>
 
     <target name="dist" depends="jar">
-        <tar destfile="${dist.dir}/${distname}-${version}.tar.gz"
+        <tar destfile="${dist.dir}/${tardest}"
              compression="gzip">
             <tarfileset dir="." prefix="${distname}-${version}/doc">
                 <include name="README.txt"/>
@@ -950,6 +951,7 @@ Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
     <property name="codebase"       value="org/opensolaris/opengrok"/>
     <property name="codebase.dot"   value="org.opensolaris.opengrok"/>
     <property name="web.src.dir" location="web" />
+    <property name="tools.dir" location="tools" />
 
     <patternset id="libs">
         <include name="*.jar" />
@@ -1044,5 +1046,18 @@ Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
         </javac>
     </target>
 
+    <target name="release" depends="dist,package">
+        <exec os="SunOS" executable="${tools.dir}/dorelease.py" failonerror="true">
+	    <arg value="-d"/>
+	    <arg value="-D new"/>
+	    <arg value="-t ${version}"/>
+	    <!-- The directory of the files should really be ${dist.dir} however it does not work. -->
+	    <arg file="dist/${tardest}"/>
+	    <!-- These 2 files should really be conditional to avoid the whole target to be SunOS dependent. -->
+	    <arg file="dist/OSOLopengrok-${version}.pkg"/>
+	    <arg file="dist/${distname}-${version}.p5p"/>
+        </exec>
+    </target>
+
     <target name="all" depends="clean,jar,compile.jsp,test,javadoc,pmd,findbugs-xml,checkstyle" />
 </project>

doc/release.txt

@@ -19,7 +19,6 @@ jars/dirs for tests
 
    ant clean
    ant # defaults to jar currently
-   ant package
 
 2) check all tests, tests code coverage:
    junit, pmd, findbugs, checkstyle, emma, jdepend
@@ -34,7 +33,7 @@ The release is OK, once above is fullfilled to our satisfaction.
 
 3) produce proper distributions
 
-Check them before upload, always try to build on Solaris, since gnu tar might
+Check them before upload, always try to build on Solaris, since GNU tar might
 create a non-standard compliant .tgz version and tag from step 0) will be used
 to produce the archive
 
@@ -68,9 +67,14 @@ number (0.12))
 
 4) Create the release and upload the files via GitHub API:
 
-   ./tools/dorelease.py -d -u <github_login> \
-       -D "some release description" \
-       -t <tag> dist/*.p5p dist/*.pkg dist/*.tar.gz
+   First, make sure these environment variables are set:
 
-   Note: for pre-releases use the -P option
+      GITHUB_USER (your Github user name)
+      GITHUB_PASSWORD (your Github password)
+      https_proxy (set to host:port of proxy if behind HTTP proxy)
+      OPENGROK_PRERELEASE (set to non-empty if creating release candidate)
+
+   Next:
+
+      ant release
 

tools/dorelease.py

@@ -107,15 +107,16 @@ def get_args():
         description='Create release using Github API.')
     parser.add_argument("-d", "--debug", help="turn on debugging",
 	    action="store_true")
+    parser.add_argument("-n", "--dryrun", help="perform dry run",
+	    action="store_true")
     parser.add_argument("-u", "--user", nargs=1, metavar='user',
-        required=True,
-        help="GitHub user. Specify password with GITHUB_PASSWORD env var.")
+        help="GitHub user. Specify user with GITHUB_USER and password with GITHUB_PASSWORD env var.")
     parser.add_argument("-D", "--description", nargs=1,
         metavar='description', required=True,
         help="Description text for the release")
     parser.add_argument("-P", "--prerelease",
         default = False, action="store_true",
-        help="Is this a pre-release ?")
+        help="Is this a pre-release ? (also can use OPENGROK_PRERELEASE env var)")
     parser.add_argument("-t", "--tag", nargs=1, metavar='tag',
         required=True, help="New release tag")
     parser.add_argument("-p", "--proxy", nargs=1,
@@ -185,6 +186,16 @@ def upload_file(filepath, upload_url, headers, timeout, proxy=None):
 def main():
     arguments = get_args()
 
+    user = None
+    if not arguments.user:
+        try:
+            user = os.environ["GITHUB_USER"]
+        except:
+            print "Need -u or specify user with GITHUB_USER env var"
+            sys.exit(1)
+    else:
+        user = arguments.user[0]
+
     if arguments.debug:
         logging.basicConfig(
             level=logging.DEBUG,
@@ -195,10 +206,9 @@ def main():
 
     # There is exactly 1 item in the list.
     # TODO: there should be better way how to achieve this.
-    user = arguments.user[0]
     description = arguments.description[0]
-    tag = arguments.tag[0]
-    logger.debug("using tag {}".format(tag))
+    tag = arguments.tag[0].strip()
+    logger.debug("using tag '{}'".format(tag))
 
     proxy = None
     if arguments.proxy:
@@ -214,6 +224,7 @@ def main():
     # First check that the files indeed exist and are readable.
     # TODO: can probably do it from parser using action
     for file in arguments.files:
+        logger.debug("checking file {}".format(file))
         if not os.path.isfile(file) or not os.access(file, os.R_OK):
 	    print "file '" + file + "' does not exist or is not readable"
             sys.exit(1)
@@ -234,16 +245,31 @@ def main():
     headers = {}
     headers['Authorization'] = _get_auth(user, password)
 
+    prerelease = False
+    if arguments.prerelease:
+        prerelease = True
+    else:
+        try:
+            if os.environ["OPENGROK_PRERELEASE"]:
+                prerelease = True
+        except:
+            prerelease = False
+
     # Create new release and get the upload URL.
-    rel_dict = get_release_dict(tag, description, arguments.prerelease)
+    rel_dict = get_release_dict(tag, description, prerelease)
     payload = json.dumps(rel_dict)
     if (arguments.debug):
         pprint(rel_dict)
         pprint(payload)
     upload_url = None
+
+    if arguments.dryrun:
+        print "Dry run in effect, exiting"
+        sys.exit(0)
+
     try:
         _url = "https://api.github.com"
-        url = '%s%s' % (_url, "/repos/vladak/foo/releases")
+        url = '%s%s' % (_url, "/repos/OpenGrok/OpenGrok/releases")
         release_json = post_request(url,
             arguments.timeout, payload, headers, proxy)
         upload_url = release_json["upload_url"]