river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtra...@apache.org
Subject svn commit: r1725883 - in /river/jtsk/trunk: build.xml common.xml
Date Thu, 21 Jan 2016 08:29:42 GMT
Author: gtrasuk
Date: Thu Jan 21 08:29:41 2016
New Revision: 1725883

URL: http://svn.apache.org/viewvc?rev=1725883&view=rev
Log:

Getting closer to having a clean release artifact...
- No compiled binaries in the source artifact, except for a couple of jars used as test resources.
- appropriate exclusions from the source artifact, e.g. 'nbprojects', etc
- Removed the duplicate NOTICE and LICENSE files.
- doap_river is moved up to a higher node in the repo.

There are a few outstanding questions...
- Does it really make sense to do a 'binary' release?
- Should the KEYS file be in the release artifact?


Modified:
    river/jtsk/trunk/build.xml
    river/jtsk/trunk/common.xml

Modified: river/jtsk/trunk/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/build.xml?rev=1725883&r1=1725882&r2=1725883&view=diff
==============================================================================
--- river/jtsk/trunk/build.xml (original)
+++ river/jtsk/trunk/build.xml Thu Jan 21 08:29:41 2016
@@ -87,7 +87,7 @@
     </target>
 
     <target name="release" description="Create source and binary release packages"
-		depends="release-src, release-bin, release-doc">
+		depends="clean, all.build, release-src, release-bin, release-doc">
     </target>
 
     <fileset id="river.bin.files" dir="${basedir}">
@@ -108,20 +108,6 @@
         <exclude name="${doc}/release-notes/new.html"/>
     </fileset>
 
-    <fileset id="examples.bin.files" dir="${basedir}/examples">
-        <include name="**/${lib}/**"/>
-        <include name="**/config/**"/>
-        <exclude name="**/config/META-INF/"/>
-        <include name="**/prebuiltkeys/**"/>
-        <include name="**/scripts/*.bat"/>
-        <include name="**/${doc}/**"/>
-        <include name="**/*.html"/>
-    </fileset>
-    
-    <fileset id="examples.bin.exec.files" dir="${basedir}/examples">
-        <include name="**/scripts/*.sh"/>
-    </fileset>
-
     <!-- TODO create separate bin distribution for the qa tests? -->
     <!--<fileset id="qa.bin.files" dir="${basedir}/qa">
         <include name="${lib}/**"/>
@@ -138,16 +124,10 @@
         <delete file="${bin.zip.bundle}"/>
         <zip destfile="${bin.zip.bundle}" roundup="yes">
             <zipfileset prefix="${product.name}" refid="river.bin.files" />
-            <zipfileset prefix="${product.name}/examples" refid="examples.bin.files" />
-            <zipfileset prefix="${product.name}/examples" refid="examples.bin.exec.files"
filemode="755"/>
-            <!--<zipfileset prefix="${product.name}/qa" refid="qa.bin.files" />-->
         </zip>
         <delete file="${bin.tar.bundle}"/>
         <tar destfile="${bin.tar.bundle}" compression="gzip" longfile="gnu">
             <tarfileset prefix="${product.name}" refid="river.bin.files" />
-            <tarfileset prefix="${product.name}/examples" refid="examples.bin.files" />
-            <tarfileset prefix="${product.name}/examples" refid="examples.bin.exec.files"
filemode="755"/>
-            <!--<tarfileset prefix="${product.name}/qa" refid="qa.bin.files" />-->
         </tar>
     </target>
 
@@ -162,10 +142,13 @@
         <exclude name="${lib-ext}/**"/>
         <!-- TODO: remove when archive building is pure river.src.files based -->
         <exclude name="qa/**"/>
-
+        <exclude name="dep-libs/**"/>
         <exclude name="${test}/classes/**" />
         <exclude name="${test}/results/**" />
-
+        <exclude name="${test}/lib/**"/>
+        <exclude name="nbproject/**"/>
+        <exclude name="build.properties"/>
+        <exclude name="tar_release_test/**"/>
         <!--
         TODO: why were these excluded from the source archive?
         <exclude name="${doc}/release-notes/new.html"/>
@@ -220,18 +203,11 @@
         <delete file="${src.zip.bundle}"/>
         <zip destfile="${src.zip.bundle}" roundup="yes">
             <zipfileset prefix="${product.name}" refid="river.src.files"/>
-            <zipfileset prefix="${product.name}/examples" refid="examples.src.files"/>
-            <zipfileset prefix="${product.name}/examples"
-                    refid="examples.src.exec.files" filemode="755"/>
             <zipfileset prefix="${product.name}/qa" refid="qa.src.files" />
         </zip>
         <delete file="${src.tar.bundle}"/>
         <tar destfile="${src.tar.bundle}" compression="gzip" longfile="gnu">
             <tarfileset prefix="${product.name}" refid="river.src.files" />
-            <tarfileset prefix="${product.name}/examples"
-                    refid="examples.src.files" />
-            <tarfileset prefix="${product.name}/examples"
-                    refid="examples.src.exec.files" filemode="755"/>
             <tarfileset prefix="${product.name}/qa" refid="qa.src.files" />
         </tar>
     </target>

Modified: river/jtsk/trunk/common.xml
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/common.xml?rev=1725883&r1=1725882&r2=1725883&view=diff
==============================================================================
--- river/jtsk/trunk/common.xml (original)
+++ river/jtsk/trunk/common.xml Thu Jan 21 08:29:41 2016
@@ -197,6 +197,7 @@
 
     <path id="test.compile.classpath">
         <path location="${build.classes.dir}"/>
+        <path refid="compile.classpath"/>
         <fileset dir="${test.lib.dir}">
             <include name="*.jar"/>
         </fileset>



Mime
View raw message