Reviewers: kpreid2,


Please review this at http://codereview.appspot.com/6814097/

Affected files:
  M     build.xml
  M     tools/copy-for-maven


Index: build.xml
===================================================================
--- build.xml   (revision 5138)
+++ build.xml   (working copy)
@@ -1693,7 +1693,8 @@
   </target>


-  <target name="mvn-install" depends="jars,javadocs,precajole,pom">
+  <target name="mvn-install" depends="jars,javadocs,precajole,pom"
+      description="Generate maven artifacts and install them in ~/.m2">
     <artifact:install file="${maven-jarfile-nodeps}">
       <pom refid="project"/>
       <attach file="${maven-jarfile-javadoc}" classifier="javadoc"/>
@@ -1709,10 +1710,8 @@
   -->

   <!-- TODO(felix8a): fix this or delete this -->
-  <target name="mvn-deploy"
-    depends="mvn-install"
- description="Signs and Deploys caja artifacts to the central maven repo">
-
+ <!-- description="Signs and Deploys caja artifacts to the central maven repo" -->
+  <target name="mvn-deploy" depends="mvn-install">
     <!-- sign and deploy the main artifact -->
     <artifact:mvn>
<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
Index: tools/copy-for-maven
===================================================================
--- tools/copy-for-maven        (revision 5138)
+++ tools/copy-for-maven        (working copy)
@@ -54,10 +54,13 @@

     cp(src + '/ant-maven/pom.xml',              dvcaja + '.pom')
     cp(src + '/ant-jars/pluginc.jar',           dvcaja + '.jar')
-    cp(src + '/ant-jars/pluginc-javadocs.jar',  dvcaja + '-javadocs.jar')
-    cp(src + '/ant-jars/precajole.jar',         dvcaja + '-precajole.jar')
+    cp(src + '/ant-jars/pluginc-javadocs.jar',  dvcaja + '-javadoc.jar')
     cp(src + '/ant-jars/pluginc-src.jar',       dvcaja + '-sources.jar')

+    # TODO(felix8a): precajole should be a separate maven artifact.
+    # This is a temporary hack to capture the jar for a release.
+    cp(src + '/ant-jars/precajole.jar',         dvcaja + '-precajole.jar')
+
     for f in glob.glob(dver + '/*'):
         if re.search(r'[.](pom|jar)$', f):
             checksum(f)


Reply via email to