forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

fix ordering issues with parameters (again!) argh.

This commit is contained in:
Terence Parr 2015-01-23 21:38:46 -08:00
parent 4cc275ab52
commit 8d9c7d2801
2 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bild.py
View File

@ -328,20 +328,20 @@ def install(): # mvn installed locally in ~/.m2, java jar to /usr/local/lib if p
require(mkdoc)
jarfile = "dist/antlr4-" + VERSION + "-complete.jar"
print_and_log("Maven installing "+jarfile+" and *-sources.jar, *-javadoc.jar")
mvn_install(jarfile,
"dist/antlr4-" + VERSION + "-complete-sources.jar",
"dist/antlr4-" + VERSION + "-complete-javadoc.jar",
"org.antlr",
"antlr4",
VERSION)
mvn_install(binjar=jarfile,
srcjar="dist/antlr4-" + VERSION + "-complete-sources.jar",
docjar="dist/antlr4-" + VERSION + "-complete-javadoc.jar",
groupid="org.antlr",
artifactid="antlr4",
version=VERSION)
runtimejarfile = "dist/antlr4-" + VERSION + ".jar"
print_and_log("Maven installing "+runtimejarfile+" and *-sources.jar, *-javadoc.jar")
mvn_install(runtimejarfile,
"dist/antlr4-" + VERSION + "-sources.jar",
"dist/antlr4-" + VERSION + "-javadoc.jar",
"org.antlr",
"antlr4-runtime",
VERSION)
mvn_install(binjar=runtimejarfile,
srcjar="dist/antlr4-" + VERSION + "-sources.jar",
docjar="dist/antlr4-" + VERSION + "-javadoc.jar",
groupid="org.antlr",
artifactid="antlr4-runtime",
version=VERSION)
if os.path.exists("/usr/local/lib"):
libjar = "/usr/local/lib/antlr-" + VERSION + "-complete.jar"
print_and_log("Installing "+libjar)

33
deploy.py
View File

@ -50,18 +50,25 @@ def mvn_snapshot(): # assumes that you have ~/.m2/settings.xml set up
binjar = uniformpath("dist/antlr4-%s-complete.jar" % VERSION)
docjar = uniformpath("dist/antlr4-%s-complete-javadoc.jar" % VERSION)
srcjar = uniformpath("dist/antlr4-%s-complete-sources.jar" % VERSION)
mvn_deploy("deploy:deploy-file",
binjar, docjar, srcjar, repositoryid="ossrh", groupid="org.antlr",
artifactid="antlr4", pomfile="tool/pom.xml", version=VERSION,
url="https://oss.sonatype.org/content/repositories/snapshots")
mvn(command="deploy:deploy-file",
binjar=binjar,
srcjar=srcjar,
docjar=docjar,
repositoryid="ossrh",
artifactid="antlr4",
pomfile="tool/pom.xml",
url="https://oss.sonatype.org/content/repositories/snapshots")
binjar = uniformpath("dist/antlr4-%s.jar" % VERSION)
docjar = uniformpath("dist/antlr4-%s-javadoc.jar" % VERSION)
srcjar = uniformpath("dist/antlr4-%s-sources.jar" % VERSION)
mvn_deploy("deploy:deploy-file",
binjar, docjar, srcjar, repositoryid="ossrh", groupid="org.antlr",
artifactid="antlr4-runtime", pomfile="runtime/Java/pom.xml", version=VERSION,
url="https://oss.sonatype.org/content/repositories/snapshots")
mvn(command="deploy:deploy-file",
binjar=binjar,
srcjar=srcjar,
docjar=docjar,
repositoryid="ossrh", artifactid="antlr4-runtime",
pomfile="runtime/Java/pom.xml",
url="https://oss.sonatype.org/content/repositories/snapshots")
# deploy to maven central
@ -89,8 +96,10 @@ def mvn_deploy(): # assumes that you have ~/.m2/settings.xml set up
binjar = uniformpath("dist/antlr4-%s-complete.jar" % VERSION)
docjar = uniformpath("dist/antlr4-%s-complete-javadoc.jar" % VERSION)
srcjar = uniformpath("dist/antlr4-%s-complete-sources.jar" % VERSION)
mvn("gpg:sign-and-deploy-file",
binjar, docjar, srcjar, repositoryid="ossrh",
mvn(command="gpg:sign-and-deploy-file",
binjar=binjar,
srcjar=srcjar,
docjar=docjar, repositoryid="ossrh",
pomfile="tool/pom.xml",
url="https://oss.sonatype.org/service/local/staging/deploy/maven2/")
@ -99,7 +108,9 @@ def mvn_deploy(): # assumes that you have ~/.m2/settings.xml set up
docjar = uniformpath("dist/antlr4-%s-javadoc.jar" % VERSION)
srcjar = uniformpath("dist/antlr4-%s-sources.jar" % VERSION)
mvn("gpg:sign-and-deploy-file",
binjar, docjar, srcjar, repositoryid="ossrh",
binjar=binjar,
srcjar=srcjar,
docjar=docjar, repositoryid="ossrh",
pomfile="runtime/Java/pom.xml",
url="https://oss.sonatype.org/service/local/staging/deploy/maven2/")