[GitHub] geertjanw closed pull request #260: [NETBEANS-129] For source zips, alter the nbbuild/cluster.properties ?

[GitBox <gi...@apache.org>]

geertjanw closed pull request #260: [NETBEANS-129] For source zips, alter the nbbuild/cluster.properties ?
URL: https://github.com/apache/incubator-netbeans/pull/260
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index db1024677..121e12e04 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1515,14 +1515,24 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
     </concat>
     <taskdef name="createdependencies" classname="org.netbeans.nbbuild.extlibs.CreateDependencies" classpath="${nbantext.jar}"/>
     <createdependencies refid="source.dirset" dependencies="${nb.build.dir}/DEPENDENCIES" sourceDependencies="true"/>
+    <concat destfile="${nb.build.dir}/cluster.properties">
+        <fileset file="${nb_all}/nbbuild/cluster.properties" />
+        <filterchain>
+            <tokenfilter>
+                <replaceregex pattern="cluster.config=.*" replace="cluster.config=${cluster.config}" />
+            </tokenfilter>
+        </filterchain>
+    </concat>
     <zip zipfile="${nb.build.dir}/${cluster.config}-src-${buildnum}.zip" duplicate="preserve">
       <zipfileset dir="${nb_all}" includes="${source.dirs}">
           <exclude name="*/build/**/*"/>
           <exclude name="nbbuild/netbeans/**"/>
+          <exclude name="nbbuild/cluster.properties" />
       </zipfileset>
       <zipfileset dir="${nb_all}">
           <include name="build.xml"/>
       </zipfileset>
+      <zipfileset file="${nb.build.dir}/cluster.properties" fullpath="nbbuild/cluster.properties" />
       <zipfileset file="${nb.build.dir}/DEPENDENCIES" />
       <zipfileset file="${nb.build.dir}/NOTICE" />
       <zipfileset file="${nb.build.dir}/LICENSE" />


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services