[Jython-checkins] jython (merge 2.5 -> default): Merge 2.5.

[frank.wierzbicki]

http://hg.python.org/jython/rev/8c5ec7fccfb2
changeset:   6824:8c5ec7fccfb2
parent:      6822:825a988dfa67
parent:      6823:7a6dca49e49d
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Fri Aug 03 13:26:48 2012 -0700
summary:
  Merge 2.5.

files:
  build.xml       |  20 ++++++++++++++++++++
  maven/build.xml |  33 ++++++++++++++++++++++++++++-----
  2 files changed, 48 insertions(+), 5 deletions(-)


diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -240,6 +240,8 @@
         <property name="jython.dev.jar" value="jython-dev.jar" />
         <property name="jython.deploy.jar" value="jython.jar" />
         <property name="jython.standalone.jar" value="jython-standalone.jar" />
+        <property name="jython.javadoc.jar" value="javadoc.jar" />
+        <property name="jython.sources.jar" value="sources.jar" />
     </target>
 
     <target name="full-preinit">
@@ -770,6 +772,20 @@
         </javadoc>
     </target>
 
+    <target name="all-jars" depends="jar-standalone, javadoc">
+        <jar destfile="dist/${jython.javadoc.jar}">
+            <fileset dir="${apidoc.dir}" includes="**"/>
+        </jar>
+        <jar destfile="dist/${jython.sources.jar}">
+            <fileset dir="${jython.base.dir}">
+                <exclude name="build/**" />
+                <exclude name="dist/**" />
+                <exclude name="extlibs/**" />
+                <exclude name="Doc/**" />
+            </fileset>
+        </jar>
+    </target>
+
     <target name="copy-license" if="do.checkout">
         <echo>copy CPython LICENSE from ${checkout.dir}/python</echo>
         <copy file="${checkout.dir}/python/LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
@@ -918,6 +934,8 @@
             <fileset dir="${dist.dir}">
                 <exclude name="${jython.dev.jar}"/>
                 <exclude name="${jython.standalone.jar}"/>
+                <exclude name="${jython.javadoc.jar}"/>
+                <exclude name="${jython.sources.jar}"/>
                 <exclude name="callbacker_test.jar"/>
                 <exclude name="extlibs/svnant-jars/**" />
                 <exclude name="extlibs/antlr*.jar" />
@@ -978,6 +996,8 @@
                     <exclude name="javatests/**/*" />
                     <exclude name="**/InterpTestCase.java" />
                     <exclude name="org/python/antlr/**" />
+                    <exclude name=".classpath" />
+                    <exclude name=".project" />
                 </fileset>
             </batchtest>
         </junit>
diff --git a/maven/build.xml b/maven/build.xml
--- a/maven/build.xml
+++ b/maven/build.xml
@@ -29,6 +29,7 @@
 <!-- ================================================= -->
 <project name="jython-maven" default="bundle-all" basedir="..">
 
+  <property file="${user.home}/ant.properties" />
   <property file="${basedir}/default.properties"/>
 
   <property name="project.version" value="2.7.0-SNAPSHOT"/>
@@ -137,7 +138,11 @@
     <sequential>
       <delete dir="${build.dir}"/>
       <mkdir dir="${build.dir}"/>
-      <copy file="maven/pom-template.xml" tofile="${build.dir}/pom.xml">
+      <copy file="maven/pom-template.xml"
+            tofile="maven/pom.xml">
+<!--        
+            tofile="@{build.dir}/@{artifactId}-{project.version}.pom">
+-->
         <filterset>
           <filter token="PROJECT-VERSION" value="${project.version}"/>
           <filter token="ARTIFACT-ID" value="@{artifactId}"/>
@@ -148,9 +153,27 @@
       <copy file="${dist.base}/@{artifactId}.jar"
             tofile="${build.dir}/@{artifactId}-${project.version}.jar"/>
 
-      <jar jarfile="${build.dir}/@{artifactId}-${project.version}-sources.jar">
-        <fileset dir="${src.dir}" includes="**/*.java"/>
-      </jar>
+      <copy file="dist/sources.jar" tofile="${build.dir}/@{artifactId}-${project.version}-sources.jar"/>
+      <copy file="dist/javadoc.jar" tofile="${build.dir}/@{artifactId}-${project.version}-javadoc.jar"/>
+
+<!-- TODO: make the gpg sign step optional - for now it is commented out.
+      <exec executable="gpg">
+          <arg value="-ab"/>
+          <arg value="${build.dir}/@{artifactId}-${project.version}.jar"/>
+      </exec>
+
+      <exec executable="gpg">
+          <arg value="-ab"/>
+          <arg value="${build.dir}/@{artifactId}-${project.version}-javadoc.jar"/>
+      </exec>
+
+      <exec executable="gpg">
+          <arg value="-ab"/>
+          <arg value="${build.dir}/@{artifactId}-${project.version}-sources.jar"/>
+      </exec>
+
+-->
+
     </sequential>
   </macrodef>
 
@@ -172,7 +195,7 @@
   </target>
 
   <target name="build-jython" if="do.build">
-    <ant antfile="build.xml" target="jar-standalone"/>
+    <ant antfile="build.xml" target="all-jars"/>
   </target>
 
   <target name="prep" depends="build-jython, validate-pom"/>

-- 
Repository URL: http://hg.python.org/jython